In my tests (2GHz P4 Linux, 5 minutes, no pre-existing replay cache), this gets

about a 10% speedup adding entries to an already open replay cache.

* rc_dfl.c (alive): Take a timestamp argument instead of the context, and don't
check the current time here.  All callers changed to pass in the current time.
(rc_store): Take a timestamp argument.  All callers changed to pass in the
current time.

ticket: 1784
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15799 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 7dbd908c9318291b5c0b2c13b3a519b64da61812..d6fa5b309920f8a0a3e275b55d4db723a938d0ac 100644 (file)
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-26  Ken Raeburn  <raeburn@mit.edu>
+
+       * rc_dfl.c (alive): Take a timestamp argument instead of the
+       context, and don't check the current time here.  All callers
+       changed to pass in the current time.
+       (rc_store): Take a timestamp argument.  All callers changed to
+       pass in the current time.
+
 2003-07-17  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (LIBNAME) [##WIN16##]: Don't define.

diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c
index b6c669b2279dec504f160c2c23a848249c688eee..a1899b3c98a66164d28bd1c279886ce7eeaaba6e 100644 (file)
--- a/src/lib/krb5/rcache/rc_dfl.c
+++ b/src/lib/krb5/rcache/rc_dfl.c
@@ -89,11 +89,9 @@ cmp(krb5_donot_replay *old, krb5_donot_replay *new1, krb5_deltat t)
 }
 
 static int
-alive(krb5_context context, krb5_donot_replay *new1, krb5_deltat t)
+alive(krb5_int32 mytime, krb5_donot_replay *new1, krb5_deltat t)
 {
-    krb5_int32 mytime;
-
-    if (krb5_timeofday(context, &mytime))
+    if (mytime == 0)
        return CMP_HOHUM; /* who cares? */
     /* I hope we don't have to worry about overflow */
     if (new1->ctime + t < mytime)
@@ -127,7 +125,8 @@ struct authlist
 /* hash could be forwards since we have to search on match, but naaaah */
 
 static int
-rc_store(krb5_context context, krb5_rcache id, krb5_donot_replay *rep)
+rc_store(krb5_context context, krb5_rcache id, krb5_donot_replay *rep,
+        krb5_int32 now)
 {
     struct dfl_data *t = (struct dfl_data *)id->data;
     int rephash;
@@ -141,7 +140,7 @@ rc_store(krb5_context context, krb5_rcache id, krb5_donot_replay *rep)
        case CMP_REPLAY:
            return CMP_REPLAY;
        case CMP_HOHUM:
-           if (alive(context, &ta->rep, t->lifespan) == CMP_EXPIRED)
+           if (alive(now, &ta->rep, t->lifespan) == CMP_EXPIRED)
                t->nummisses++;
            else
                t->numhits++;
@@ -391,6 +390,7 @@ krb5_rc_dfl_recover(krb5_context context, krb5_rcache id)
     krb5_error_code retval;
     long max_size;
     int expired_entries = 0;
+    krb5_int32 now;
 
     if ((retval = krb5_rc_io_open(context, &t->d, t->name)))
        return retval;
@@ -413,6 +413,9 @@ krb5_rc_dfl_recover(krb5_context context, krb5_rcache id)
     rep->client = NULL;
     rep->server = NULL;
 
+    if (krb5_timeofday(context, &now))
+       now = 0;
+
     /* now read in each auth_replay and insert into table */
     for (;;) {
        if (krb5_rc_io_mark(context, &t->d)) {
@@ -428,8 +431,8 @@ krb5_rc_dfl_recover(krb5_context context, krb5_rcache id)
            goto io_fail;
 
 
-       if (alive(context, rep, t->lifespan) != CMP_EXPIRED) {
-           if (rc_store(context, id, rep) == CMP_MALLOC) {
+       if (alive(now, rep, t->lifespan) != CMP_EXPIRED) {
+           if (rc_store(context, id, rep, now) == CMP_MALLOC) {
                retval = KRB5_RC_MALLOC; goto io_fail;
            }
        } else {
@@ -494,8 +497,13 @@ krb5_rc_dfl_store(krb5_context context, krb5_rcache id, krb5_donot_replay *rep)
 {
     krb5_error_code ret;
     struct dfl_data *t = (struct dfl_data *)id->data;
+    krb5_int32 now;
+
+    ret = krb5_timeofday(context, &now);
+    if (ret)
+       return ret;
 
-    switch(rc_store(context, id, rep)) {
+    switch(rc_store(context, id, rep, now)) {
     case CMP_MALLOC:
        return KRB5_RC_MALLOC;
     case CMP_REPLAY:
@@ -533,10 +541,14 @@ krb5_rc_dfl_expunge(krb5_context context, krb5_rcache id)
     struct authlist **qt;
     struct authlist *r;
     struct authlist *rt;
+    krb5_int32 now;
+
+    if (krb5_timestamp(context, &now))
+       now = 0;
 
     for (q = &t->a; *q; q = qt) {
        qt = &(*q)->na;
-       if (alive(context, &(*q)->rep, t->lifespan) == CMP_EXPIRED) {
+       if (alive(now, &(*q)->rep, t->lifespan) == CMP_EXPIRED) {
            FREE((*q)->rep.client);
            FREE((*q)->rep.server);
            FREE(*q);