*
*/
+
#include <stdlib.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <linux/lustre_idl.h>
#include <linux/lustre_dlm.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+
#include <unistd.h>
#include <sys/un.h>
#include <time.h>
#include "parser.h"
#include <stdio.h>
+static int jt_newdev(int argc, char **argv);
+static int jt_attach(int argc, char **argv);
+static int jt_setup(int argc, char **argv);
+
+
int fd = -1;
int connid = -1;
char rawbuf[8192];
char *buf = rawbuf;
int max = 8192;
int thread;
+int rc = 0;
#define IOCINIT(data) \
do { \
return func;
}
-static int do_disconnect(char *func)
+int getfd(char *func)
+{
+ if (fd == -1)
+ fd = open("/dev/obd", O_RDWR);
+ if (fd == -1) {
+ fprintf(stderr, "error: %s: opening /dev/obd: %s\n",
+ cmdname(func), strerror(errno));
+ return -1;
+ }
+ return 0;
+}
+
+#if 1
+#define difftime(a, b) \
+ ((double)(a)->tv_sec - (b)->tv_sec + \
+ ((double)((a)->tv_usec - (b)->tv_usec) / 1000000))
+#else
+
+#define difftime(a, b) (((a)->tv_sec - (b)->tv_sec) + \
+ (((a)->tv_usec - (b)->tv_usec) / 1000000))
+#endif
+
+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 = (int) strtoul(arg, NULL, 0);
+
+ if (verbose < 0)
+ printf("Print status every %d seconds\n", -verbose);
+ else if (verbose == 1)
+ printf("Print status every operation\n");
+ else if (verbose > 1)
+ printf("Print status every %d operations\n", verbose);
+
+ return verbose;
+}
+
+static int do_disconnect(char *func, int verbose)
{
struct obd_ioctl_data data;
- int rc;
if (connid == -1)
return 0;
fprintf(stderr, "error: %s: %x %s\n", cmdname(func),
OBD_IOC_DISCONNECT, strerror(errno));
} else {
- printf("%s: disconnected connid %d\n", cmdname(func), connid);
+ if (verbose)
+ printf("%s: disconnected connid %d\n", cmdname(func),
+ connid);
connid = -1;
}
extern command_t cmdlist[];
-static int jt_device(int argc, char **argv)
+/* Given a XML document and the root of a mds branch do the setup */
+static int xml_mds(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ char *fstype = NULL, *device = NULL;
+ char *newdev[1] = { "newdev" };
+ char *attach[3] = { "attach", "mds", "MDSDEV" };
+ char *setup[3] = { "setup", NULL, NULL };
+ int rc;
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "fstype"))
+ fstype = cur->content;
+
+ if (!xmlStrcmp(cur->name, "device"))
+ device = cur->content;
+ }
+
+ if ((fstype == NULL) || (device == NULL))
+ return -1;
+
+ /* Invoke commands as if passed interactively */
+ rc = jt_newdev(1, newdev);
+ if (rc != 0)
+ return rc;
+
+ rc = jt_attach(3, attach);
+ if (rc != 0)
+ return rc;
+
+ setup[1] = device;
+ setup[2] = fstype;
+ rc = jt_setup(3, setup);
+ if (rc != 0)
+ return rc;
+
+ return 0;
+}
+
+/* Given a XML document and the root of a obd branch do the setup */
+static int xml_obd(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ /* FIXME: Fill in the guts... */
+ return 0;
+}
+
+/* Given a XML document and the root of a ost branch do the setup */
+static int xml_ost(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ /* FIXME: Fill in the guts... */
+ return 0;
+}
+
+/* Given a XML document and the root of a osc branch do the setup */
+static int xml_osc(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ char *type = NULL, *address = NULL;
+ char *newdev[1] = { "newdev" };
+ char *attach[3] = { "attach", "osc", "OSCDEV" };
+ char *setup[2] = { "setup", "-1" };
+ int rc;
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "network")) {
+ type = xmlGetProp(cur, "type");
+ if (type == NULL)
+ return -1;
+
+ address = xmlGetProp(cur, "address");
+ if (address == NULL)
+ return -1;
+
+ /* FIXME: Do the portals setup here as well? */
+ }
+
+ cur = cur->next;
+ }
+
+ /* Invoke commands as if passed interactively */
+ rc = jt_newdev(1, newdev);
+ if (rc != 0)
+ return rc;
+
+ rc = jt_attach(2, attach);
+ if (rc != 0)
+ return rc;
+
+ rc = jt_setup(1, setup);
+ if (rc != 0)
+ return rc;
+
+ return 0;
+}
+
+/* Given a XML document and the root of a lov branch do the setup */
+static int xml_lov(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ /* FIXME: Fill in the guts... */
+ return 0;
+}
+
+/* Given a XML document and the root of a router branch do the setup */
+static int xml_router(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ /* FIXME: Fill in the guts... */
+ return 0;
+}
+
+/* Given a XML document and service id/uuid setup the service */
+static int xml_service(xmlDocPtr doc, xmlNodePtr root,
+ int serv_num, char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root;
+ char *id, *uuid;
+
+ while (cur != NULL) {
+ id = xmlGetProp(cur, "id");
+ uuid = xmlGetProp(cur, "uuid");
+
+ if (xmlStrcmp(id, serv_id) ||
+ xmlStrcmp(uuid, serv_uuid)) {
+ cur = cur->next;
+ continue;
+ }
+
+ if (!xmlStrcmp(cur->name, "mds"))
+ rc = xml_mds(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "obd"))
+ rc = xml_obd(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "ost"))
+ rc = xml_ost(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "osc"))
+ rc = xml_osc(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "lov"))
+ rc = xml_lov(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "router"))
+ rc = xml_router(doc, cur, serv_id, serv_uuid);
+ else
+ return -1;
+
+ cur = cur->next;
+ }
+
+ return rc;
+}
+
+/* Given a XML document and profile id/uuid setup the profile */
+static int xml_profile(xmlDocPtr doc, xmlNodePtr root,
+ int prof_num, char *prof_id, char *prof_uuid) {
+ xmlNodePtr parent, cur = root;
+ char *id, *uuid;
+ int rc = 0, num;
+
+ while (cur != NULL) {
+ id = xmlGetProp(cur, "id");
+ uuid = xmlGetProp(cur, "uuid");
+
+ if (xmlStrcmp(cur->name, "profile") ||
+ xmlStrcmp(id, prof_id) ||
+ xmlStrcmp(uuid, prof_uuid)) {
+ cur = cur->next;
+ continue;
+ }
+
+ /* FIXME: Doesn't understand mountpoints yet
+ * xml_mountpoint(doc, root, ...);
+ */
+
+ /* Setup each service in turn
+ * FIXME: Should be sorted by "num" attr, we shouldn't
+ * assume they're in order in the XML document.
+ */
+ parent = cur;
+ cur = cur->xmlChildrenNode;
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "service_id")) {
+ num = atoi(xmlGetProp(cur, "num"));
+ rc = xml_service(doc, root, num,
+ xmlGetProp(cur, "id"),
+ xmlGetProp(cur, "uuid"));
+ if (rc != 0)
+ return rc;
+ }
+
+ cur = cur->next;
+ }
+
+ cur = parent->next;
+ }
+
+ return rc;
+}
+
+static int xml_node(xmlDocPtr doc, xmlNodePtr root) {
+ xmlNodePtr parent, cur = root;
+ char *id, *uuid;
+ int rc = 0, num;
+
+ /* Walk the node tags looking for ours */
+ while (cur != NULL) {
+ if (xmlStrcmp(cur->name, "node")) {
+ cur = cur->next;
+ continue;
+ }
+
+ id = xmlGetProp(cur, "id");
+ if (id == NULL)
+ return -1;
+
+ uuid = xmlGetProp(cur, "uuid");
+ if (uuid == NULL)
+ return -1;
+
+ /* FIXME: Verify our ID and UUID against /etc/lustre/id
+ * so we're sure we are who we think we are.
+ */
+
+ /* Setup each profile in turn
+ * FIXME: Should be sorted by "num" attr, we shouldn't
+ * assume they're in order in the XML document.
+ */
+ parent = cur;
+ cur = cur->xmlChildrenNode;
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "profile_id")) {
+ num = atoi(xmlGetProp(cur, "num"));
+ rc = xml_profile(doc, root, num,
+ xmlGetProp(cur, "id"),
+ xmlGetProp(cur, "uuid"));
+ if (rc != 0)
+ return rc;
+ }
+
+ cur = cur->next;
+ }
+
+ cur = parent->next;
+ }
+
+ return rc;
+}
+
+static int do_xml(char *func, char *file)
{
- struct obd_ioctl_data data;
+ xmlDocPtr doc;
+ xmlNodePtr cur;
int rc;
- do_disconnect(argv[0]);
+ doc = xmlParseFile(file);
+ if (doc == NULL) {
+ fprintf(stderr, "error: Unable to parse XML\n");
+ return -1;
+ }
- memset(&data, 0, sizeof(data));
- if ( argc != 2 ) {
- fprintf(stderr, "usage: %s devno\n", cmdname(argv[0]));
+ cur = xmlDocGetRootElement(doc);
+ if (cur == NULL) {
+ fprintf(stderr, "error: Empty XML\n");
+ xmlFreeDoc(doc);
return -1;
}
+
+ if (xmlStrcmp(cur->name, (const xmlChar *)"lustre")) {
+ fprintf(stderr, "error: Root node != <lustre>\n");
+ xmlFreeDoc(doc);
+ return -1;
+ }
+
+ /* FIXME: Validate the XML against the DTD here */
+
+ /* FIXME: Merge all the text nodes under each branch and
+ * prune empty nodes. Just to make the parsing more
+ * tolerant.
+ */
+
+ rc = xml_node(doc, cur->xmlChildrenNode);
+ xmlFreeDoc(doc);
+
+ return rc;
+}
- data.ioc_dev = atoi(argv[1]);
+static int do_device(char *func, int dev)
+{
+ struct obd_ioctl_data data;
+
+ memset(&data, 0, sizeof(data));
+
+ data.ioc_dev = dev;
+
+ if (getfd(func))
+ return -1;
if (obd_ioctl_pack(&data, &buf, max)) {
- fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(argv[0]));
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func));
return -2;
}
- if (fd == -1)
- fd = open("/dev/obd", O_RDWR);
- if (fd == -1) {
- fprintf(stderr, "error: %s: opening /dev/obd: %s\n",
- cmdname(argv[0]), strerror(errno));
- return errno;
+ return ioctl(fd, OBD_IOC_DEVICE , buf);
+}
+
+static int jt_device(int argc, char **argv)
+{
+ do_disconnect(argv[0], 1);
+
+ if (argc != 2) {
+ fprintf(stderr, "usage: %s devno\n", cmdname(argv[0]));
+ return -1;
}
- rc = ioctl(fd, OBD_IOC_DEVICE , buf);
+ rc = do_device(argv[0], strtoul(argv[1], NULL, 0));
+
if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
- OBD_IOC_DEVICE, strerror(rc = errno));
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc = errno));
return rc;
}
static int jt_connect(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
- do_disconnect(argv[0]);
+ do_disconnect(argv[0], 1);
if (argc != 1) {
fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
static int jt_disconnect(int argc, char **argv)
{
- struct obd_ioctl_data data;
- int rc;
-
- IOCINIT(data);
-
if (argc != 1) {
fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
return -1;
}
- rc = ioctl(fd, OBD_IOC_DISCONNECT , &data);
- if (rc < 0)
- fprintf(stderr, "error: %s: %x %s\n", cmdname(argv[0]),
- OBD_IOC_DISCONNECT, strerror(rc = errno));
- else
- connid = -1;
+ return do_disconnect(argv[0], 0);
+}
- return rc;
+static int jt__xml(int argc, char **argv)
+{
+ if (argc < 2) {
+ fprintf(stderr, "usage: %s <xml file> <command [args ...]>\n",
+ cmdname(argv[0]));
+ return -1;
+ }
+
+ return do_xml("xml", argv[1]);
}
static int jt__device(int argc, char **argv)
{
char *arg2[3];
- int rc;
+ int ret;
if (argc < 3) {
fprintf(stderr, "usage: %s devno <command [args ...]>\n",
return -1;
}
- arg2[0] = "device";
- arg2[1] = argv[1];
- arg2[2] = NULL;
- rc = jt_device(2, arg2);
+ rc = do_device("device", strtoul(argv[1], NULL, 0));
if (!rc) {
arg2[0] = "connect";
if (!rc)
rc = Parser_execarg(argc - 2, argv + 2, cmdlist);
- if (!rc) {
- arg2[0] = "disconnect";
- arg2[1] = NULL;
- rc = jt_disconnect(1, arg2);
- }
+ ret = do_disconnect(argv[0], 0);
+ if (!rc)
+ rc = ret;
return rc;
}
static int jt__threads(int argc, char **argv)
{
- int threads;
+ int threads, next_thread;
+ int verbose;
int i, j;
- int rc;
- if (argc < 4) {
+ if (argc < 5) {
fprintf(stderr,
- "usage: %s numthreads devno <command [args ...]>\n",
+ "usage: %s numthreads verbose devno <cmd [args ...]>\n",
argv[0]);
return -1;
}
- threads = atoi(argv[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[2], argv[3]);
+ argv[0], threads, argv[3], argv[4]);
- for (i = 1; i <= threads; i++) {
+ for (i = 1, next_thread = verbose; i <= threads; i++) {
rc = fork();
if (rc < 0) {
fprintf(stderr, "error: %s: #%d - %s\n", argv[0], i,
break;
} else if (rc == 0) {
thread = i;
- argv[1] = "--device";
- return jt__device(argc - 1, argv + 1);
- } else {
- printf("%s: thread %d (PID %d) started\n",
+ 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;
- }
+ rc = 0;
}
- if (!thread) {
- printf("\n");
+ 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 == 0)
+ if (!rc)
rc = errno;
- } else if (WIFEXITED(status) == 0) {
- fprintf(stderr, "%s: PID %d had rc=%d\n",
- argv[0], ret, WEXITSTATUS(status));
- if (rc == 0)
- rc = WEXITSTATUS(status);
+ } 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;
}
}
}
static int jt_detach(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
static int jt_cleanup(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
return rc;
}
+static int jt_newdev(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+
+ if (getfd(argv[0]))
+ return -1;
+
+ IOCINIT(data);
+
+ if (argc != 1) {
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
+ return -1;
+ }
+
+ rc = ioctl(fd, OBD_IOC_NEWDEV , &data);
+ if (rc < 0)
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc=errno));
+ else {
+ printf("Current device set to %d\n", data.ioc_dev);
+ }
+
+ return rc;
+}
+
static int jt_attach(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 2 && argc != 3) {
- fprintf(stderr, "usage: %s type [data]\n", cmdname(argv[0]));
+ fprintf(stderr, "usage: %s type [name [uuid]]\n",
+ cmdname(argv[0]));
return -1;
}
data.ioc_inlbuf2 = argv[2];
}
- 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", cmdname(argv[0]));
return -2;
}
- 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", cmdname(argv[0]),
OBD_IOC_ATTACH, strerror(rc = errno));
+ else if (argc == 3) {
+ char name[1024];
+ if (strlen(argv[2]) > 128) {
+ printf("Name too long to set environment\n");
+ return -EINVAL;
+ }
+ snprintf(name, 512, "LUSTRE_DEV_%s", argv[2]);
+ rc = setenv(name, argv[1], 1);
+ if (rc) {
+ printf("error setting env variable %s\n", name);
+ }
+ }
return rc;
}
+#define N2D_OFF 0x100 /* So we can tell between error codes and devices */
+
+static int do_name2dev(char *func, char *name)
+{
+ struct obd_ioctl_data data;
+
+ if (getfd(func))
+ return -1;
+
+ IOCINIT(data);
+
+ data.ioc_inllen1 = strlen(name) + 1;
+ data.ioc_inlbuf1 = name;
+
+ if (obd_ioctl_pack(&data, &buf, max)) {
+ fprintf(stderr, "error: %s: invalid ioctl\n", cmdname(func));
+ return -2;
+ }
+ rc = ioctl(fd, OBD_IOC_NAME2DEV , buf);
+ if (rc < 0) {
+ fprintf(stderr, "error: %s: %s - %s\n", cmdname(func),
+ name, strerror(rc = errno));
+ return rc;
+ }
+
+ memcpy((char *)(&data), buf, sizeof(data));
+
+ return data.ioc_dev + N2D_OFF;
+}
+
+static int jt_name2dev(int argc, char **argv)
+{
+ if (argc != 2) {
+ fprintf(stderr, "usage: %s name\n", cmdname(argv[0]));
+ return -1;
+ }
+
+ rc = do_name2dev(argv[0], argv[1]);
+ if (rc >= N2D_OFF) {
+ int dev = rc - N2D_OFF;
+ rc = do_device(argv[0], dev);
+ if (rc == 0)
+ printf("%d\n", dev);
+ }
+ return rc;
+}
+
static int jt_setup(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
return -1;
}
+ data.ioc_dev = -1;
if (argc > 1) {
- data.ioc_inllen1 = strlen(argv[1]) + 1;
+ if (argv[1][0] == '$') {
+ rc = do_name2dev(argv[0], argv[1] + 1);
+ if (rc >= N2D_OFF) {
+ printf("%s is device %d\n", argv[1],
+ rc - N2D_OFF);
+ data.ioc_dev = rc - N2D_OFF;
+ }
+ } else
+ data.ioc_dev = strtoul(argv[1], NULL, 0);
+ data.ioc_inllen1 = strlen(argv[1]) + 1;
data.ioc_inlbuf1 = argv[1];
- data.ioc_dev = strtoul(argv[1], NULL, 0);
- } else {
- data.ioc_dev = -1;
}
if ( argc == 3 ) {
data.ioc_inllen2 = strlen(argv[2]) + 1;
data.ioc_inlbuf2 = argv[2];
}
- 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", cmdname(argv[0]));
return -2;
}
- 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: %s\n", cmdname(argv[0]),
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",
+ 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("%s: %d obdos\n", cmdname(argv[0]), 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 - %s\n",
cmdname(argv[0]), i, strerror(rc = errno));
break;
}
- if (!silent)
- printf("%s: #%Ld succeeded\n", cmdname(argv[0]),
- 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;
}
static int jt_setattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 2) {
data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
data.ioc_obdo1.o_mode = S_IFREG | strtoul(argv[2], NULL, 0);
- data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
+ data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
rc = ioctl(fd, OBD_IOC_SETATTR , &data);
if (rc < 0)
static int jt_destroy(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 2) {
static int jt_getattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
if (argc != 2) {
fprintf(stderr, "usage: %s id\n", cmdname(argv[0]));
IOCINIT(data);
data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
- /* to help obd filter */
+ /* to help obd filter */
data.ioc_obdo1.o_mode = 0100644;
data.ioc_obdo1.o_valid = 0xffffffff;
printf("%s: object id %Ld\n", cmdname(argv[0]), data.ioc_obdo1.o_id);
static int jt_test_getattr(int argc, char **argv)
{
struct obd_ioctl_data data;
- struct timeval start;
- int count, i;
- int silent = 0;
- int rc;
+ struct timeval start, next_time;
+ int i, count, next_count;
+ int verbose;
if (argc != 2 && argc != 3) {
- fprintf(stderr, "usage: %s count [silent]\n", cmdname(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);
- }
+ if (argc == 3)
+ verbose = get_verbose(argv[2]);
+ else
+ verbose = 1;
+
data.ioc_obdo1.o_valid = 0xffffffff;
data.ioc_obdo1.o_id = 2;
gettimeofday(&start, NULL);
- printf("%s: %d attrs (testing only): %s", cmdname(argv[0]), 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) {
+ if (rc < 0) {
fprintf(stderr, "error: %s: #%d - %s\n",
cmdname(argv[0]), i, strerror(rc = errno));
break;
- } else if (!silent) {
+ } 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);
+ --i;
printf("%s: %d attrs in %.4gs (%.4g attr/s): %s",
cmdname(argv[0]), i, diff, (double)i / diff,
ctime(&end.tv_sec));
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: %s count [write [silent [pages [obdos]]]]\n",
+ "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)
data.ioc_plen1 = len;
data.ioc_pbuf1 = bulk;
if (obdos > 1) {
- data.ioc_obdo2.o_id = 2;
+ data.ioc_obdo2.o_id = 3;
data.ioc_plen2 = len;
data.ioc_pbuf2 = bulk + len;
}
gettimeofday(&start, NULL);
+ 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)
* at the beginning of each page so that we will be able to validate
* (at some later time) whether the data actually made it or not.
+ *
+ * XXX we do not currently use any of this memory in OBD_IOC_BRW_*
+ * just to avoid the overhead of the copy_{to,from}_user. It
+ * can be fixed if we ever need to send real data around.
*/
for (o = 0, b = bulk; o < obdos; o++)
for (p = 0; p < pages; p++, b += PAGE_SIZE)
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++)
cmdname(argv[0]), i, strerror(rc = errno),
write ? "write" : "read");
break;
- } else if (!silent)
+ } else if (be_verbose(verbose, &next_time, i,&next_count,count))
printf("%s: %s number %d\n", cmdname(argv[0]),
write ? "write" : "read", i);
}
gettimeofday(&end, NULL);
- diff = ((double)(end.tv_sec - start.tv_sec) +
- (double)(end.tv_usec - start.tv_usec) / 1000000);
+ diff = difftime(&end, &start);
+ --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,
static int jt_test_ldlm(int argc, char **argv)
{
struct obd_ioctl_data data;
- int rc;
IOCINIT(data);
if (argc != 1) {
return rc;
}
+static int jt_newconn(int argc, char **argv)
+{
+ struct obd_ioctl_data data;
+
+ IOCINIT(data);
+ if (argc != 1) {
+ fprintf(stderr, "usage: %s\n", cmdname(argv[0]));
+ return -1;
+ }
+
+ rc = ioctl(fd, OBD_IOC_RECOVD_NEWCONN , &data);
+ if (rc < 0)
+ fprintf(stderr, "error: %s: %s\n", cmdname(argv[0]),
+ strerror(rc = errno));
+
+ return rc;
+}
+
+static int jt_quit(int argc, char **argv)
+{
+ Parser_quit(argc, argv);
+
+ return rc;
+}
+
command_t cmdlist[] = {
+ /* Metacommands */
+ {"--xml", jt__xml, 0, "--xml <xml file> <command [args ...]>"},
{"--device", jt__device, 0, "--device <devno> <command [args ...]>"},
{"--threads", jt__threads, 0,
"--threads <threads> <devno> <command [args ...]>"},
- {"device", jt_device, 0, "set current device (args device no)"},
+
+ /* Device configuration commands */
+ {"newdev", jt_newdev, 0, "set device to a new unused obd (no args)"},
+ {"device", jt_device, 0, "set current device (args device_no name)"},
+ {"name2dev", jt_name2dev, 0, "set device by name (args name)"},
{"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>"},
+ {"newconn", jt_newconn, 0, "newconn [newuuid]"},
+ {"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"},
+ {"exit", jt_quit, 0, "quit"},
+ {"quit", jt_quit, 0, "quit"},
{ 0, 0, 0, NULL }
};
static void signal_server(int sig)
{
- if (sig == SIGINT) {
- do_disconnect("sigint");
+ if (sig == SIGINT) {
+ do_disconnect("sigint", 1);
exit(1);
+ } else {
+ fprintf(stderr, "%s: got signal %d\n", cmdname("sigint"), sig);
}
}
int main(int argc, char **argv)
{
struct sigaction sigact;
- int rc = 0;
sigact.sa_handler = signal_server;
sigfillset(&sigact.sa_mask);
rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
} else {
Parser_init("obdctl > ", cmdlist);
- Parser_commands();
+ rc = Parser_commands();
}
- do_disconnect(argv[0]);
+ do_disconnect(argv[0], 1);
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff