#include <fcntl.h>
#include <sys/socket.h>
#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/stat.h>
#include <stdio.h>
#include <signal.h>
char rawbuf[8192];
char *buf = rawbuf;
int max = 8192;
+int thread;
#define IOCINIT(data) \
do { \
return strdup(buf);
}
-static int do_disconnect(const char *func)
+static char *cmdname(char *func)
+{
+ static char buf[512];
+
+ if (thread) {
+ sprintf(buf, "%s-%d", func, thread);
+ return buf;
+ }
+
+ return func;
+}
+
+#define difftime(a, b) \
+ ((double)(a)->tv_sec - (b)->tv_sec + \
+ ((double)((a)->tv_usec - (b)->tv_usec) / 1000000))
+
+static int be_verbose(int verbose, struct timeval *next_time,
+ int num, int *next_num, int num_total)
+{
+ struct timeval now;
+
+ if (!verbose)
+ return 0;
+
+ if (next_time != NULL)
+ gettimeofday(&now, NULL);
+
+ /* A positive verbosity means to print every X iterations */
+ if (verbose > 0 &&
+ (next_num == NULL || num >= *next_num || num >= num_total)) {
+ *next_num += verbose;
+ if (next_time) {
+ next_time->tv_sec = now.tv_sec - verbose;
+ next_time->tv_usec = now.tv_usec;
+ }
+ return 1;
+ }
+
+ /* A negative verbosity means to print at most each X seconds */
+ if (verbose < 0 && next_time != NULL && difftime(&now, next_time) >= 0){
+ next_time->tv_sec = now.tv_sec - verbose;
+ next_time->tv_usec = now.tv_usec;
+ if (next_num)
+ *next_num = num;
+ return 1;
+ }
+
+ return 0;
+}
+
+static int get_verbose(const char *arg)
+{
+ int verbose;
+
+ if (!arg || arg[0] == 'v')
+ verbose = 1;
+ else if (arg[0] == 's' || arg[0] == 'q')
+ verbose = 0;
+ else
+ verbose = strtoul(arg, NULL, 0);
+
+ return verbose;
+}
+
+static int do_disconnect(char *func, int verbose)
{
struct obd_ioctl_data data;
int rc;
rc = ioctl(fd, OBD_IOC_DISCONNECT , &data);
if (rc < 0) {
- fprintf(stderr, "error: %s: %x %s\n", func,
+ fprintf(stderr, "error: %s: %x %s\n", cmdname(func),
OBD_IOC_DISCONNECT, strerror(errno));
} else {
- printf("Disconnected connid %d\n", connid);
+ if (verbose)
+ printf("%s: disconnected connid %d\n", cmdname(func),
+ connid);
connid = -1;
}
struct obd_ioctl_data data;
int rc;
- do_disconnect(argv[0]);
+ do_disconnect(argv[0], 1);
memset(&data, 0, sizeof(data));
if ( argc != 2 ) {
- fprintf(stderr, "usage: %s devno\n", argv[0]);
+ fprintf(stderr, "usage: %s devno\n", cmdname(argv[0]));
return -1;
}
- data.ioc_dev = atoi(argv[1]);
+ data.ioc_dev = strtoul(argv[1], NULL, 0);
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]);
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
return -2;
}
if (fd == -1)
fd = open("/dev/obd", O_RDWR);
if (fd == -1) {
- fprintf(stderr, "error: %s: opening /dev/obd: %s\n", argv[0],
- strerror(errno));
+ fprintf(stderr, "error: %s: opening /dev/obd: %s\n",
+ cmdname(argv[0]), strerror(errno));
return errno;
}
rc = ioctl(fd, OBD_IOC_DEVICE , buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
+ fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
OBD_IOC_DEVICE, strerror(rc = errno));
return rc;
IOCINIT(data);
- do_disconnect(argv[0]);
+ do_disconnect(argv[0], 1);
if (argc != 1) {
- fprintf(stderr, "usage: %s\n", argv[0]);
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
return -1;
}
rc = ioctl(fd, OBD_IOC_CONNECT , &data);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
+ fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
OBD_IOC_CONNECT, strerror(rc = errno));
else
connid = data.ioc_conn1;
static int jt_disconnect(int argc, char **argv)
{
- struct obd_ioctl_data data;
- int rc;
+ if (argc != 1) {
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
+ return -1;
+ }
- IOCINIT(data);
+ return do_disconnect(argv[0], 0);
+}
- if (argc != 1) {
- fprintf(stderr, "usage: %s\n", argv[0]);
+static int jt__device(int argc, char **argv)
+{
+ char *arg2[3];
+ int rc, ret;
+
+ if (argc < 3) {
+ fprintf(stderr, "usage: %s devno <command [args ...]>\n",
+ cmdname(argv[0]));
return -1;
}
- rc = ioctl(fd, OBD_IOC_DISCONNECT , &data);
- if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
- OBD_IOC_DISCONNECT, strerror(rc = errno));
- else
- connid = -1;
+ arg2[0] = "device";
+ arg2[1] = argv[1];
+ arg2[2] = NULL;
+ rc = jt_device(2, arg2);
+
+ if (!rc) {
+ arg2[0] = "connect";
+ arg2[1] = NULL;
+ rc = jt_connect(1, arg2);
+ }
+
+ if (!rc)
+ rc = Parser_execarg(argc - 2, argv + 2, cmdlist);
+
+ ret = do_disconnect(argv[0], 0);
+ if (!rc)
+ rc = ret;
+
+ return rc;
+}
+
+static int jt__threads(int argc, char **argv)
+{
+ int threads, next_thread;
+ int verbose;
+ int i, j;
+ int rc;
+
+ if (argc < 5) {
+ fprintf(stderr,
+ "usage: %s numthreads verbose devno <cmd [args ...]>\n",
+ argv[0]);
+ return -1;
+ }
+
+ threads = strtoul(argv[1], NULL, 0);
+
+ verbose = get_verbose(argv[2]);
+
+ printf("%s: starting %d threads on device %s running %s\n",
+ argv[0], threads, argv[3], argv[4]);
+
+ for (i = 1, next_thread = verbose; i <= threads; i++) {
+ rc = fork();
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: #%d - %s\n", argv[0], i,
+ strerror(rc = errno));
+ break;
+ } else if (rc == 0) {
+ thread = i;
+ argv[2] = "--device";
+ return jt__device(argc - 2, argv + 2);
+ } else if (be_verbose(verbose, NULL, i, &next_thread, threads))
+ printf("%s: thread #%d (PID %d) started\n",
+ argv[0], i, rc);
+ rc = 0;
+ }
+
+ if (!thread) { /* parent process */
+ if (!verbose)
+ printf("%s: started %d threads\n\n", argv[0], i - 1);
+ else
+ printf("\n");
+
+ for (j = 1; j < i; j++) {
+ int status;
+ int ret = wait(&status);
+
+ if (ret < 0) {
+ fprintf(stderr, "error: %s: wait - %s\n",
+ argv[0], strerror(errno));
+ if (!rc)
+ rc = errno;
+ } else {
+ /*
+ * This is a hack. We _should_ be able to use
+ * WIFEXITED(status) to see if there was an
+ * error, but it appears to be broken and it
+ * always returns 1 (OK). See wait(2).
+ */
+ int err = WEXITSTATUS(status);
+ if (err)
+ fprintf(stderr,
+ "%s: PID %d had rc=%d\n",
+ argv[0], ret, err);
+ if (!rc)
+ rc = err;
+ }
+ }
+ }
return rc;
}
IOCINIT(data);
if (argc != 1) {
- fprintf(stderr, "usage: %s\n", argv[0]);
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
return -1;
}
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]);
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
return -2;
}
rc = ioctl(fd, OBD_IOC_DETACH , buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", argv[0], strerror(rc=errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc=errno));
return rc;
}
IOCINIT(data);
if (argc != 1) {
- fprintf(stderr, "usage: %s\n", argv[0]);
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
return -1;
}
rc = ioctl(fd, OBD_IOC_CLEANUP , &data);
if (rc < 0)
- fprintf(stderr, "error: %s: %s\n", argv[0], strerror(rc=errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc=errno));
return rc;
}
IOCINIT(data);
if (argc != 2 && argc != 3) {
- fprintf(stderr, "usage: %s type [data]\n", argv[0]);
+ fprintf(stderr, "usage: %s type [data]\n", cmdname(argv[0]));
return -1;
}
data.ioc_inlbuf2 = argv[2];
}
- printf("attach len %d addr %p type %s data %s\n", data.ioc_len, buf,
+ printf("%s: len %d addr %p type %s data %s\n",
+ cmdname(argv[0]), data.ioc_len, buf,
MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]);
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
return -2;
}
- printf("attach len %d addr %p raw %p type %s data %s and %s\n",
- data.ioc_len, buf, rawbuf,
+ printf("%s: len %d addr %p raw %p type %s data %s and %s\n",
+ cmdname(argv[0]), data.ioc_len, buf, rawbuf,
MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2), &buf[516]);
rc = ioctl(fd, OBD_IOC_ATTACH , buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
+ fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
OBD_IOC_ATTACH, strerror(rc = errno));
return rc;
IOCINIT(data);
if ( argc > 3) {
- fprintf(stderr, "usage: %s [device] [fstype]\n", argv[0]);
+ fprintf(stderr, "usage: %s [device] [fstype]\n",
+ cmdname(argv[0]));
return -1;
}
data.ioc_inlbuf2 = argv[2];
}
- printf("setup len %d addr %p device %s type %s\n", data.ioc_len, buf,
+ printf("%s: len %d addr %p device %s type %s\n",
+ cmdname(argv[0]), data.ioc_len, buf,
MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]);
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
return -2;
}
- printf("setup len %d addr %p raw %p device %s type %s\n",
- data.ioc_len, buf, rawbuf,
+ printf("%s: len %d addr %p raw %p device %s type %s\n",
+ cmdname(argv[0]), data.ioc_len, buf, rawbuf,
MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
rc = ioctl(fd, OBD_IOC_SETUP , buf);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
- OBD_IOC_SETUP, strerror(rc = errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc = errno));
return rc;
}
static int jt_create(int argc, char **argv)
{
struct obd_ioctl_data data;
- int num = 1;
- int silent = 0;
+ struct timeval next_time;
+ int count = 1, next_count;
+ int verbose;
int i;
int rc;
IOCINIT(data);
if (argc < 2 || argc > 4) {
- fprintf(stderr, "usage: %s num [mode] [silent]\n", argv[0]);
+ fprintf(stderr, "usage: %s num [mode] [verbose]\n",
+ cmdname(argv[0]));
return -1;
}
- num = strtoul(argv[1], NULL, 0);
+ count = strtoul(argv[1], NULL, 0);
if (argc > 2)
data.ioc_obdo1.o_mode = strtoul(argv[2], NULL, 0);
data.ioc_obdo1.o_mode = 0100644;
data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
- if (argc > 3)
- silent = strtoul(argv[3], NULL, 0);
+ verbose = get_verbose(argv[3]);
- printf("Creating %d obdos\n", num);
+ printf("%s: %d obdos\n", cmdname(argv[0]), count);
+ gettimeofday(&next_time, NULL);
+ next_time.tv_sec -= verbose;
- for (i = 0 ; i < num ; i++) {
+ for (i = 1, next_count = verbose; i <= count ; i++) {
rc = ioctl(fd, OBD_IOC_CREATE , &data);
if (rc < 0) {
- fprintf(stderr, "error: %s: #%d - %x %s\n", argv[0],
- i, OBD_IOC_CREATE, strerror(rc = errno));
+ fprintf(stderr, "error: %s: #%d - %s\n",
+ cmdname(argv[0]), i, strerror(rc = errno));
break;
}
- if (!silent)
- printf("created obdo %Ld\n", data.ioc_obdo1.o_id);
+ if (be_verbose(verbose, &next_time, i, &next_count, count))
+ printf("%s: #%d is object id %Ld\n", cmdname(argv[0]),
+ i, data.ioc_obdo1.o_id);
}
return rc;
}
IOCINIT(data);
if (argc != 2) {
- fprintf(stderr, "usage: %s id mode\n", argv[0]);
+ fprintf(stderr, "usage: %s id mode\n", cmdname(argv[0]));
return -1;
}
rc = ioctl(fd, OBD_IOC_SETATTR , &data);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
- OBD_IOC_SETATTR, strerror(rc = errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc = errno));
return rc;
}
IOCINIT(data);
if (argc != 2) {
- fprintf(stderr, "usage: %s id\n", argv[0]);
+ fprintf(stderr, "usage: %s id\n", cmdname(argv[0]));
return -1;
}
rc = ioctl(fd, OBD_IOC_DESTROY , &data);
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", argv[0],
- OBD_IOC_DESTROY, strerror(rc = errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc = errno));
return rc;
}
int rc;
if (argc != 2) {
- fprintf(stderr, "usage: %s id\n", argv[0]);
+ fprintf(stderr, "usage: %s id\n", cmdname(argv[0]));
return -1;
}
/* to help obd filter */
data.ioc_obdo1.o_mode = 0100644;
data.ioc_obdo1.o_valid = 0xffffffff;
- printf("getting attr for %Ld\n", data.ioc_obdo1.o_id);
+ printf("%s: object id %Ld\n", cmdname(argv[0]), data.ioc_obdo1.o_id);
rc = ioctl(fd, OBD_IOC_GETATTR , &data);
if (rc) {
- fprintf(stderr, "error: %s: %s\n", argv[0], strerror(rc=errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc=errno));
} else {
- printf("attr obdo %Ld, mode %o\n", data.ioc_obdo1.o_id,
- data.ioc_obdo1.o_mode);
+ printf("%s: object id %Ld, mode %o\n", cmdname(argv[0]),
+ data.ioc_obdo1.o_id, data.ioc_obdo1.o_mode);
}
return rc;
}
static int jt_test_getattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- struct timeval start;
- int count, i;
- int silent = 0;
+ struct timeval start, next_time;
+ int i, count, next_count;
+ int verbose;
int rc;
if (argc != 2 && argc != 3) {
- fprintf(stderr, "usage: %s count [silent]\n", argv[0]);
+ fprintf(stderr, "usage: %s count [verbose]\n",cmdname(argv[0]));
return -1;
}
IOCINIT(data);
count = strtoul(argv[1], NULL, 0);
- if (argc == 3) {
- if (argv[2][0] == 's' || argv[2][0] == 'q')
- silent = 1;
- else
- silent = strtoul(argv[2], NULL, 0);
- }
+ verbose = get_verbose(argv[2]);
+
data.ioc_obdo1.o_valid = 0xffffffff;
data.ioc_obdo1.o_id = 2;
gettimeofday(&start, NULL);
- printf("getting %d attrs (testing only): %s", count,
- ctime(&start.tv_sec));
+ next_time.tv_sec = start.tv_sec - verbose;
+ next_time.tv_usec = start.tv_usec;
+ printf("%s: getting %d attrs (testing only): %s", cmdname(argv[0]),
+ count, ctime(&start.tv_sec));
- for (i = 0 ; i < count; i++) {
+ for (i = 1, next_count = verbose; i <= count; i++) {
rc = ioctl(fd, OBD_IOC_GETATTR , &data);
- if (rc) {
- fprintf(stderr, "error: %s: #%d - %s\n", argv[0], i,
- strerror(rc = errno));
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: #%d - %s\n",
+ cmdname(argv[0]), i, strerror(rc = errno));
break;
- } else if (!silent) {
- printf("attr number %d\n", i);
- }
+ } else if (be_verbose(verbose, &next_time, i,&next_count,count))
+ printf("%s: got attr #%d\n", cmdname(argv[0]), i);
}
+
if (!rc) {
struct timeval end;
double diff;
gettimeofday(&end, NULL);
- diff = ((double)(end.tv_sec - start.tv_sec) +
- (double)(end.tv_usec - start.tv_usec) / 1000000);
+ diff = difftime(&end, &start);
- printf("got %d attrs in %gs (%g attr/s): %s", i,
- diff, (double)i / diff, ctime(&end.tv_sec));
+ --i;
+ printf("%s: %d attrs in %.4gs (%.4g attr/s): %s",
+ cmdname(argv[0]), i, diff, (double)i / diff,
+ ctime(&end.tv_sec));
}
return rc;
}
static int jt_test_brw(int argc, char **argv)
{
struct obd_ioctl_data data;
- struct timeval start;
+ struct timeval start, next_time;
char *bulk, *b;
- int pages = 1, obdos = 1, count;
- int silent = 0, write = 0, rw;
+ int pages = 1, obdos = 1, count, next_count;
+ int verbose = 1, write = 0, rw;
int i, o, p;
int len;
int rc;
if (argc < 2 || argc > 6) {
- fprintf(stderr, "usage: \n"
- "%s count [write [silent [pages [obdos]]]]\n", argv[0]);
+ fprintf(stderr,
+ "usage: %s count [write [verbose [pages [obdos]]]]\n",
+ cmdname(argv[0]));
return -1;
}
count = strtoul(argv[1], NULL, 0);
if (argc >= 3) {
- if (argv[2][0] == 'w')
+ if (argv[2][0] == 'w' || argv[2][0] == '1')
write = 1;
- else if (argv[2][0] == 'r')
+ else if (argv[2][0] == 'r' || argv[2][0] == '0')
write = 0;
- else
- write = strtoul(argv[2], NULL, 0);
- }
- if (argc >= 4) {
- if (argv[3][0] == 's' || argv[3][0] == 'q')
- silent = 1;
- else
- silent = strtoul(argv[3], NULL, 0);
+
+ verbose = get_verbose(argv[3]);
}
+
if (argc >= 5)
pages = strtoul(argv[4], NULL, 0);
if (argc >= 6)
if (obdos != 1 && obdos != 2) {
fprintf(stderr, "error: %s: only 1 or 2 obdos supported\n",
- argv[0]);
+ cmdname(argv[0]));
return -2;
}
bulk = calloc(obdos, len);
if (!bulk) {
fprintf(stderr, "error: %s: no memory allocating %dx%d pages\n",
- argv[0], obdos, pages);
+ cmdname(argv[0]), obdos, pages);
return -2;
}
IOCINIT(data);
}
gettimeofday(&start, NULL);
- printf("%s %d (%dx%d pages) (testing only): %s",
- write ? "writing" : "reading", count, obdos, pages,
- ctime(&start.tv_sec));
+ next_time.tv_sec = start.tv_sec - verbose;
+ next_time.tv_usec = start.tv_usec;
+
+ printf("%s: %s %d (%dx%d pages) (testing only): %s",
+ cmdname(argv[0]), write ? "writing" : "reading",
+ count, obdos, pages, ctime(&start.tv_sec));
/*
* We will put in the start time (and loop count inside the loop)
memcpy(b, &start, sizeof(start));
rw = write ? OBD_IOC_BRW_WRITE : OBD_IOC_BRW_READ;
- for (i = 0 ; i < count; i++) {
+ for (i = 1, next_count = verbose; i <= count; i++) {
if (write) {
b = bulk + sizeof(struct timeval);
for (o = 0; o < obdos; o++)
rc = ioctl(fd, rw, &data);
if (rc) {
- fprintf(stderr, "error: %s: #%d - %s on %s\n", argv[0],
- i, strerror(rc = errno),
+ fprintf(stderr, "error: %s: #%d - %s on %s\n",
+ cmdname(argv[0]), i, strerror(rc = errno),
write ? "write" : "read");
break;
- } else if (!silent)
- printf("%s number %d\n", write ? "write" : "read", i);
+ } else if (be_verbose(verbose, &next_time, i,&next_count,count))
+ printf("%s: %s number %d\n", cmdname(argv[0]),
+ write ? "write" : "read", i);
}
free(bulk);
gettimeofday(&end, NULL);
- diff = ((double)(end.tv_sec - start.tv_sec) +
- (double)(end.tv_usec - start.tv_usec) / 1000000);
+ diff = difftime(&end, &start);
- printf("%s %dx%dx%d pages in %gs (%g pg/s): %s",
- write ? "wrote" : "read", obdos, pages, i, diff,
- (double)obdos * i * pages / diff, ctime(&end.tv_sec));
+ --i;
+ printf("%s: %s %dx%dx%d pages in %.4gs (%.4g pg/s): %s",
+ cmdname(argv[0]), write ? "wrote" : "read", obdos,
+ pages, i, diff, (double)obdos * i * pages / diff,
+ ctime(&end.tv_sec));
}
return rc;
}
IOCINIT(data);
if (argc != 1) {
- fprintf(stderr, "usage: %s\n", argv[0]);
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
return 1;
}
rc = ioctl(fd, IOC_LDLM_TEST, &data);
if (rc)
- fprintf(stderr, "error: %s: test failed: %s\n", argv[0],
- strerror(rc = errno));
+ fprintf(stderr, "error: %s: test failed: %s\n",
+ cmdname(argv[0]), strerror(rc = errno));
return rc;
}
command_t cmdlist[] = {
+ /* Metacommands */
+ {"--device", jt__device, 0, "--device <devno> <command [args ...]>"},
+ {"--threads", jt__threads, 0,
+ "--threads <threads> <devno> <command [args ...]>"},
+
+ /* Device configuration commands */
{"device", jt_device, 0, "set current device (args device no)"},
{"attach", jt_attach, 0, "name the type of device (args: type data"},
{"setup", jt_setup, 0, "setup device (args: <blkdev> [data]"},
{"detach", jt_detach, 0, "detach the current device (arg: )"},
{"cleanup", jt_cleanup, 0, "cleanup the current device (arg: )"},
- {"create", jt_create, 0, "create [count [mode [silent]]]"},
- {"destroy", jt_destroy, 0, "destroy <id>"},
- {"getattr", jt_getattr, 0, "getattr <id>"},
- {"setattr", jt_setattr, 0, "setattr <id> <mode>"},
+
+ /* Session commands */
{"connect", jt_connect, 0, "connect - get a connection to device"},
{"disconnect", jt_disconnect, 0,
"disconnect - break connection to device"},
- {"test_getattr", jt_test_getattr, 0, "test_getattr <count> [silent]"},
- {"test_brw", jt_test_brw, 0, "test_brw <count> [write [silent]]"},
+
+ /* Session operations */
+ {"create", jt_create, 0, "create [count [mode [verbose]]]"},
+ {"destroy", jt_destroy, 0, "destroy <id>"},
+ {"getattr", jt_getattr, 0, "getattr <id>"},
+ {"setattr", jt_setattr, 0, "setattr <id> <mode>"},
+ {"test_getattr", jt_test_getattr, 0, "test_getattr <count> [verbose]"},
+ {"test_brw", jt_test_brw, 0, "test_brw <count> [write [verbose]]"},
{"test_ldlm", jt_test_ldlm, 0, "test lock manager (no args)"},
+
+ /* User interface commands */
{"help", Parser_help, 0, "help"},
{"exit", Parser_quit, 0, "quit"},
{"quit", Parser_quit, 0, "quit"},
static void signal_server(int sig)
{
if (sig == SIGINT) {
- fprintf(stderr,"\nDisconnecting any existing connections...\n");
- do_disconnect("sigint");
+ do_disconnect("sigint", 1);
exit(1);
+ } else {
+ fprintf(stderr, "%s: got signal %d\n", cmdname("sigint"), sig);
}
}
if (argc > 1) {
- rc = Parser_execarg(argc - 1, &argv[1], cmdlist);
+ rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
} else {
Parser_init("obdctl > ", cmdlist);
Parser_commands();
}
- do_disconnect(argv[0]);
+ do_disconnect(argv[0], 1);
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff