[Pvfs2-cvs] commit by slang in pvfs2/src/apps/kernel/linux: module.mk.in pvfs2-client.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/kernel/linux
In directory parlweb1:/tmp/cvs-serv26625/src/apps/kernel/linux

Modified Files:
      Tag: pvfs-2-7-branch
	module.mk.in pvfs2-client.c 
Log Message:
merge a bunch of fixes made to HEAD since 2.7.0.


Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/module.mk.in,v
diff -p -u -r1.4 -r1.4.12.1
--- module.mk.in	13 Oct 2006 02:17:17 -0000	1.4
+++ module.mk.in	1 Apr 2008 23:25:03 -0000	1.4.12.1
@@ -1,11 +1,14 @@
 DIR := src/apps/kernel/linux
 
 KERNAPPSRC += \
-	$(DIR)/pvfs2-client-core.c \
 	$(DIR)/pvfs2-client.c 
 
-KERNAPPSTHRSRC += \
-	$(DIR)/pvfs2-client-core.c
+# if requested, build a threaded client core
+ifeq (, at THREADED_KMOD_HELPER@)
+KERNAPPSRC += $(DIR)/pvfs2-client-core.c
+else
+KERNAPPTHRSRC += $(DIR)/pvfs2-client-core.c
+endif
 
 ifneq (,$(LINUX24_KERNEL_SRC))
 KERNAPPSRC += $(DIR)/mount.pvfs2.c
@@ -14,3 +17,8 @@ endif
 # get kernel interface defines, and sysint client.h
 MODCFLAGS_$(DIR)/pvfs2-client-core.c = \
   -I$(srcdir)/src/kernel/linux-2.6
+
+# explicitly uses pthreads both threaded and not-threaded versions, even if
+# threading is turned off in the rest of libpvfs
+MODLDFLAGS_$(DIR)/pvfs2-client-core.o = -lpthread
+

Index: pvfs2-client.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client.c,v
diff -p -u -r1.25 -r1.25.2.1
--- pvfs2-client.c	15 Aug 2007 18:43:06 -0000	1.25
+++ pvfs2-client.c	1 Apr 2008 23:25:03 -0000	1.25.2.1
@@ -28,7 +28,6 @@
 
 #define PVFS2_CLIENT_CORE_SUFFIX  "-core"
 #define PVFS2_CLIENT_CORE_NAME "pvfs2-client" PVFS2_CLIENT_CORE_SUFFIX
-#define PVFS2_CLIENT_CORE_THR_SUFFIX "-threaded"
 
 static char s_client_core_path[PATH_MAX];
 
@@ -59,7 +58,6 @@ typedef struct
     char *logstamp;
     char *dev_buffer_count;
     char *dev_buffer_size;
-    int threaded;
     char *logtype;
 } options_t;
 
@@ -282,15 +280,7 @@ static int monitor_pvfs2_client(options_
         {
             sleep(1);
 
-            if(opts->threaded)
-            {
-                arg_list[0] = PVFS2_CLIENT_CORE_NAME PVFS2_CLIENT_CORE_THR_SUFFIX;
-            }
-            else
-            {
-                arg_list[0] = PVFS2_CLIENT_CORE_NAME;
-            }
-
+            arg_list[0] = PVFS2_CLIENT_CORE_NAME;
             arg_index = 1;
             arg_list[arg_index++] = "-a";
             arg_list[arg_index++] = opts->acache_timeout;
@@ -429,7 +419,6 @@ static void print_help(char *progname)
            "PATH\n");
     printf("--logstamp=none|usec|datetime override default log message time stamp format\n");
     printf("--logtype=file|syslog         specify writing logs to file or syslog\n");
-    printf("--threaded                    use threaded client\n");
 }
 
 static void parse_args(int argc, char **argv, options_t *opts)
@@ -460,7 +449,6 @@ static void parse_args(int argc, char **
         {"gossip-mask",1,0,0},
         {"path",1,0,0},
         {"logstamp",1,0,0},
-        {"threaded",0,0,0},
         {0,0,0,0}
     };
 
@@ -569,11 +557,6 @@ static void parse_args(int argc, char **
                     opts->gossip_mask = optarg;
                     break;
                 }
-                else if (strcmp("threaded", cur_option) == 0)
-                {
-                    opts->threaded = 1;
-                    break;
-                }
                 break;
             case 'h':
           do_help:
@@ -644,17 +627,7 @@ static void parse_args(int argc, char **
 
     if (!opts->path)
     {
-        if(opts->threaded)
-        {
-            sprintf(s_client_core_path, 
-                    "%s" PVFS2_CLIENT_CORE_SUFFIX PVFS2_CLIENT_CORE_THR_SUFFIX, 
-                    argv[0]);
-        }
-        else
-        {
-            sprintf(s_client_core_path, "%s" PVFS2_CLIENT_CORE_SUFFIX,
-                    argv[0]);
-        }
+        sprintf(s_client_core_path, "%s" PVFS2_CLIENT_CORE_SUFFIX, argv[0]);
         opts->path = s_client_core_path;
     }