threaded-logging-20050619

[openafs.git] / src / viced / viced.c

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 8191a28..6fe4dd4 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -88,7 +88,6 @@ RCSID
 #include "host.h"
 #ifdef AFS_PTHREAD_ENV
 #include "softsig.h"
-char *(*threadNameProgram) ();
 #endif
 #if defined(AFS_SGI_ENV)
 #include "sys/schedctl.h"
@@ -740,6 +739,9 @@ FlagMsg()
     strcat(buffer, "[-rxpck <number of rx extra packets>] ");
     strcat(buffer, "[-rxdbg (enable rx debugging)] ");
     strcat(buffer, "[-rxdbge (enable rxevent debugging)] ");
+#if AFS_PTHREAD_ENV
+    strcat(buffer, "[-vattachpar <number of volume attach threads>] ");
+#endif
 #ifdef AFS_AIX32_ENV
     strcat(buffer, "[-m <min percentage spare in partition>] ");
 #endif
@@ -935,6 +937,14 @@ ParseArgs(int argc, char *argv[])
                return -1; 
            }
            rxpackets = atoi(argv[++i]);
+#ifdef AFS_PTHREAD_ENV
+       } else if (!strcmp(argv[i], "-vattachpar")) {
+            if ((i + 1) >= argc) {
+               fprintf(stderr, "missing argument for -vattachpar\n"); 
+               return -1; 
+           }
+           vol_attach_threads = atoi(argv[++i]);
+#endif /* AFS_PTHREAD_ENV */
        } else if (!strcmp(argv[i], "-s")) {
            Sawsmall = 1;
             if ((i + 1) >= argc) {
@@ -1095,6 +1105,10 @@ ParseArgs(int argc, char *argv[])
            serverLogSyslogFacility = atoi(argv[i] + 8);
        }
 #endif
+       else if (strcmp(argv[i], "-mrafslogs") == 0) {
+           /* set syslog logging flag */
+           mrafsStyleLogs = 1;
+       } 
        else {
            return (-1);
        }
@@ -1716,8 +1730,8 @@ main(int argc, char *argv[])
        V_BreakVolumeCallbacks = BreakVolumeCallBacksLater;
     }
 
-#if defined(AFS_PTHREAD_ENV)
-    threadNameProgram = threadName;
+#ifdef AFS_PTHREAD_ENV
+    SetLogThreadNameProgram( threadName );
 #endif
 
     /* initialize libacl routines */