Changeset 9300

Timestamp:

04/27/12 14:34:08 (13 months ago)

Author:

denton

Message:

Corrected timeval errors. Added conditionals to check if the dynamic portions of the acache payload need to be updated based on timestamps.

Files:

• branches/acache_improvement/src/client/sysint/acache.c (modified) (5 diffs)

branches/acache_improvement/src/client/sysint/acache.c

@@ -31 +31 @@
 #define STATIC_ACACHE_DEFAULT_TIMEOUT_MSECS 18000000    /* 5 hours      */
 #define DYNAMIC_ACACHE_DEFAULT_TIMEOUT_MSECS 5000       /* 5 seconds    */
-#define SECURITY_ACACHE_DEFAUTL_TIMEOUT_MSECS 7200000   /* 2 hours      */
+#define SECURITY_ACACHE_DEFAULT_TIMEOUT_MSECS 7200000   /* 2 hours      */
 
 
@@ -70 +70 @@
     uint32_t mirror_copies_count;
 
-    uint64_t msecs__security; /**< Time when the security attr was refreshed.  */
-    uint64_t msecs__dynamic;  /**< Time when the dynamic attrs were refreshed. */
+    uint64_t msecs_security; /**< Time when the security attr was refreshed.  */
+    uint64_t msecs_dynamic;  /**< Time when the dynamic attrs were refreshed. */
 };
  
@@ -352 +352 @@
     /* struct static_payload* tmp_static_payload; */
     int status;
-
-
-    /* Get the current time */
+    /* Storage of current time */
     struct timeval current_time = { 0, 0};
     uint64_t current_time_msecs = 0;
-
-    gettimeofday(&current_time, NULL);
-   
-    current_time_msecs = current_time.sec * 1000;
-    current_time_msecs += current_time.usec / 1000;
- 
     /* Flags indicating whether dynamic attrs or security attr have expired. */
     unsigned char security_expired = 0;
@@ -407 +399 @@
         PINT_perf_count(acache_pc, PERF_ACACHE_HITS, 1, PINT_PERF_ADD);
         tmp_payload = tmp_entry->payload;
-
-        /* Check to see if either the security or dynamic attrs have expired.
-        if()
-        {
-            security_expired = 1;
-        }
-
-        if()
-        {
-            dynamic_attrs_expired = 1;
-        }
-        */
-
     }
 
@@ -428 +407 @@
         return(ret);
     }
- 
+
+    gettimeofday(&current_time, NULL);
+    current_time_msecs = current_time.tv_sec * 1000;
+    current_time_msecs += current_time.tv_usec / 1000;
+
+    /* Check to see if either the security or dynamic attrs have expired. */
+    if((current_time_msecs - tmp_payload->msecs_security) > 
+        SECURITY_ACACHE_DEFAULT_TIMEOUT_MSECS)
+    {
+        security_expired = 1;
+
+        /* Fetch/update security attr */
+
+    }
+
+    if((current_time_msecs - tmp_payload->msecs_dynamic) >
+        DYNAMIC_ACACHE_DEFAULT_TIMEOUT_MSECS)
+    {
+        dynamic_attrs_expired = 1;
+
+        /* Fetch/update dynamic attrs */
+
+    }
+
+
 #if 0
     gossip_debug(GOSSIP_ACACHE_DEBUG, "acache: "