*
* 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
*/
*/
#include <errno.h>
#include <getopt.h>
+#include <inttypes.h>
#include <pwd.h>
#include <unistd.h>
#include <stdarg.h>
#include <sys/ioctl.h>
#include <time.h>
-#include <libcfs/list.h>
+#include <libcfs/util/list.h>
#include <libcfs/util/ioctl.h>
#include <libcfs/util/parser.h>
#include <lnet/lnetctl.h>
#include <lnet/lnetst.h>
#include <lnet/lnet.h>
+#include <utils/obdctl.h>
-lst_sid_t LST_INVALID_SID = {LNET_NID_ANY, -1};
-static lst_sid_t session_id;
+struct lst_sid LST_INVALID_SID = {LNET_NID_ANY, -1};
+static struct lst_sid session_id;
static int session_key;
/* All nodes running 2.6.50 or later understand feature LST_FEAT_BULK_LEN */
static unsigned session_features = LST_FEATS_MASK;
-static lstcon_trans_stat_t trans_stat;
+static struct lstcon_trans_stat trans_stat;
typedef struct list_string {
struct list_string *lstr_next;
void
lst_free_rpcent(struct list_head *head)
{
- lstcon_rpc_ent_t *ent;
+ struct lstcon_rpc_ent *ent;
while (!list_empty(head)) {
- ent = list_entry(head->next, lstcon_rpc_ent_t, rpe_link);
+ ent = list_entry(head->next, struct lstcon_rpc_ent, rpe_link);
list_del(&ent->rpe_link);
free(ent);
void
lst_reset_rpcent(struct list_head *head)
{
- lstcon_rpc_ent_t *ent;
+ struct lstcon_rpc_ent *ent;
list_for_each_entry(ent, head, rpe_link) {
ent->rpe_sid = LST_INVALID_SID;
int
lst_alloc_rpcent(struct list_head *head, int count, int offset)
{
- lstcon_rpc_ent_t *ent;
+ struct lstcon_rpc_ent *ent;
int i;
for (i = 0; i < count; i++) {
- ent = malloc(offsetof(lstcon_rpc_ent_t, rpe_payload[offset]));
+ ent = malloc(offsetof(struct lstcon_rpc_ent, rpe_payload[offset]));
if (ent == NULL) {
lst_free_rpcent(head);
return -1;
}
- memset(ent, 0, offsetof(lstcon_rpc_ent_t, rpe_payload[offset]));
+ memset(ent, 0, offsetof(struct lstcon_rpc_ent, rpe_payload[offset]));
ent->rpe_sid = LST_INVALID_SID;
ent->rpe_peer.nid = LNET_NID_ANY;
void
lst_print_transerr(struct list_head *head, char *optstr)
{
- lstcon_rpc_ent_t *ent;
+ struct lstcon_rpc_ent *ent;
list_for_each_entry(ent, head, rpe_link) {
if (ent->rpe_rpc_errno == 0 && ent->rpe_fwk_errno == 0)
}
int lst_info_batch_ioctl(char *batch, int test, int server,
- lstcon_test_batch_ent_t *entp, int *idxp,
- int *ndentp, lstcon_node_ent_t *dentsp);
+ struct lstcon_test_batch_ent *entp, int *idxp,
+ int *ndentp, struct lstcon_node_ent *dentsp);
-int lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent,
- int *idx, int *count, lstcon_node_ent_t *dents);
+int lst_info_group_ioctl(char *name, struct lstcon_ndlist_ent *gent,
+ int *idx, int *count, struct lstcon_node_ent *dents);
int lst_query_batch_ioctl(char *batch, int test, int server,
int timeout, struct list_head *head);
}
int
-lst_new_session_ioctl(char *name, int timeout, int force, lst_sid_t *sid)
+lst_new_session_ioctl(char *name, int timeout, int force, struct lst_sid *sid)
{
- lstio_session_new_args_t args = {0};
+ struct lstio_session_new_args args = { 0 };
args.lstio_ses_key = session_key;
args.lstio_ses_timeout = timeout;
int
lst_session_info_ioctl(char *name, int len, int *key, unsigned *featp,
- lst_sid_t *sid, lstcon_ndlist_ent_t *ndinfo)
+ struct lst_sid *sid, struct lstcon_ndlist_ent *ndinfo)
{
- lstio_session_info_args_t args = {0};
+ struct lstio_session_info_args args = { 0 };
args.lstio_ses_idp = sid;
args.lstio_ses_keyp = key;
int
jt_lst_show_session(int argc, char **argv)
{
- lstcon_ndlist_ent_t ndinfo;
- lst_sid_t sid;
+ struct lstcon_ndlist_ent ndinfo;
+ struct lst_sid sid;
char name[LST_NAME_SIZE];
unsigned feats;
int key;
return -1;
}
- fprintf(stdout, "%s ID: "LPU64"@%s, KEY: %d FEATURES: %x NODES: %d\n",
- name, sid.ses_stamp, libcfs_nid2str(sid.ses_nid),
+ fprintf(stdout, "%s ID: %ju@%s, KEY: %d FEATURES: %x NODES: %d\n",
+ name, (uintmax_t)sid.ses_stamp, libcfs_nid2str(sid.ses_nid),
key, feats, ndinfo.nle_nnode);
return 0;
int
lst_end_session_ioctl(void)
{
- lstio_session_end_args_t args = {0};
+ struct lstio_session_end_args args = { 0 };
- args.lstio_ses_key = session_key;
- return lst_ioctl (LSTIO_SESSION_END, &args, sizeof(args));
+ args.lstio_ses_key = session_key;
+ return lst_ioctl(LSTIO_SESSION_END, &args, sizeof(args));
}
int
lst_ping_ioctl(char *str, int type, int timeout,
int count, lnet_process_id_t *ids, struct list_head *head)
{
- lstio_debug_args_t args = {0};
+ struct lstio_debug_args args = { 0 };
args.lstio_dbg_key = session_key;
args.lstio_dbg_type = type;
lst_get_node_count(int type, char *str, int *countp, lnet_process_id_t **idspp)
{
char buf[LST_NAME_SIZE];
- lstcon_test_batch_ent_t ent;
- lstcon_ndlist_ent_t *entp = &ent.tbe_cli_nle;
- lst_sid_t sid;
+ struct lstcon_test_batch_ent ent;
+ struct lstcon_ndlist_ent *entp = &ent.tbe_cli_nle;
+ struct lst_sid sid;
unsigned feats;
int key;
int rc;
{
struct list_head head;
lnet_process_id_t *ids = NULL;
- lstcon_rpc_ent_t *ent = NULL;
+ struct lstcon_rpc_ent *ent = NULL;
char *str = NULL;
int optidx = 0;
int server = 0;
}
int
-lst_add_nodes_ioctl (char *name, int count, lnet_process_id_t *ids,
- unsigned *featp, struct list_head *resultp)
+lst_add_nodes_ioctl(char *name, int count, lnet_process_id_t *ids,
+ unsigned *featp, struct list_head *resultp)
{
- lstio_group_nodes_args_t args = {0};
+ struct lstio_group_nodes_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_nmlen = strlen(name);
int
lst_del_group_ioctl(char *name)
{
- lstio_group_del_args_t args = {0};
+ struct lstio_group_del_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_nmlen = strlen(name);
}
int
-lst_add_group_ioctl (char *name)
+lst_add_group_ioctl(char *name)
{
- lstio_group_add_args_t args = {0};
+ struct lstio_group_add_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_nmlen = strlen(name);
lst_update_group_ioctl(int opc, char *name, int clean, int count,
lnet_process_id_t *ids, struct list_head *resultp)
{
- lstio_group_update_args_t args = {0};
+ struct lstio_group_update_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_opc = opc;
int
lst_list_group_ioctl(int len, char *name, int idx)
{
- lstio_group_list_args_t args = {0};
+ struct lstio_group_list_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_idx = idx;
}
int
-lst_info_group_ioctl(char *name, lstcon_ndlist_ent_t *gent,
- int *idx, int *count, lstcon_node_ent_t *dents)
+lst_info_group_ioctl(char *name, struct lstcon_ndlist_ent *gent,
+ int *idx, int *count, struct lstcon_node_ent *dents)
{
- lstio_group_info_args_t args = {0};
+ struct lstio_group_info_args args = { 0 };
args.lstio_grp_key = session_key;
args.lstio_grp_nmlen = strlen(name);
int
jt_lst_list_group(int argc, char **argv)
{
- lstcon_ndlist_ent_t gent;
- lstcon_node_ent_t *dents;
+ struct lstcon_ndlist_ent gent;
+ struct lstcon_node_ent *dents;
int optidx = 0;
int verbose = 0;
int active = 0;
count = gent.nle_nnode;
- dents = malloc(count * sizeof(lstcon_node_ent_t));
+ dents = malloc(count * sizeof(struct lstcon_node_ent));
if (dents == NULL) {
fprintf(stderr, "Failed to malloc: %s\n",
strerror(errno));
lst_stat_ioctl (char *name, int count, lnet_process_id_t *idsp,
int timeout, struct list_head *resultp)
{
- lstio_stat_args_t args = {0};
+ struct lstio_stat_args args = { 0 };
- args.lstio_sta_key = session_key;
- args.lstio_sta_timeout = timeout;
- args.lstio_sta_nmlen = strlen(name);
- args.lstio_sta_namep = name;
- args.lstio_sta_count = count;
- args.lstio_sta_idsp = idsp;
- args.lstio_sta_resultp = resultp;
+ args.lstio_sta_key = session_key;
+ args.lstio_sta_timeout = timeout;
+ args.lstio_sta_nmlen = strlen(name);
+ args.lstio_sta_namep = name;
+ args.lstio_sta_count = count;
+ args.lstio_sta_idsp = idsp;
+ args.lstio_sta_resultp = resultp;
- return lst_ioctl (LSTIO_STAT_QUERY, &args, sizeof(args));
+ return lst_ioctl(LSTIO_STAT_QUERY, &args, sizeof(args));
}
typedef struct {
for (i = 0; i < count; i++) {
rc = lst_alloc_rpcent(&srp->srp_result[i], srp->srp_count,
- sizeof(sfw_counters_t) +
- sizeof(srpc_counters_t) +
+ sizeof(struct sfw_counters) +
+ sizeof(struct srpc_counters) +
sizeof(lnet_counters_t));
if (rc != 0) {
fprintf(stderr, "Out of memory\n");
return;
}
-void
+static void
lst_cal_lnet_stat(float delta, lnet_counters_t *lnet_new,
- lnet_counters_t *lnet_old)
+ lnet_counters_t *lnet_old, int mbs)
{
- float perf;
- float rate;
+ float perf;
+ float rate;
+ unsigned int unit_divisor;
- perf = (float)(lnet_new->send_length -
- lnet_old->send_length) / (1024 * 1024) / delta;
- lnet_stat_result.lnet_total_sndperf += perf;
+ unit_divisor = (mbs) ? (1000 * 1000) : (1024 * 1024);
+ perf = (float)(lnet_new->send_length -
+ lnet_old->send_length) / unit_divisor / delta;
+ lnet_stat_result.lnet_total_sndperf += perf;
- if (lnet_stat_result.lnet_min_sndperf > perf ||
- lnet_stat_result.lnet_min_sndperf == 0)
- lnet_stat_result.lnet_min_sndperf = perf;
+ if (lnet_stat_result.lnet_min_sndperf > perf ||
+ lnet_stat_result.lnet_min_sndperf == 0)
+ lnet_stat_result.lnet_min_sndperf = perf;
- if (lnet_stat_result.lnet_max_sndperf < perf)
- lnet_stat_result.lnet_max_sndperf = perf;
+ if (lnet_stat_result.lnet_max_sndperf < perf)
+ lnet_stat_result.lnet_max_sndperf = perf;
- perf = (float)(lnet_new->recv_length -
- lnet_old->recv_length) / (1024 * 1024) / delta;
- lnet_stat_result.lnet_total_rcvperf += perf;
+ perf = (float)(lnet_new->recv_length -
+ lnet_old->recv_length) / unit_divisor / delta;
+ lnet_stat_result.lnet_total_rcvperf += perf;
- if (lnet_stat_result.lnet_min_rcvperf > perf ||
- lnet_stat_result.lnet_min_rcvperf == 0)
- lnet_stat_result.lnet_min_rcvperf = perf;
+ if (lnet_stat_result.lnet_min_rcvperf > perf ||
+ lnet_stat_result.lnet_min_rcvperf == 0)
+ lnet_stat_result.lnet_min_rcvperf = perf;
- if (lnet_stat_result.lnet_max_rcvperf < perf)
- lnet_stat_result.lnet_max_rcvperf = perf;
+ if (lnet_stat_result.lnet_max_rcvperf < perf)
+ lnet_stat_result.lnet_max_rcvperf = perf;
- rate = (lnet_new->send_count - lnet_old->send_count) / delta;
- lnet_stat_result.lnet_total_sndrate += rate;
+ rate = (lnet_new->send_count - lnet_old->send_count) / delta;
+ lnet_stat_result.lnet_total_sndrate += rate;
- if (lnet_stat_result.lnet_min_sndrate > rate ||
- lnet_stat_result.lnet_min_sndrate == 0)
- lnet_stat_result.lnet_min_sndrate = rate;
+ if (lnet_stat_result.lnet_min_sndrate > rate ||
+ lnet_stat_result.lnet_min_sndrate == 0)
+ lnet_stat_result.lnet_min_sndrate = rate;
- if (lnet_stat_result.lnet_max_sndrate < rate)
- lnet_stat_result.lnet_max_sndrate = rate;
+ if (lnet_stat_result.lnet_max_sndrate < rate)
+ lnet_stat_result.lnet_max_sndrate = rate;
- rate = (lnet_new->recv_count - lnet_old->recv_count) / delta;
- lnet_stat_result.lnet_total_rcvrate += rate;
+ rate = (lnet_new->recv_count - lnet_old->recv_count) / delta;
+ lnet_stat_result.lnet_total_rcvrate += rate;
- if (lnet_stat_result.lnet_min_rcvrate > rate ||
- lnet_stat_result.lnet_min_rcvrate == 0)
- lnet_stat_result.lnet_min_rcvrate = rate;
+ if (lnet_stat_result.lnet_min_rcvrate > rate ||
+ lnet_stat_result.lnet_min_rcvrate == 0)
+ lnet_stat_result.lnet_min_rcvrate = rate;
- if (lnet_stat_result.lnet_max_rcvrate < rate)
- lnet_stat_result.lnet_max_rcvrate = rate;
+ if (lnet_stat_result.lnet_max_rcvrate < rate)
+ lnet_stat_result.lnet_max_rcvrate = rate;
- lnet_stat_result.lnet_stat_count ++;
+ lnet_stat_result.lnet_stat_count++;
- lnet_stat_result.lnet_avg_sndrate = lnet_stat_result.lnet_total_sndrate /
- lnet_stat_result.lnet_stat_count;
- lnet_stat_result.lnet_avg_rcvrate = lnet_stat_result.lnet_total_rcvrate /
- lnet_stat_result.lnet_stat_count;
-
- lnet_stat_result.lnet_avg_sndperf = lnet_stat_result.lnet_total_sndperf /
- lnet_stat_result.lnet_stat_count;
- lnet_stat_result.lnet_avg_rcvperf = lnet_stat_result.lnet_total_rcvperf /
- lnet_stat_result.lnet_stat_count;
+ lnet_stat_result.lnet_avg_sndrate = lnet_stat_result.lnet_total_sndrate /
+ lnet_stat_result.lnet_stat_count;
+ lnet_stat_result.lnet_avg_rcvrate = lnet_stat_result.lnet_total_rcvrate /
+ lnet_stat_result.lnet_stat_count;
+ lnet_stat_result.lnet_avg_sndperf = lnet_stat_result.lnet_total_sndperf /
+ lnet_stat_result.lnet_stat_count;
+ lnet_stat_result.lnet_avg_rcvperf = lnet_stat_result.lnet_total_rcvperf /
+ lnet_stat_result.lnet_stat_count;
}
-void
-lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type)
+static void
+lst_print_lnet_stat(char *name, int bwrt, int rdwr, int type, int mbs)
{
- int start1 = 0;
- int end1 = 1;
- int start2 = 0;
- int end2 = 1;
- int i;
- int j;
+ int start1 = 0;
+ int end1 = 1;
+ int start2 = 0;
+ int end2 = 1;
+ int i;
+ int j;
+ char *units;
- if (lnet_stat_result.lnet_stat_count == 0)
- return;
+ if (lnet_stat_result.lnet_stat_count == 0)
+ return;
- if (bwrt == 1) /* bw only */
- start1 = 1;
+ units = (mbs) ? "MB/s " : "MiB/s ";
- if (bwrt == 2) /* rates only */
- end1 = 0;
+ if (bwrt == 1) /* bw only */
+ start1 = 1;
- if (rdwr == 1) /* recv only */
- start2 = 1;
+ if (bwrt == 2) /* rates only */
+ end1 = 0;
- if (rdwr == 2) /* send only */
- end2 = 0;
+ if (rdwr == 1) /* recv only */
+ start2 = 1;
- for (i = start1; i <= end1; i++) {
- fprintf(stdout, "[LNet %s of %s]\n",
- i == 0 ? "Rates" : "Bandwidth", name);
+ if (rdwr == 2) /* send only */
+ end2 = 0;
- for (j = start2; j <= end2; j++) {
- fprintf(stdout, "[%c] ", j == 0 ? 'R' : 'W');
+ for (i = start1; i <= end1; i++) {
+ fprintf(stdout, "[LNet %s of %s]\n",
+ i == 0 ? "Rates" : "Bandwidth", name);
- if ((type & 1) != 0) {
- fprintf(stdout, i == 0 ? "Avg: %-8.0f RPC/s " :
- "Avg: %-8.2f MB/s ",
- lst_lnet_stat_value(i, j, 0));
- }
+ for (j = start2; j <= end2; j++) {
+ fprintf(stdout, "[%c] ", j == 0 ? 'R' : 'W');
- if ((type & 2) != 0) {
- fprintf(stdout, i == 0 ? "Min: %-8.0f RPC/s " :
- "Min: %-8.2f MB/s ",
- lst_lnet_stat_value(i, j, 1));
- }
+ if ((type & 1) != 0) {
+ fprintf(stdout, i == 0 ? "Avg: %-8.0f RPC/s " :
+ "Avg: %-8.2f %s",
+ lst_lnet_stat_value(i, j, 0), units);
+ }
- if ((type & 4) != 0) {
- fprintf(stdout, i == 0 ? "Max: %-8.0f RPC/s" :
- "Max: %-8.2f MB/s",
- lst_lnet_stat_value(i, j, 2));
- }
+ if ((type & 2) != 0) {
+ fprintf(stdout, i == 0 ? "Min: %-8.0f RPC/s " :
+ "Min: %-8.2f %s",
+ lst_lnet_stat_value(i, j, 1), units);
+ }
- fprintf(stdout, "\n");
- }
- }
+ if ((type & 4) != 0) {
+ fprintf(stdout, i == 0 ? "Max: %-8.0f RPC/s" :
+ "Max: %-8.2f %s",
+ lst_lnet_stat_value(i, j, 2), units);
+ }
+
+ fprintf(stdout, "\n");
+ }
+ }
}
-void
+static void
lst_print_stat(char *name, struct list_head *resultp,
- int idx, int lnet, int bwrt, int rdwr, int type)
+ int idx, int lnet, int bwrt, int rdwr, int type,
+ int mbs)
{
struct list_head tmp[2];
- lstcon_rpc_ent_t *new;
- lstcon_rpc_ent_t *old;
- sfw_counters_t *sfwk_new;
- sfw_counters_t *sfwk_old;
- srpc_counters_t *srpc_new;
- srpc_counters_t *srpc_old;
+ struct lstcon_rpc_ent *new;
+ struct lstcon_rpc_ent *old;
+ struct sfw_counters *sfwk_new;
+ struct sfw_counters *sfwk_old;
+ struct srpc_counters *srpc_new;
+ struct srpc_counters *srpc_old;
lnet_counters_t *lnet_new;
lnet_counters_t *lnet_old;
float delta;
break;
}
- new = list_entry(resultp[idx].next, lstcon_rpc_ent_t,
+ new = list_entry(resultp[idx].next, struct lstcon_rpc_ent,
rpe_link);
- old = list_entry(resultp[1 - idx].next, lstcon_rpc_ent_t,
+ old = list_entry(resultp[1 - idx].next, struct lstcon_rpc_ent,
rpe_link);
/* first time get stats result, can't calculate diff */
continue;
}
- sfwk_new = (sfw_counters_t *)&new->rpe_payload[0];
- sfwk_old = (sfw_counters_t *)&old->rpe_payload[0];
+ sfwk_new = (struct sfw_counters *)&new->rpe_payload[0];
+ sfwk_old = (struct sfw_counters *)&old->rpe_payload[0];
- srpc_new = (srpc_counters_t *)((char *)sfwk_new + sizeof(*sfwk_new));
- srpc_old = (srpc_counters_t *)((char *)sfwk_old + sizeof(*sfwk_old));
+ srpc_new = (struct srpc_counters *)((char *)sfwk_new + sizeof(*sfwk_new));
+ srpc_old = (struct srpc_counters *)((char *)sfwk_old + sizeof(*sfwk_old));
lnet_new = (lnet_counters_t *)((char *)srpc_new + sizeof(*srpc_new));
lnet_old = (lnet_counters_t *)((char *)srpc_old + sizeof(*srpc_old));
delta = tv.tv_sec + (float)tv.tv_usec / 1000000;
}
- if (!lnet) /* TODO */
- continue;
+ if (!lnet) /* TODO */
+ continue;
- lst_cal_lnet_stat(delta, lnet_new, lnet_old);
- }
+ lst_cal_lnet_stat(delta, lnet_new, lnet_old, mbs);
+ }
list_splice(&tmp[idx], &resultp[idx]);
list_splice(&tmp[1 - idx], &resultp[1 - idx]);
- if (errcount > 0)
- fprintf(stdout, "Failed to stat on %d nodes\n", errcount);
+ if (errcount > 0)
+ fprintf(stdout, "Failed to stat on %d nodes\n", errcount);
- if (!lnet) /* TODO */
- return;
+ if (!lnet) /* TODO */
+ return;
- lst_print_lnet_stat(name, bwrt, rdwr, type);
+ lst_print_lnet_stat(name, bwrt, rdwr, type, mbs);
}
int
jt_lst_stat(int argc, char **argv)
{
struct list_head head;
- lst_stat_req_param_t *srp;
- time_t last = 0;
- int optidx = 0;
- int timeout = 5; /* default timeout, 5 sec */
- int delay = 5; /* default delay, 5 sec */
- int count = -1; /* run forever */
- int lnet = 1; /* lnet stat by default */
- int bwrt = 0;
- int rdwr = 0;
- int type = -1;
- int idx = 0;
- int rc;
- int c;
-
- static struct option stat_opts[] =
- {
+ lst_stat_req_param_t *srp;
+ time_t last = 0;
+ int optidx = 0;
+ int timeout = 5; /* default timeout, 5 sec */
+ int delay = 5; /* default delay, 5 sec */
+ int count = -1; /* run forever */
+ int lnet = 1; /* lnet stat by default */
+ int bwrt = 0;
+ int rdwr = 0;
+ int type = -1;
+ int idx = 0;
+ int rc;
+ int c;
+ int mbs = 0; /* report as MB/s */
+
+ static struct option stat_opts[] = {
{"timeout" , required_argument, 0, 't' },
{"delay" , required_argument, 0, 'd' },
{"count" , required_argument, 0, 'o' },
{"avg" , no_argument, 0, 'g' },
{"min" , no_argument, 0, 'n' },
{"max" , no_argument, 0, 'x' },
+ {"mbs" , no_argument, 0, 'm' },
{0, 0, 0, 0 }
};
}
while (1) {
- c = getopt_long(argc, argv, "t:d:lcbarwgnx", stat_opts, &optidx);
+ c = getopt_long(argc, argv, "t:d:lcbarwgnxm", stat_opts,
+ &optidx);
if (c == -1)
break;
}
type |= 2;
break;
- case 'x':
- if (type == -1) {
- type = 4;
- break;
- }
- type |= 4;
- break;
-
- default:
- lst_print_usage(argv[0]);
- return -1;
- }
- }
+ case 'x':
+ if (type == -1) {
+ type = 4;
+ break;
+ }
+ type |= 4;
+ break;
+ case 'm':
+ mbs = 1;
+ break;
+
+ default:
+ lst_print_usage(argv[0]);
+ return -1;
+ }
+ }
if (optind == argc) {
lst_print_usage(argv[0]);
}
lst_print_stat(srp->srp_name, srp->srp_result,
- idx, lnet, bwrt, rdwr, type);
+ idx, lnet, bwrt, rdwr, type, mbs);
- lst_reset_rpcent(&srp->srp_result[1 - idx]);
- }
+ lst_reset_rpcent(&srp->srp_result[1 - idx]);
+ }
idx = 1 - idx;
{
struct list_head head;
lst_stat_req_param_t *srp;
- lstcon_rpc_ent_t *ent;
- sfw_counters_t *sfwk;
- srpc_counters_t *srpc;
+ struct lstcon_rpc_ent *ent;
+ struct sfw_counters *sfwk;
+ struct srpc_counters *srpc;
int show_rpc = 1;
int optidx = 0;
int rc = 0;
continue;
}
- sfwk = (sfw_counters_t *)&ent->rpe_payload[0];
- srpc = (srpc_counters_t *)((char *)sfwk + sizeof(*sfwk));
+ sfwk = (struct sfw_counters *)&ent->rpe_payload[0];
+ srpc = (struct srpc_counters *)((char *)sfwk + sizeof(*sfwk));
if (srpc->errors == 0 &&
sfwk->brw_errors == 0 && sfwk->ping_errors == 0)
}
int
-lst_add_batch_ioctl (char *name)
+lst_add_batch_ioctl(char *name)
{
- lstio_batch_add_args_t args = {0};
+ struct lstio_batch_add_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_nmlen = strlen(name);
int
lst_start_batch_ioctl(char *name, int timeout, struct list_head *resultp)
{
- lstio_batch_run_args_t args = {0};
+ struct lstio_batch_run_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_timeout = timeout;
int
lst_stop_batch_ioctl(char *name, int force, struct list_head *resultp)
{
- lstio_batch_stop_args_t args = {0};
+ struct lstio_batch_stop_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_force = force;
int
lst_list_batch_ioctl(int len, char *name, int index)
{
- lstio_batch_list_args_t args = {0};
+ struct lstio_batch_list_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_idx = index;
int
lst_info_batch_ioctl(char *batch, int test, int server,
- lstcon_test_batch_ent_t *entp, int *idxp,
- int *ndentp, lstcon_node_ent_t *dentsp)
+ struct lstcon_test_batch_ent *entp, int *idxp,
+ int *ndentp, struct lstcon_node_ent *dentsp)
{
- lstio_batch_info_args_t args = {0};
+ struct lstio_batch_info_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_nmlen = strlen(batch);
lst_list_tsb_nodes(char *batch, int test, int server,
int count, int active, int invalid)
{
- lstcon_node_ent_t *dents;
+ struct lstcon_node_ent *dents;
int index = 0;
int rc;
int c;
return 0;
/* verbose list, show nodes in batch or test */
- dents = malloc(count * sizeof(lstcon_node_ent_t));
+ dents = malloc(count * sizeof(struct lstcon_node_ent));
if (dents == NULL) {
fprintf(stdout, "Can't allocate memory\n");
return -1;
int
jt_lst_list_batch(int argc, char **argv)
{
- lstcon_test_batch_ent_t ent;
+ struct lstcon_test_batch_ent ent;
char *batch = NULL;
int optidx = 0;
int verbose = 0; /* list nodes in batch or test */
lst_query_batch_ioctl(char *batch, int test, int server,
int timeout, struct list_head *head)
{
- lstio_batch_query_args_t args = {0};
+ struct lstio_batch_query_args args = { 0 };
args.lstio_bat_key = session_key;
args.lstio_bat_testidx = test;
lst_print_tsb_verbose(struct list_head *head,
int active, int idle, int error)
{
- lstcon_rpc_ent_t *ent;
+ struct lstcon_rpc_ent *ent;
list_for_each_entry(ent, head, rpe_link) {
if (ent->rpe_priv[0] == 0 && active)
int
jt_lst_query_batch(int argc, char **argv)
{
- lstcon_test_batch_ent_t ent;
+ struct lstcon_test_batch_ent ent;
struct list_head head;
char *batch = NULL;
time_t last = 0;
}
int
-lst_get_bulk_param(int argc, char **argv, lst_test_bulk_param_t *bulk)
+lst_get_bulk_param(int argc, char **argv, struct lst_test_bulk_param *bulk)
{
char *tok = NULL;
char *end = NULL;
bulk->blk_size = 4096;
bulk->blk_opc = LST_BRW_READ;
bulk->blk_flags = LST_BRW_CHECK_NONE;
+ bulk->blk_srv_off = bulk->blk_cli_off = 0;
while (i < argc) {
if (strcasestr(argv[i], "check=") == argv[i] ||
return -1;
}
+ } else if (strcasestr(argv[i], "off=") == argv[i]) {
+ int off;
+
+ tok = strchr(argv[i], '=') + 1;
+
+ off = strtol(tok, &end, 0);
+ /* NB: align with sizeof(__u64) to simplify page
+ * checking implementation */
+ if (off < 0 || off % sizeof(__u64) != 0) {
+ fprintf(stderr,
+ "Invalid offset %s/%d, it should be "
+ "postive value and multiple of %d\n",
+ tok, off, (int)sizeof(__u64));
+ return -1;
+ }
+
+ /* NB: blk_srv_off is reserved so far */
+ bulk->blk_cli_off = bulk->blk_srv_off = off;
+ if (end == NULL)
+ return 0;
+
} else if (strcasecmp(argv[i], "read") == 0 ||
strcasecmp(argv[i], "r") == 0) {
bulk->blk_opc = LST_BRW_READ;
int
lst_get_test_param(char *test, int argc, char **argv, void **param, int *plen)
{
- lst_test_bulk_param_t *bulk = NULL;
+ struct lst_test_bulk_param *bulk = NULL;
int type;
type = lst_test_name2type(test);
int dist, int span, char *sgrp, char *dgrp,
void *param, int plen, int *retp, struct list_head *resultp)
{
- lstio_test_args_t args = {0};
+ struct lstio_test_args args = { 0 };
args.lstio_tes_key = session_key;
args.lstio_tes_bat_nmlen = strlen(batch);
"Usage: lst list_group [--active] [--busy] [--down] [--unknown] GROUP ..." },
{"stat", jt_lst_stat, NULL,
"Usage: lst stat [--bw] [--rate] [--read] [--write] [--max] [--min] [--avg] "
- " [--timeout #] [--delay #] [--count #] GROUP [GROUP]" },
+ " [--mbs] [--timeout #] [--delay #] [--count #] GROUP [GROUP]" },
{"show_error", jt_lst_show_error, NULL,
"Usage: lst show_error NAME | IDS ..." },
{"add_batch", jt_lst_add_batch, NULL,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff