Bugzilla Bug 284839: checked in Bob Relyea's patch to improve the

responsiveness of SECMOD_WaitForAnyTokenEvent. r=wtc,nelsonb.
Modified Files: lib/dev/dev.h lib/dev/devslot.c lib/pk11wrap/pk11util.c
 Tag: NSS_3_9_BRANCH

3 files changed, 20 insertions, 0 deletions

diff --git a/security/nss/lib/dev/dev.h b/security/nss/lib/dev/dev.h
index 4495be2f5..a7ccdbbca 100644
--- a/security/nss/lib/dev/dev.h
+++ b/security/nss/lib/dev/dev.h
@@ -247,6 +247,12 @@ nssSlot_AddRef
   NSSSlot *slot
 );
 
+NSS_EXTERN void
+nssSlot_ResetDelay
+(
+  NSSSlot *slot
+);
+
 NSS_EXTERN NSSUTF8 *
 nssSlot_GetName
 (
diff --git a/security/nss/lib/dev/devslot.c b/security/nss/lib/dev/devslot.c
index e8fbee38d..4b7557ae8 100644
--- a/security/nss/lib/dev/devslot.c
+++ b/security/nss/lib/dev/devslot.c
@@ -239,6 +239,14 @@ nssSlot_GetTokenName (
     return nssToken_GetName(slot->token);
 }
 
+NSS_IMPLEMENT void
+nssSlot_ResetDelay (
+  NSSSlot *slot
+)
+{
+    slot->lastTokenPing = 0;
+}
+
 static PRBool
 within_token_delay_period(NSSSlot *slot)
 {
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index 322b212f0..73a52828f 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -40,6 +40,7 @@
 #include "pk11func.h"
 #include "pki3hack.h"
 #include "secerr.h"
+#include "dev.h"
 
 /* these are for displaying error messages */
 
@@ -1093,6 +1094,11 @@ SECMOD_WaitForAnyTokenEvent(SECMODModule *mod, unsigned long flags,
 	SECMOD_UpdateSlotList(mod);
 	slot = SECMOD_FindSlotByID(mod, id);
     }
+    /* if we are in the delay period for the "isPresent" call, reset
+     * the delay since we know things have probably changed... */
+    if (slot && slot->nssToken && slot->nssToken->slot) {
+	nssSlot_ResetDelay(slot->nssToken->slot);
+    }
     return slot;
 
     /* must be called with the lock on. */