X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=snmp%2Flustre-snmp-util.c;h=f69c6ec001bf4f0e527c5c1e7c63aa44c5c9bfdc;hp=61fbd2e0177f76c58b4e20b42f2a163b61f36ad2;hb=refs%2Fchanges%2F27%2F20727%2F4;hpb=313b3c3b9d82670b77d4624deb4471f89fc5a8cb

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 61fbd2e..f69c6ec 100644
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -51,9 +49,7 @@
  */ 
 
 #include <sys/types.h>
-#if defined (__linux__)
 #include <sys/vfs.h>
-#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -296,8 +292,6 @@ void lustrefs_ctrl(int command)
 
 int get_sysstatus(void)
 {
-    FILE    *fptr = NULL;
-    int     len = 0;
     int     ret_val = ERROR ;
     char    sys_status[50] = {0};
     
@@ -542,9 +536,9 @@ unsigned char*
         size_t  *var_len)
 {
     static unsigned char string[SPRINT_MAX_LEN];
-    if( SUCCESS != read_string(file_path, string,sizeof(string)))
+    if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
         return NULL;
-    *var_len = strlen(string);
+    *var_len = strlen((char *)string);
     return (unsigned char *) string;
 }
 
@@ -734,8 +728,13 @@ error_out :
 extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, unsigned long long * min, unsigned long long * max, unsigned long long * sum, unsigned long long * sum_square)
 {
   unsigned long long tmp_nb_sample=0,tmp_min=0,tmp_max=0,tmp_sum=0,tmp_sum_square=0;
+  glob_t path;
+
 /*we parse the three MDS stat files and sum values*/
-  if( stats_values(FILEPATH_MDS_SERVER_STATS,name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+  if (cfs_get_param_paths(&path, "mdt/MDS/mds/stats") != 0)
+    return ERROR;
+  if( stats_values(path.gl_pathv[0],name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+    cfs_free_param_data(&path);
     return ERROR;
   } else {
     *nb_sample=tmp_nb_sample;
@@ -744,8 +743,12 @@ extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, u
     *sum=tmp_sum;
     *sum_square=tmp_sum_square;
   }
+  cfs_free_param_data(&path);
 
-  if( stats_values(FILEPATH_MDS_SERVER_READPAGE_STATS,name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+  if (cfs_get_param_paths(&path, "mdt/MDS/mds_readpage/stats") != 0)
+    return ERROR;
+  if( stats_values(path.gl_pathv[0],name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+    cfs_free_param_data(&path);
     return ERROR;
   } else {
     *nb_sample += tmp_nb_sample;
@@ -754,8 +757,12 @@ extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, u
     *sum += tmp_sum;
     *sum_square += tmp_sum_square;
   }
+  cfs_free_param_data(&path);
 
-  if( stats_values(FILEPATH_MDS_SERVER_SETATTR_STATS,name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+  if (cfs_get_param_paths(&path, "mdt/MDS/mds_setattr/stats") != 0)
+    return ERROR;
+  if( stats_values(path.gl_pathv[0],name_value,&tmp_nb_sample,&tmp_min,&tmp_max,&tmp_sum,&tmp_sum_square) == ERROR ) {
+    cfs_free_param_data(&path);
     return ERROR;
   } else {
     *nb_sample += tmp_nb_sample;
@@ -764,6 +771,16 @@ extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, u
     *sum += tmp_sum;
     *sum_square += tmp_sum_square;
   }
+  cfs_free_param_data(&path);
   
   return SUCCESS;
 }
+
+void convert_ull(counter64 *c64, unsigned long long ull, size_t *var_len)
+{
+	*var_len  = sizeof(*c64);
+        c64->low  = (unsigned long long) (0x0ffffffff & ull);
+        ull >>= 32;
+        c64->high = (unsigned long long) (0x0ffffffff & ull);
+}
+