From: Jeffrey Altman Date: Sat, 11 Dec 2010 12:19:54 +0000 (-0600) Subject: Windows: PerformanceTuningInterval Merge error X-Git-Tag: upstream/1.8.0_pre1^2~4369 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6229ffb7ae365174ccacabe00d1e986d2f9b2019;p=packages%2Fo%2Fopenafs.git Windows: PerformanceTuningInterval Merge error Due to a merge error, if RankServerInterval was set via the registry, its value would also be used for the PerformanceTuningInterval. Fix it. Change-Id: I6605146db0c25ecbf0d20f9d7198934f5bf411ad Reviewed-on: http://gerrit.openafs.org/3500 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c index 0d79f2054..a31766b01 100644 --- a/src/WINNT/afsd/cm_daemon.c +++ b/src/WINNT/afsd/cm_daemon.c @@ -343,6 +343,10 @@ cm_DaemonCheckInit(void) dummyLen = sizeof(DWORD); code = RegQueryValueEx(parmKey, "daemonPerformanceTuningInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); + if (code == ERROR_SUCCESS) + cm_daemonPerformanceTuningInterval = dummy; + afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval); + dummyLen = sizeof(DWORD); code = RegQueryValueEx(parmKey, "daemonRankServerInterval", NULL, NULL, (BYTE *) &dummy, &dummyLen); @@ -350,10 +354,6 @@ cm_DaemonCheckInit(void) cm_daemonRankServerInterval = dummy; afsi_log("daemonRankServerInterval is %d", cm_daemonRankServerInterval); - if (code == ERROR_SUCCESS) - cm_daemonPerformanceTuningInterval = dummy; - afsi_log("daemonPerformanceTuningInterval is %d", cm_daemonPerformanceTuningInterval); - RegCloseKey(parmKey); if (cm_daemonPerformanceTuningInterval)