X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=snmp%2Flustre-snmp-util.c;h=4482f70d8b9afd8a9d6a82a48570c77d95f5e4cc;hb=497f520fa341fe2352400c7e5fbc6917b129ff70;hp=93908a13e24be07783d6e45d6d6db89d07483746;hpb=6c7240d06d83a45dfcf622c5ceb1eb4219873112;p=fs%2Flustre-release.git

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 93908a1..4482f70 100644
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -49,9 +45,7 @@
  */ 
 
 #include <sys/types.h>
-#if defined (__linux__)
 #include <sys/vfs.h>
-#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -277,7 +271,6 @@ void lustrefs_ctrl(int command)
         execvp(cmd[0], cmd);
         report("failed to execvp(\'%s %s\')",cmd[0],cmd[1]);
     }
-    return;
 }
 
 /*****************************************************************************
@@ -422,7 +415,6 @@ void report(const char *fmt, ...)
 
     DEBUGMSGTL(("lsnmpd", "%s\n", buf));
     fprintf(stderr, "%s\n", buf);
-    return;
 }
 
 
@@ -730,8 +722,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;
@@ -740,8 +737,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;
@@ -750,8 +751,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;
@@ -760,13 +765,14 @@ 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);
+	*var_len  = sizeof(*c64);
         c64->low  = (unsigned long long) (0x0ffffffff & ull);
         ull >>= 32;
         c64->high = (unsigned long long) (0x0ffffffff & ull);