long cm_daemonPerformanceTuningInterval = 0;
long cm_daemonRankServerInterval = 600;
long cm_daemonRDRShakeExtentsInterval = 0;
+long cm_daemonAfsdHookReloadInterval = 0;
+long cm_daemonEAccesCheckInterval = 1800;
-osi_rwlock_t cm_daemonLock;
-
-long cm_bkgQueueCount; /* # of queued requests */
-
-int cm_bkgWaitingForCount; /* true if someone's waiting for cm_bkgQueueCount to drop */
-
-cm_bkgRequest_t *cm_bkgListp; /* first elt in the list of requests */
-cm_bkgRequest_t *cm_bkgListEndp; /* last elt in the list of requests */
+osi_rwlock_t *cm_daemonLockp;
+afs_uint64 *cm_bkgQueueCountp; /* # of queued requests */
+cm_bkgRequest_t **cm_bkgListpp; /* first elt in the list of requests */
+cm_bkgRequest_t **cm_bkgListEndpp; /* last elt in the list of requests */
extern int powerStateSuspended;
int daemon_ShutdownFlag = 0;
-static int cm_nDaemons = 0;
+int cm_nDaemons = 0;
static time_t lastIPAddrChange = 0;
static EVENT_HANDLE cm_Daemon_ShutdownEvent = NULL;
static EVENT_HANDLE cm_BkgDaemon_ShutdownEvent[CM_MAX_DAEMONS] =
{NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
-void cm_IpAddrDaemon(long parm)
+void * cm_IpAddrDaemon(void * vparm)
{
extern void smb_CheckVCs(void);
char * name = "cm_IPAddrDaemon_ShutdownEvent";
}
thrd_SetEvent(cm_IPAddrDaemon_ShutdownEvent);
+ pthread_exit(NULL);
+ return NULL;
}
afs_int32 cm_RequestWillBlock(cm_bkgRequest_t *rp)
return willBlock;
}
-void cm_BkgDaemon(void * parm)
+void * cm_BkgDaemon(void * vparm)
{
cm_bkgRequest_t *rp;
afs_int32 code;
char name[32] = "";
- long daemonID = (long)(LONG_PTR)parm;
+ long daemonID = (long)(LONG_PTR)vparm;
snprintf(name, sizeof(name), "cm_BkgDaemon_ShutdownEvent%u", daemonID);
rx_StartClientThread();
- lock_ObtainWrite(&cm_daemonLock);
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
while (daemon_ShutdownFlag == 0) {
int willBlock = 0;
Sleep(1000);
continue;
}
- if (!cm_bkgListEndp) {
- osi_SleepW((LONG_PTR)&cm_bkgListp, &cm_daemonLock);
- lock_ObtainWrite(&cm_daemonLock);
+ if (!cm_bkgListEndpp[daemonID]) {
+ osi_SleepW((LONG_PTR)&cm_bkgListpp[daemonID], &cm_daemonLockp[daemonID]);
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
continue;
}
/* we found a request */
- for (rp = cm_bkgListEndp; rp; rp = (cm_bkgRequest_t *) osi_QPrev(&rp->q))
+ for (rp = cm_bkgListEndpp[daemonID]; rp; rp = (cm_bkgRequest_t *) osi_QPrev(&rp->q))
{
if (rp->scp->flags & CM_SCACHEFLAG_DELETED)
break;
* This polling cycle needs to be replaced with a proper
* producer/consumer dynamic worker pool.
*/
- lock_ReleaseWrite(&cm_daemonLock);
- Sleep(willBlock ? 25 : 1000);
- lock_ObtainWrite(&cm_daemonLock);
+ osi_Log2(afsd_logp,"cm_BkgDaemon[%u] sleeping %dms all tasks would block",
+ daemonID, willBlock ? 100 : 1000);
+
+ lock_ReleaseWrite(&cm_daemonLockp[daemonID]);
+ Sleep(willBlock ? 100 : 1000);
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
continue;
}
- osi_QRemoveHT((osi_queue_t **) &cm_bkgListp, (osi_queue_t **) &cm_bkgListEndp, &rp->q);
- osi_assertx(cm_bkgQueueCount-- > 0, "cm_bkgQueueCount 0");
- lock_ReleaseWrite(&cm_daemonLock);
+ osi_QRemoveHT((osi_queue_t **) &cm_bkgListpp[daemonID], (osi_queue_t **) &cm_bkgListEndpp[daemonID], &rp->q);
+ osi_assertx(cm_bkgQueueCountp[daemonID]-- > 0, "cm_bkgQueueCount 0");
+ lock_ReleaseWrite(&cm_daemonLockp[daemonID]);
- osi_Log1(afsd_logp,"cm_BkgDaemon processing request 0x%p", rp);
+ osi_Log2(afsd_logp,"cm_BkgDaemon[%u] processing request 0x%p", daemonID, rp);
if (rp->scp->flags & CM_SCACHEFLAG_DELETED) {
- osi_Log1(afsd_logp,"cm_BkgDaemon DELETED scp 0x%x",rp->scp);
+ osi_Log2(afsd_logp,"cm_BkgDaemon[%u] DELETED scp 0x%x", daemonID, rp->scp);
code = CM_ERROR_BADFD;
} else {
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_BkgDaemon (before) scp 0x%x ref %d",rp->scp, rp->scp->refCount);
+ osi_Log3(afsd_logp,"cm_BkgDaemon[%u] (before) scp 0x%x ref %d", daemonID, rp->scp, rp->scp->refCount);
#endif
code = (*rp->procp)(rp->scp, rp->p1, rp->p2, rp->p3, rp->p4, rp->userp, &rp->req);
#ifdef DEBUG_REFCOUNT
- osi_Log2(afsd_logp,"cm_BkgDaemon (after) scp 0x%x ref %d",rp->scp, rp->scp->refCount);
+ osi_Log3(afsd_logp,"cm_BkgDaemon[%u] (after) scp 0x%x ref %d", daemonID, rp->scp, rp->scp->refCount);
#endif
}
case CM_ERROR_PARTIALWRITE:
if (rp->procp == cm_BkgStore ||
rp->procp == RDR_BkgFetch) {
- osi_Log2(afsd_logp,
- "cm_BkgDaemon re-queueing failed request 0x%p code 0x%x",
- rp, code);
- lock_ObtainWrite(&cm_daemonLock);
- cm_bkgQueueCount++;
- osi_QAddT((osi_queue_t **) &cm_bkgListp, (osi_queue_t **)&cm_bkgListEndp, &rp->q);
+ osi_Log3(afsd_logp,
+ "cm_BkgDaemon[%u] re-queueing failed request 0x%p code 0x%x",
+ daemonID, rp, code);
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
+ cm_bkgQueueCountp[daemonID]++;
+ osi_QAddT((osi_queue_t **) &cm_bkgListpp[daemonID], (osi_queue_t **)&cm_bkgListEndpp[daemonID], &rp->q);
break;
} /* otherwise fall through */
case 0: /* success */
default: /* other error */
if (code == 0) {
- osi_Log1(afsd_logp,"cm_BkgDaemon SUCCESS: request 0x%p", rp);
+ osi_Log2(afsd_logp,"cm_BkgDaemon[%u] SUCCESS: request 0x%p", daemonID, rp);
} else {
- osi_Log2(afsd_logp,"cm_BkgDaemon FAILED: request dropped 0x%p code 0x%x",
- rp, code);
+ osi_Log3(afsd_logp,"cm_BkgDaemon[%u] FAILED: request dropped 0x%p code 0x%x",
+ daemonID, rp, code);
}
cm_ReleaseUser(rp->userp);
cm_ReleaseSCache(rp->scp);
free(rp);
- lock_ObtainWrite(&cm_daemonLock);
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
}
}
- lock_ReleaseWrite(&cm_daemonLock);
+ lock_ReleaseWrite(&cm_daemonLockp[daemonID]);
thrd_SetEvent(cm_BkgDaemon_ShutdownEvent[daemonID]);
+ pthread_exit(NULL);
+ return NULL;
}
void cm_QueueBKGRequest(cm_scache_t *scp, cm_bkgProc_t *procp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4,
cm_user_t *userp, cm_req_t *reqp)
{
- cm_bkgRequest_t *rp;
+ cm_bkgRequest_t *rp, *rpq;
+ afs_uint32 daemonID;
+ int duplicate = 0;
rp = malloc(sizeof(*rp));
memset(rp, 0, sizeof(*rp));
rp->p4 = p4;
rp->req = *reqp;
- lock_ObtainWrite(&cm_daemonLock);
- cm_bkgQueueCount++;
- osi_QAdd((osi_queue_t **) &cm_bkgListp, &rp->q);
- if (!cm_bkgListEndp)
- cm_bkgListEndp = rp;
- lock_ReleaseWrite(&cm_daemonLock);
+ /* Use separate queues for fetch and store operations */
+ daemonID = scp->fid.hash % (cm_nDaemons/2) * 2;
+ if (procp == cm_BkgStore)
+ daemonID++;
+
+ lock_ObtainWrite(&cm_daemonLockp[daemonID]);
+ /* Check to see if this is a duplicate request */
+ for (rpq = cm_bkgListpp[daemonID]; rpq; rpq = (cm_bkgRequest_t *) osi_QNext(&rpq->q))
+ {
+ if ( rpq->p1 == p1 &&
+ rpq->p3 == p3 &&
+ rpq->procp == procp &&
+ rpq->p2 == p2 &&
+ rpq->p4 == p4 &&
+ rpq->scp == scp &&
+ rpq->userp == userp)
+ {
+ /* found a duplicate; update request with latest info */
+ duplicate = 1;
+ break;
+ }
+ }
+
+ if (!duplicate) {
+ cm_bkgQueueCountp[daemonID]++;
+ osi_QAddH((osi_queue_t **) &cm_bkgListpp[daemonID], (osi_queue_t **)&cm_bkgListEndpp[daemonID], &rp->q);
+ }
+ lock_ReleaseWrite(&cm_daemonLockp[daemonID]);
- osi_Wakeup((LONG_PTR) &cm_bkgListp);
+ if (duplicate) {
+ free(rp);
+ } else {
+ osi_Wakeup((LONG_PTR) &cm_bkgListpp[daemonID]);
+ }
}
static int
cm_daemonRankServerInterval = dummy;
afsi_log("daemonRankServerInterval is %d", cm_daemonRankServerInterval);
+ dummyLen = sizeof(DWORD);
+ code = RegQueryValueEx(parmKey, "daemonAfsdHookReloadInterval", NULL, NULL,
+ (BYTE *) &dummy, &dummyLen);
+ if (code == ERROR_SUCCESS && dummy)
+ cm_daemonAfsdHookReloadInterval = dummy;
+ afsi_log("daemonAfsdHookReloadInterval is %d", cm_daemonAfsdHookReloadInterval);
+
RegCloseKey(parmKey);
if (cm_daemonPerformanceTuningInterval)
}
/* periodic lock check daemon */
-void cm_LockDaemon(long parm)
+void * cm_LockDaemon(void * vparm)
{
time_t now;
time_t lastLockCheck;
thrd_Sleep(1000); /* sleep 1 second */
}
thrd_SetEvent(cm_LockDaemon_ShutdownEvent);
+ pthread_exit(NULL);
+ return NULL;
}
/* periodic check daemon */
-void cm_Daemon(long parm)
+void * cm_Daemon(void *vparm)
{
time_t now;
time_t lastVolCheck;
time_t lastPerformanceCheck;
time_t lastServerRankCheck;
time_t lastRDRShakeExtents;
+ time_t lastAfsdHookReload;
+ time_t lastEAccesCheck;
char thostName[200];
unsigned long code;
struct hostent *thp;
- HMODULE hHookDll;
+ HMODULE hHookDll = NULL;
+ AfsdDaemonHook daemonHook = NULL;
char * name = "cm_Daemon_ShutdownEvent";
int configureFirewall = IsWindowsFirewallPresent();
int bAddrChangeCheck = 0;
lastServerRankCheck = now - cm_daemonRankServerInterval/2 * (rand() % cm_daemonRankServerInterval);
if (cm_daemonRDRShakeExtentsInterval)
lastRDRShakeExtents = now - cm_daemonRDRShakeExtentsInterval/2 * (rand() % cm_daemonRDRShakeExtentsInterval);
+ if (cm_daemonAfsdHookReloadInterval)
+ lastAfsdHookReload = now;
+ lastEAccesCheck = now;
+
+ hHookDll = cm_LoadAfsdHookLib();
+ if (hHookDll)
+ daemonHook = ( AfsdDaemonHook ) GetProcAddress(hHookDll, AFSD_DAEMON_HOOK);
while (daemon_ShutdownFlag == 0) {
if (powerStateSuspended) {
now = osi_Time();
}
+ if (now > lastEAccesCheck + cm_daemonEAccesCheckInterval &&
+ daemon_ShutdownFlag == 0 &&
+ powerStateSuspended == 0) {
+ lastEAccesCheck = now;
+ cm_EAccesClearOutdatedEntries();
+ if (daemon_ShutdownFlag == 1)
+ break;
+ now = osi_Time();
+ }
+
if (cm_daemonRDRShakeExtentsInterval &&
now > lastRDRShakeExtents + cm_daemonRDRShakeExtentsInterval &&
daemon_ShutdownFlag == 0 &&
}
/* allow an exit to be called prior to stopping the service */
- hHookDll = cm_LoadAfsdHookLib();
- if (hHookDll)
- {
- BOOL hookRc = TRUE;
- AfsdDaemonHook daemonHook = ( AfsdDaemonHook ) GetProcAddress(hHookDll, AFSD_DAEMON_HOOK);
- if (daemonHook)
- {
- hookRc = daemonHook();
+ if (cm_daemonAfsdHookReloadInterval &&
+ lastAfsdHookReload != 0 && lastAfsdHookReload < now) {
+ if (hHookDll) {
+ FreeLibrary(hHookDll);
+ hHookDll = NULL;
+ daemonHook = NULL;
}
- FreeLibrary(hHookDll);
- hHookDll = NULL;
+
+ hHookDll = cm_LoadAfsdHookLib();
+ if (hHookDll)
+ daemonHook = ( AfsdDaemonHook ) GetProcAddress(hHookDll, AFSD_DAEMON_HOOK);
+ }
+
+ if (daemonHook)
+ {
+ BOOL hookRc = daemonHook();
if (hookRc == FALSE)
{
thrd_Sleep(500);
}
+ if (hHookDll) {
+ FreeLibrary(hHookDll);
+ }
+
thrd_SetEvent(cm_Daemon_ShutdownEvent);
+ pthread_exit(NULL);
+ return NULL;
}
void cm_DaemonShutdown(void)
DWORD code;
daemon_ShutdownFlag = 1;
- osi_Wakeup((LONG_PTR) &cm_bkgListp);
/* wait for shutdown */
for ( i=0; i<cm_nDaemons; i++) {
+ osi_Wakeup((LONG_PTR) &cm_bkgListpp[i]);
if (cm_BkgDaemon_ShutdownEvent[i])
code = thrd_WaitForSingleObject_Event(cm_BkgDaemon_ShutdownEvent[i], INFINITE);
}
void cm_InitDaemon(int nDaemons)
{
static osi_once_t once;
- long pid;
- thread_t phandle;
+ pthread_t phandle;
+ pthread_attr_t tattr;
+ int pstatus;
int i;
+ pthread_attr_init(&tattr);
+ pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED);
+
cm_nDaemons = (nDaemons > CM_MAX_DAEMONS) ? CM_MAX_DAEMONS : nDaemons;
if (osi_Once(&once)) {
- lock_InitializeRWLock(&cm_daemonLock, "cm_daemonLock",
- LOCK_HIERARCHY_DAEMON_GLOBAL);
- osi_EndOnce(&once);
-
/* creating IP Address Change monitor daemon */
- phandle = thrd_Create((SecurityAttrib) 0, 0,
- (ThreadFunc) cm_IpAddrDaemon, 0, 0, &pid, "cm_IpAddrDaemon");
- osi_assertx(phandle != NULL, "cm_IpAddrDaemon thread creation failure");
- thrd_CloseHandle(phandle);
+ pstatus = pthread_create(&phandle, &tattr, cm_IpAddrDaemon, 0);
+ osi_assertx(pstatus == 0, "cm_IpAddrDaemon thread creation failure");
/* creating pinging daemon */
- phandle = thrd_Create((SecurityAttrib) 0, 0,
- (ThreadFunc) cm_Daemon, 0, 0, &pid, "cm_Daemon");
- osi_assertx(phandle != NULL, "cm_Daemon thread creation failure");
- thrd_CloseHandle(phandle);
+ pstatus = pthread_create(&phandle, &tattr, cm_Daemon, 0);
+ osi_assertx(pstatus == 0, "cm_Daemon thread creation failure");
+
+ pstatus = pthread_create(&phandle, &tattr, cm_LockDaemon, 0);
+ osi_assertx(pstatus == 0, "cm_LockDaemon thread creation failure");
- phandle = thrd_Create((SecurityAttrib) 0, 0,
- (ThreadFunc) cm_LockDaemon, 0, 0, &pid, "cm_LockDaemon");
- osi_assertx(phandle != NULL, "cm_LockDaemon thread creation failure");
- thrd_CloseHandle(phandle);
+ cm_bkgListpp = malloc(nDaemons * sizeof(void *));
+ cm_bkgListEndpp = malloc(nDaemons * sizeof(void *));
+ cm_bkgQueueCountp = malloc(nDaemons * sizeof(afs_uint64));
+ cm_daemonLockp = malloc(nDaemons * sizeof(osi_rwlock_t));
for(i=0; i < cm_nDaemons; i++) {
- phandle = thrd_Create((SecurityAttrib) 0, 0,
- (ThreadFunc) cm_BkgDaemon, (LPVOID)(LONG_PTR)i, 0, &pid,
- "cm_BkgDaemon");
- osi_assertx(phandle != NULL, "cm_BkgDaemon thread creation failure");
- thrd_CloseHandle(phandle);
+ lock_InitializeRWLock(&cm_daemonLockp[i], "cm_daemonLock",
+ LOCK_HIERARCHY_DAEMON_GLOBAL);
+ cm_bkgListpp[i] = cm_bkgListEndpp[i] = NULL;
+ cm_bkgQueueCountp[i]=0;
+ pstatus = pthread_create(&phandle, &tattr, cm_BkgDaemon, (LPVOID)(LONG_PTR)i);
+ osi_assertx(pstatus == 0, "cm_BkgDaemon thread creation failure");
}
+ osi_EndOnce(&once);
}
+
+ pthread_attr_destroy(&tattr);
}
git://git.openafs.org / openafs.git / blobdiff