X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=snmp%2Flustre-snmp-util.c;h=fbbe8f6b465be15d9de61b2f3cc9aa6b4d97d200;hb=a70b020e5b2f1bbe3b759232852beaac4f0852b5;hp=70d5ecd69e7ef66bc69d43f05d0d751624b1b46b;hpb=804c5778e6069f067c9640014f03dcd30069f5ea;p=fs%2Flustre-release.git

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 70d5ecd..fbbe8f6 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>
@@ -730,8 +724,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 +739,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 +753,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,6 +767,7 @@ 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;
 }