X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=snmp%2Flustre-snmp-util.c;h=f69c6ec001bf4f0e527c5c1e7c63aa44c5c9bfdc;hb=6888948c04711a716640d7dad634c10516ec1d1a;hp=9969272244c39ccfa7c4979a9eedce6fd1a87287;hpb=0ebabeac2cbb3d33e17ba8a405e0373c3636a7c6;p=fs%2Flustre-release.git diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c index 9969272..f69c6ec 100644 --- a/snmp/lustre-snmp-util.c +++ b/snmp/lustre-snmp-util.c @@ -1,23 +1,39 @@ -/* -*- 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. * - * Copyright (c) 2005 Cluster File Systems, Inc. - * Author: PJ Kirner + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * This file is part of Lustre, http://www.lustre.org. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * 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 * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * 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. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * GPL HEADER END + */ +/* + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * snmp/lustre-snmp-util.c + * + * Author: PJ Kirner */ /* @@ -276,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}; @@ -342,9 +356,9 @@ int read_counter64(const char *file_path, counter64 *c64,int factor) if ((ret_val = read_string(file_path, file_data,sizeof(file_data))) == SUCCESS) { tmp = atoll(file_data) * factor; - c64->low = (ulong) (0x0FFFFFFFF & tmp); + c64->low = (unsigned long) (0x0FFFFFFFF & tmp); tmp >>= 32; /* Shift right by 4 bytes */ - c64->high = (ulong) (0x0FFFFFFFF & tmp); + c64->high = (unsigned long) (0x0FFFFFFFF & tmp); } return ret_val; } @@ -522,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; } @@ -714,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; @@ -724,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; @@ -734,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; @@ -744,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); +} +