Changeset 9301

Timestamp:

04/30/12 11:16:05 (13 months ago)

Author:

denton

Message:

Updated PINT_acache_update to only calloc memory for the acache payload when necessary. Removed conditionals that were incorrectly placed.

Files:

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

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

@@ -386 +386 @@
     */
   
-    /* lookup non-static components */
+    /* lookup */
     ret = PINT_tcache_lookup(acache, &refn, &tmp_entry, &status);
     if(ret < 0 || status != 0)
@@ -412 +412 @@
     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 */
-
-    }
+    /* Reset Dynamic attrs timestamp since it was hit regardless of timeout. */
+    tmp_payload->msecs_dynamic = current_time_msecs;
 
 
@@ -656 +640 @@
     uint32_t old_mask;
     int ret = -1;
+    /* Storage of current time */
+    struct timeval current_time = { 0, 0};
+    uint64_t current_time_msecs = 0;
 
     /* skip out immediately if the cache is disabled */
@@ -736 +723 @@
     if(size || (attr && (attr->mask & (~(PVFS_STATIC_ATTR_MASK)))))
     {
-        tmp_payload = 
-            (struct acache_payload*)calloc(1, sizeof(*tmp_payload));
+        /* Allocate memory for acache payload if not previously done. */
         if(!tmp_payload)
         {
-            ret = -PVFS_ENOMEM;
-            goto err;
-        }
-        tmp_payload->refn = refn;
+            tmp_payload = 
+                (struct acache_payload*)calloc(1, sizeof(*tmp_payload));
+            if(!tmp_payload)
+            {
+                ret = -PVFS_ENOMEM;
+                goto err;
+            }
+            tmp_payload->refn = refn;
+        }        
+
         tmp_payload->attr_status = -PVFS_ETIME;
         tmp_payload->size_status = -PVFS_ETIME;
@@ -770 +762 @@
  
     }
-   
+
+    /* Get the time of day and convert to millisecond resolution. */
+    gettimeofday(&current_time, NULL);
+    current_time_msecs = current_time.tv_sec * 1000;
+    current_time_msecs += current_time.tv_usec / 1000;
+
+    /* See if the security attr timestamp has been set, if not then set it. */
+    if(!tmp_payload->msecs_security)
+    {
+        tmp_payload->msecs_security = current_time_msecs;
+    }
+    /* Update the dynamic attrs' timestamp regardless of if it has already been set. */
+    tmp_payload->msecs_dynamic = current_time_msecs;
+
 #if 0
     gossip_debug(GOSSIP_ACACHE_DEBUG, "acache: update(): attr_status=%d, size_status=%d\n",