X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=snmp%2Flustre-snmp-util.h;h=e37b2159ed833bc9c4b8ad8aad8f5699a945478b;hp=1710ef5585701c60f2a9e7cda944bde704ccda95;hb=490bb7a658d6d7a3608633b7416a6cf09e0d225b;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70

diff --git a/snmp/lustre-snmp-util.h b/snmp/lustre-snmp-util.h
index 1710ef5..e37b215 100644
--- a/snmp/lustre-snmp-util.h
+++ b/snmp/lustre-snmp-util.h
@@ -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
  */
@@ -39,6 +35,8 @@
 #ifndef LUSTRE_SNMP_UTIL_H
 #define LUSTRE_SNMP_UTIL_H
 
+#include <libcfs/util/param.h>
+
 /*
  * Definitions of magic values
  */
@@ -112,21 +110,20 @@
 #define LDLMUNUSEDLOCKCOUNT 103
 #define LDLMRESOURCECOUNT   104
 
-/* Defining the proc paths for Lustre file system */
-#define LUSTRE_PATH                 "/proc/fs/lustre/"
-#define OSD_PATH                    LUSTRE_PATH "obdfilter/"
-#define OSC_PATH                    LUSTRE_PATH "osc/"
-#define MDS_PATH                    LUSTRE_PATH "mds/"
-#define MDC_PATH                    LUSTRE_PATH "mdc/"
-#define CLIENT_PATH                 LUSTRE_PATH "llite/"
-#define LOV_PATH                    LUSTRE_PATH "lov/"
-#define LDLM_PATH                   LUSTRE_PATH "ldlm/namespaces/"
-#define FILEPATH_MDS_SERVER_STATS             LUSTRE_PATH "mdt/MDS/mds/stats"
-#define FILEPATH_MDS_SERVER_READPAGE_STATS             LUSTRE_PATH "mdt/MDS/mds_readpage/stats"
-#define FILEPATH_MDS_SERVER_SETATTR_STATS             LUSTRE_PATH "mdt/MDS/mds_setattr/stats"
+#define LNETNUMBER          110
+#define LNETMSGSALLOC       111
+#define LNETMSGSMAX         112
+#define LNETERRORS          113
+#define LNETSENDCOUNT       114
+#define LNETRECVCOUNT       115
+#define LNETROUTECOUNT      116
+#define LNETDROPCOUNT       117
+#define LNETSENDBYTES       118
+#define LNETRECVBYTES       119
+#define LNETROUTEBYTES      120
+#define LNETDROPBYTES       121
 
 /* Common procfs file entries that are refrenced in mulitple locations*/
-#define FILENAME_SYSHEALTHCHECK     "health_check"
 #define FILENAME_SYS_STATUS         "/var/lustre/sysStatus"
 
 #define FILENAME_NUM_REF            "num_refs"
@@ -215,6 +212,7 @@ unsigned char *
         const char *path,
         struct oid_table *ptable);
 
+void convert_ull(counter64 *c64, unsigned long long ull, size_t *var_len);
 int stats_values(char * filepath,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);
 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);