viced: disable hot threads

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

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 10bd61d..bab39f9 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -45,6 +45,7 @@
 #include <rx/rx_queue.h>
 #include <lwp.h>
 #include <opr/lock.h>
+#include <opr/proc.h>
 #include <afs/cmd.h>
 #include <afs/ptclient.h>
 #include <afs/afsint.h>
@@ -153,6 +154,7 @@ static int panic_timeout = 2 * 60;
 static int panic_timeout = 30 * 60;
 #endif
 
+static int host_thread_quota;
 int rxpackets = 150;           /* 100 */
 int nSmallVns = 400;           /* 200 */
 int large = 400;               /* 200 */
@@ -669,11 +671,7 @@ PrintCounters(void)
     audit_PrintStats(stderr);
     h_PrintStats();
     PrintCallBackStats();
-#ifdef AFS_NT40_ENV
-    processSize = -1;          /* TODO: */
-#else
-    processSize = (int)((long)sbrk(0) >> 10);
-#endif
+    processSize = opr_procsize();
     ViceLog(0,
            ("There are %d connections, process size %d\n",
             CurrentConnections, processSize));
@@ -1042,7 +1040,7 @@ ParseArgs(int argc, char *argv[])
 
     cmd_AddParmAtOffset(opts, OPT_spare, "-spare", CMD_SINGLE,
                        CMD_OPTIONAL, "kB overage on volume quota");
-    cmd_AddParmAtOffset(opts, OPT_pctspare, "pctspare", CMD_SINGLE,
+    cmd_AddParmAtOffset(opts, OPT_pctspare, "-pctspare", CMD_SINGLE,
                        CMD_OPTIONAL, "percentage overage on volume quota");
 
     cmd_AddParmAtOffset(opts, OPT_hostcpsrefresh, "-hr", CMD_SINGLE,
@@ -1116,12 +1114,8 @@ ParseArgs(int argc, char *argv[])
                        CMD_OPTIONAL, "location of audit log");
     cmd_AddParmAtOffset(opts, OPT_auditiface, "-audit-interface", CMD_SINGLE,
                        CMD_OPTIONAL, "interface to use for audit logging");
-    cmd_AddParmAtOffset(opts, OPT_config, "-config", CMD_SINGLE, CMD_OPTIONAL,
-                       "configuration location");
     cmd_AddParmAtOffset(opts, OPT_debug, "-d", CMD_SINGLE, CMD_OPTIONAL,
                        "debug level");
-    cmd_AddParmAtOffset(opts, OPT_logfile, "-logfile", CMD_SINGLE,
-                       CMD_OPTIONAL, "location of logfile");
     cmd_AddParmAtOffset(opts, OPT_mrafslogs, "-mrafslogs", CMD_FLAG,
                        CMD_OPTIONAL, "enable MRAFS style logging");
     cmd_AddParmAtOffset(opts, OPT_threads, "-p", CMD_SINGLE, CMD_OPTIONAL,
@@ -1169,6 +1163,9 @@ ParseArgs(int argc, char *argv[])
            CMD_OPTIONAL, "configuration location");
 
     code = cmd_Parse(argc, argv, &opts);
+    if (code == CMD_HELP) {
+       exit(0);
+    }
     if (code)
        return -1;
 
@@ -1434,6 +1431,16 @@ ParseArgs(int argc, char *argv[])
     if (auditFileName)
        osi_audit_file(auditFileName);
 
+    if (lwps > 64) {
+       host_thread_quota = 5;
+    } else if (lwps > 32) {
+       host_thread_quota = 4;
+    } else if (lwps > 16) {
+       host_thread_quota = 3;
+    } else {
+       host_thread_quota = 2;
+    }
+
     return (0);
 }                              /*ParseArgs */
 
@@ -1891,6 +1898,9 @@ main(int argc, char *argv[])
     SetupLogSignals();
 
     LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
+    if (afsconf_GetLatestKey(confDir, NULL, NULL) == 0) {
+       LogDesWarning();
+    }
 
 #if !defined(AFS_NT40_ENV)
     /* initialize the pthread soft signal handler thread */
@@ -2045,13 +2055,6 @@ main(int argc, char *argv[])
     rx_SetMinProcs(tservice, 2);
     rx_SetMaxProcs(tservice, 4);
 
-    /*
-     * Enable RX hot threads, which allows the listener thread to trade
-     * places with an idle thread and moves the context switch from listener
-     * to worker out of the critical path.
-     */
-    rx_EnableHotThread();
-
     /* Some rx debugging */
     if (rxlog || eventlog) {
        debugFile = afs_fopen("rx_dbg", "w");
@@ -2062,7 +2065,7 @@ main(int argc, char *argv[])
     }
 
     init_sys_error_to_et();    /* Set up error table translation */
-    h_InitHostPackage();       /* set up local cellname and realmname */
+    h_InitHostPackage(host_thread_quota); /* set up local cellname and realmname */
     InitCallBack(numberofcbs);
     ClearXStatValues();