summaryrefslogtreecommitdiff
path: root/security/nss/lib/dev
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-03-07 21:20:38 +0000
committerwtchang%redhat.com <devnull@localhost>2005-03-07 21:20:38 +0000
commit5276e7eecf5746749930b81960e7d7a67cf103ce (patch)
tree5ad6beab7d57190653a23d7b81cf2288ce7f1c39 /security/nss/lib/dev
parenta6ee061805e32a9a1a92a32043d56f771ae88ad8 (diff)
downloadnss-hg-5276e7eecf5746749930b81960e7d7a67cf103ce.tar.gz
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
Diffstat (limited to 'security/nss/lib/dev')
-rw-r--r--security/nss/lib/dev/dev.h6
-rw-r--r--security/nss/lib/dev/devslot.c8
2 files changed, 14 insertions, 0 deletions
diff --git a/security/nss/lib/dev/dev.h b/security/nss/lib/dev/dev.h
index c2c2ad142..262d934bc 100644
--- a/security/nss/lib/dev/dev.h
+++ b/security/nss/lib/dev/dev.h
@@ -250,6 +250,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 79885679d..9f51c6a35 100644
--- a/security/nss/lib/dev/devslot.c
+++ b/security/nss/lib/dev/devslot.c
@@ -242,6 +242,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)
{