Changeset 8892

Timestamp:

06/17/11 15:26:27 (2 years ago)

Author:

walt

Message:

fixed stupid break

Location:

branches/Orange-Branch/src

Files:

• apps/kernel/linux/pvfs2-client-core.c (modified) (1 diff)
• common/misc/pint-perf-counter.c (modified) (6 diffs)
• common/misc/pint-perf-counter.h (modified) (3 diffs)
• server/pvfs2-server.c (modified) (1 diff)

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

@@ -3740 +3740 @@
 
     assert(opts);
-    opts->perf_time_interval_secs = PERF_DEFAULT_TIME_INTERVAL_SECS;
+    opts->perf_time_interval_secs = PERF_DEFAULT_UPDATE_INTERVAL / 1000;
     opts->perf_history_size = PERF_DEFAULT_HISTORY_SIZE;
 

branches/Orange-Branch/src/common/misc/pint-perf-counter.c

@@ -42 +42 @@
  * enumeration in include/pvfs2-mgmt.h
  */
-static struct PINT_perf_key key_array[] =
+struct PINT_perf_key server_keys[] =
 {
     {"bytes read", PINT_PERF_READ, PINT_PERF_PRESERVE},
@@ -82 +82 @@
  * \returns pointer to perf counter on success, NULL on failure
  */
-struct PINT_perf_counter *PINT_perf_initialize( int default_history_size,
-                                                int default_interval)
+struct PINT_perf_counter *PINT_perf_initialize(struct PINT_perf_key *key_array)
 {
     struct PINT_perf_counter *pc = NULL;
@@ -123 +122 @@
 
     /* running will be used to decide if we should start an update process */
-    pc->history_size = default_history_size;
+    pc->history_size = PERF_DEFAULT_HISTORY_SIZE;
     pc->running = (pc->history_size > 1);
-    pc->interval = default_interval;
+    pc->interval = PERF_DEFAULT_UPDATE_INTERVAL;
 
     /* create a simple linked list of samples, each with a value array */
@@ -366 +365 @@
             }
             /* if history_size is now 1 stop the rollover SM */
+            pc->running = (pc->history_size > 1);
         }
         else
@@ -397 +397 @@
             }
             /* if not running start rollover SM */
-        }
+            pc->running = (pc->history_size > 1);
+        }
+        break;
+    case PINT_PERF_UPDATE_INTERVAL:
+        if (arg > 0)
+            pc->interval = arg;
         break;
     default:
@@ -430 +435 @@
     case PINT_PERF_KEY_COUNT:
         *arg = pc->key_count;
+        break;
+    case PINT_PERF_UPDATE_INTERVAL:
+        *arg = pc->interval;
         break;
     default:

branches/Orange-Branch/src/common/misc/pint-perf-counter.h

@@ -13 +13 @@
 
 enum {
-    PERF_DEFAULT_TIME_INTERVAL_MSECS = 1000,
-    PERF_DEFAULT_HISTORY_SIZE       = 1,
+    PERF_DEFAULT_UPDATE_INTERVAL = 1000, /* msecs */
+    PERF_DEFAULT_HISTORY_SIZE    = 1,
 };
 
@@ -34 +34 @@
 enum PINT_perf_option
 {
-    PINT_PERF_HISTORY_SIZE = 1,  /**< sets/gets the history size */
-    PINT_PERF_KEY_COUNT = 2      /**< gets the key coung (cannot be set) */
+    PINT_PERF_HISTORY_SIZE = 1,   /**< sets/gets the history size */
+    PINT_PERF_KEY_COUNT = 2,      /**< gets the key count (cannot be set) */
+    PINT_PERF_UPDATE_INTERVAL = 3 /**< sets/gets the update interval */
 };
 
@@ -67 +68 @@
 };
 
+
 /** server-wide perf counter structure */
+extern struct PINT_perf_key server_keys[];
+
 extern struct PINT_perf_counter *PINT_server_pc;
 
-struct PINT_perf_counter* PINT_perf_initialize(
-        int history_size, int update_interval);
+struct PINT_perf_counter* PINT_perf_initialize(struct PINT_perf_key *key);
 
 void PINT_perf_finalize(

branches/Orange-Branch/src/server/pvfs2-server.c

@@ -1128 +1128 @@
 #ifndef __PVFS2_DISABLE_PERF_COUNTERS__
                             /* hist size should be in server config too */
-    PINT_server_pc = PINT_perf_initialize(PINT_PERF_HISTORY_SIZE,
+    PINT_server_pc = PINT_perf_initialize(server_keys);
+    if(!PINT_server_pc)
+    {
+        gossip_err("Error initializing performance counters.\n");
+        return(ret);
+    }
+    ret = PINT_perf_set_info(PINT_server_pc, PINT_PERF_UPDATE_INTERVAL, 
                                         server_config.perf_update_interval);
-    if(!PINT_server_pc)
-    {
-        gossip_err("Error initializing performance counters.\n");
+    if (ret < 0)
+    {
+        gossip_err("Error PINT_perf_set_info (update interval)\n");
         return(ret);
     }