Changeset 9343

Timestamp:

06/18/12 11:16:07 (12 months ago)

Author:

denton

Message:

Removed references to static_acache_*, since the previously separated acache payloads have been combined into one.

Files:

• branches/stable/src/apps/kernel/linux/pvfs2-client-core.c (modified) (20 diffs)

branches/stable/src/apps/kernel/linux/pvfs2-client-core.c

@@ -204 +204 @@
 
 static struct PINT_perf_counter* acache_pc = NULL;
-static struct PINT_perf_counter* static_acache_pc = NULL;
+/* static struct PINT_perf_counter* static_acache_pc = NULL; */
 static struct PINT_perf_counter* ncache_pc = NULL;
 /* static char hostname[100]; */
@@ -1277 +1277 @@
             }
             break;
-
+/*
         case PVFS2_PERF_COUNT_REQUEST_STATIC_ACACHE:
             tmp_str = PINT_perf_generate_text(static_acache_pc,
@@ -1293 +1293 @@
             }
             break;
-
+*/
         case PVFS2_PERF_COUNT_REQUEST_NCACHE:
             tmp_str = PINT_perf_generate_text(ncache_pc,
@@ -1433 +1433 @@
                 ret = PINT_perf_set_info(
                     acache_pc, PINT_PERF_HISTORY_SIZE, tmp_perf_val);
-                ret = PINT_perf_set_info(
+/*                ret = PINT_perf_set_info(
                     static_acache_pc, PINT_PERF_HISTORY_SIZE, tmp_perf_val);
+*/
                 ret = PINT_perf_set_info(
                     ncache_pc, PINT_PERF_HISTORY_SIZE, tmp_perf_val);
@@ -1446 +1447 @@
             {
                 PINT_perf_reset(acache_pc);
-                PINT_perf_reset(static_acache_pc);
+/*                PINT_perf_reset(static_acache_pc);*/
                 PINT_perf_reset(ncache_pc);
             }    
@@ -3303 +3304 @@
     uint64_t debug_mask = GOSSIP_NO_DEBUG;
     PINT_client_sm *acache_timer_sm_p = NULL;
-    PINT_client_sm *static_acache_timer_sm_p = NULL;
+    /* PINT_client_sm *static_acache_timer_sm_p = NULL; */
     PINT_smcb *acache_smcb = NULL;
-    PINT_smcb *acache_static_smcb = NULL;
+    /* PINT_smcb *acache_static_smcb = NULL; */
     PINT_smcb *ncache_smcb = NULL;
     PINT_client_sm *ncache_timer_sm_p = NULL;
@@ -3467 +3468 @@
     }
 
+    /*
     static_acache_pc = PINT_perf_initialize(acache_keys);
     if(!static_acache_pc)
@@ -3474 +3476 @@
         return(-PVFS_ENOMEM);
     }
+
     ret = PINT_perf_set_info(static_acache_pc, PINT_PERF_HISTORY_SIZE,
         s_opts.perf_history_size);
@@ -3482 +3485 @@
         return(ret);
     }
-
-    PINT_acache_enable_perf_counter(acache_pc, static_acache_pc);
+    */
+
+    PINT_acache_enable_perf_counter(acache_pc);
 
     /* start performance counters for ncache */
@@ -3526 +3530 @@
     }
 
+    /*
     PINT_smcb_alloc(&acache_static_smcb, PVFS_CLIENT_PERF_COUNT_TIMER,
             sizeof(struct PINT_client_sm),
@@ -3548 +3553 @@
         return(ret);
     }
+    */
 
     PINT_smcb_alloc(&ncache_smcb, PVFS_CLIENT_PERF_COUNT_TIMER,
@@ -3556 +3562 @@
     if (!ncache_smcb)
     {
-        finalize_perf_items( 2, acache_smcb, acache_static_smcb );
+        finalize_perf_items( 1, acache_smcb);
         return(-PVFS_ENOMEM);
     }
@@ -3567 +3573 @@
     {
         gossip_lerr("Error posting ncache timer.\n");
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return(ret);
     }
@@ -3575 +3581 @@
     {
         PVFS_perror("initialize_ops_in_progress_table", ret);
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return ret;
     }   
@@ -3583 +3589 @@
     {
         PVFS_perror("PINT_dev_initialize", ret);
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return -PVFS_EDEVINIT;
     }
@@ -3593 +3599 @@
     {
         PVFS_perror("PINT_dev_get_mapped_region", ret);
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return ret;
     }
@@ -3601 +3607 @@
     {
         PVFS_perror("device job_open_context failed", ret);
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return ret;
     }
@@ -3614 +3620 @@
     {
         gossip_err("Cannot create remount thread!");
-        finalize_perf_items( 3, acache_smcb, acache_static_smcb, ncache_smcb );
+        finalize_perf_items( 2, acache_smcb, ncache_smcb );
         return -1;
     }
@@ -3656 +3662 @@
                  "calling PVFS_sys_finalize()\n");
 
+#if 0
     /*release smcb associated with the acache-timer*/
     if (static_acache_timer_sm_p->sys_op_id)
        PINT_sys_release(static_acache_timer_sm_p->sys_op_id);
+#endif
 
     finalize_perf_items( 2, acache_smcb, ncache_smcb );
@@ -4073 +4081 @@
         PINT_perf_finalize( acache_pc );
     }
-    
+
+    /* 
     if( static_acache_pc != NULL )
     {
         PINT_perf_finalize( static_acache_pc );
     }
+    */
 
     if( ncache_pc != NULL )