*
*/
+
#include <stdlib.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <stdio.h>
+#include <stdarg.h>
#include <signal.h>
#define printk printf
#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;
}
-#define difftime(a, b) \
+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)
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;
- return 1;
- }
-
- if (verbose < 0 && next_time != NULL) {
- /* A negative verbosity means to print at most each X seconds */
- gettimeofday(&now, NULL);
- if (difftime(&now, next_time) >= 0) {
+ if (next_time) {
next_time->tv_sec = now.tv_sec - verbose;
next_time->tv_usec = now.tv_usec;
- return 1;
}
+ 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;
extern command_t cmdlist[];
-static int jt_device(int argc, char **argv)
+static int xml_command(char *cmd, ...) {
+ va_list args;
+ char *arg, *cmds[8];
+ int i = 1, j;
+
+ cmds[0] = cmd;
+ va_start(args, cmd);
+
+ while (((arg = va_arg(args, char *)) != NULL) && (i < 8)) {
+ cmds[i] = arg;
+ i++;
+ }
+
+ va_end(args);
+
+ printf("obdctl > ");
+ for (j = 0; j < i; j++)
+ printf("%s ", cmds[j]);
+
+ printf("\n");
+
+ return Parser_execarg(i, cmds, cmdlist);
+}
+
+static network_t *xml_network(xmlDocPtr doc, xmlNodePtr root) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ network_t *net;
+
+ if ((net = (network_t *)calloc(1, sizeof(network_t))) == NULL) {
+ printf("error: unable to malloc network_t\n");
+ return NULL;
+ }
+
+ net->type = xmlGetProp(root, "type");
+ if (net->type == NULL) {
+ printf("error: type attrib required (tcp, elan, myrinet)\n");
+ free(net);
+ return NULL;
+ }
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "server"))
+ net->server = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "port"))
+ net->port = atoi(xmlNodeGetContent(cur));
+
+ cur = cur->next;
+ }
+
+ if (net->server == NULL) {
+ printf("error: <server> tag required\n");
+ free(net);
+ return NULL;
+ }
+
+ return net;
+}
+
+static int xml_mds(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ char *fstype = NULL, *device = NULL;
+ int rc;
+
+ printf("--- Setting up MDS ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "fstype"))
+ fstype = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "device"))
+ device = xmlNodeGetContent(cur);
+
+ cur = cur->next;
+ }
+
+ if ((fstype == NULL) || (device == NULL)) {
+ printf("error: <fstype> and <device> tags required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach", "mds", "MDSDEV", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", device, fstype, NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_obd(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ char *obdtype, *format = NULL, *fstype = NULL, *device = NULL;
+ int rc;
+
+ obdtype = xmlGetProp(root, "type");
+ printf("--- Setting up OBD ---\n");
+
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "fstype"))
+ fstype = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "device"))
+ device = xmlNodeGetContent(cur);
+
+ if (!xmlStrcmp(cur->name, "autoformat"))
+ format = xmlNodeGetContent(cur);
+
+ cur = cur->next;
+ }
+
+ if ((obdtype == NULL) || (fstype == NULL) || (device == NULL)) {
+ printf("error: 'type' attrib and <fstype> and <device> tags required\n");
+ return -1;
+ }
+
+ /* FIXME: Building and configuring loopback devices should go here
+ * but is currently unsupported. You'll have to use the scripts
+ * for now until support is added, or specify a real device.
+ */
+
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach", obdtype, "OBDDEV", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", device, fstype, NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_ost(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ int rc;
+
+ printf("--- Setting up OST ---\n");
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach", "ost", "OSTDEV", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", "$OBDDEV", NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+static int xml_osc(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ network_t *net = NULL;
+ int rc = 0;
+
+ printf("--- Setting up OSC ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "network")) {
+ net = xml_network(doc, cur);
+ if (net == NULL)
+ return -1;
+ }
+ cur = cur->next;
+ }
+
+ if (net == NULL) {
+ printf("error: <network> tag required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0) {
+ rc = -1;
+ goto xml_osc_error;
+ }
+
+ if ((rc = xml_command("attach", "osc", "OSCDEV", NULL)) != 0) {
+ rc = -1;
+ goto xml_osc_error;
+ }
+
+ if ((rc = xml_command("setup", "OSTDEV", net->server, NULL)) != 0) {
+ rc = -1;
+ goto xml_osc_error;
+ }
+
+xml_osc_error:
+ free(net);
+ return rc;
+}
+
+static int xml_mdc(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ xmlNodePtr cur = root->xmlChildrenNode;
+ network_t *net = NULL;
+ int rc = 0;
+
+ printf("--- Setting up MDC ---\n");
+ while (cur != NULL) {
+ if (!xmlStrcmp(cur->name, "network")) {
+ net = xml_network(doc, cur);
+ if (net == NULL)
+ return -1;
+ }
+ cur = cur->next;
+ }
+
+ if (net == NULL) {
+ printf("error: <network> tag required\n");
+ return -1;
+ }
+
+ if ((rc = xml_command("newdev", NULL)) != 0) {
+ rc = -1;
+ goto xml_mdc_error;
+ }
+
+ if ((rc = xml_command("attach", "mdc", "MDCDEV", NULL)) != 0) {
+ rc = -1;
+ goto xml_mdc_error;
+ }
+
+ if ((rc = xml_command("setup", "MDSDEV", net->server, NULL)) != 0) {
+ rc = -1;
+ goto xml_mdc_error;
+ }
+
+xml_mdc_error:
+ free(net);
+ return rc;
+}
+
+static int xml_lov(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ printf("--- Setting up LOV ---\n");
+ return 0;
+}
+
+static int xml_router(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ printf("--- Setting up ROUTER ---\n");
+ return 0;
+}
+
+static int xml_ldlm(xmlDocPtr doc, xmlNodePtr root,
+ char *serv_id, char *serv_uuid) {
+ int rc;
+
+ printf("--- Setting up LDLM ---\n");
+ if ((rc = xml_command("newdev", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("attach", "ldlm", "LDLMDEV", NULL)) != 0)
+ return rc;
+
+ if ((rc = xml_command("setup", NULL)) != 0)
+ return rc;
+
+ return 0;
+}
+
+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"))
+ return xml_mds(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "obd"))
+ return xml_obd(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "ost"))
+ return xml_ost(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "osc"))
+ return xml_osc(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "mdc"))
+ return xml_mdc(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "lov"))
+ return xml_lov(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "router"))
+ return xml_router(doc, cur, serv_id, serv_uuid);
+ else if (!xmlStrcmp(cur->name, "ldlm"))
+ return xml_ldlm(doc, cur, serv_id, serv_uuid);
+ else
+ return -1;
+
+ cur = cur->next;
+ }
+
+ printf("error: No XML config branch for id=%s uuid=%s\n",
+ serv_id, serv_uuid);
+ return -1;
+}
+
+static int xml_profile(xmlDocPtr doc, xmlNodePtr root,
+ int prof_num, char *prof_id, char *prof_uuid) {
+ xmlNodePtr parent, cur = root;
+ char *id, *uuid, *srv_id, *srv_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,
+ srv_id = xmlGetProp(cur, "id"),
+ srv_uuid = xmlGetProp(cur, "uuid"));
+ if (rc != 0) {
+ printf("error: service config\n");
+ 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], 1);
+ 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;
}
- data.ioc_dev = strtoul(argv[1], NULL, 0);
+ /* 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, the exact location of nested tags isn't
+ * critical for this.
+ */
+
+ rc = xml_node(doc, cur->xmlChildrenNode);
+ xmlFreeDoc(doc);
+
+ return rc;
+}
+
+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);
return do_disconnect(argv[0], 0);
}
+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, ret;
+ 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";
static int jt__threads(int argc, char **argv)
{
int threads, next_thread;
- int verbose = 1;
+ int verbose;
int i, j;
- int rc;
if (argc < 5) {
fprintf(stderr,
threads = strtoul(argv[1], NULL, 0);
- if (argv[2][0] == 's' || argv[2][0] == 'q')
- verbose = 0;
- else if (argv[2][0] == 'v')
- verbose = 1;
- else
- verbose = strtoul(argv[2], 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]);
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]),
struct obd_ioctl_data data;
struct timeval next_time;
int count = 1, next_count;
- int verbose = 1;
+ int verbose;
int i;
- int rc;
IOCINIT(data);
if (argc < 2 || argc > 4) {
data.ioc_obdo1.o_mode = 0100644;
data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
- if (argc > 3) {
- if (argv[3][0] == 's' || argv[3][0] == 'q')
- verbose = 0;
- else if (argv[3][0] == 'v')
- verbose = 1;
- else
- verbose = strtoul(argv[3], NULL, 0);
- }
+ verbose = get_verbose(argv[3]);
printf("%s: %d obdos\n", cmdname(argv[0]), count);
gettimeofday(&next_time, NULL);
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);
struct obd_ioctl_data data;
struct timeval start, next_time;
int i, count, next_count;
- int verbose = 1;
- int rc;
+ int verbose;
if (argc != 2 && argc != 3) {
fprintf(stderr, "usage: %s count [verbose]\n",cmdname(argv[0]));
IOCINIT(data);
count = strtoul(argv[1], NULL, 0);
- if (argc == 3) {
- if (argv[2][0] == 's' || argv[2][0] == 'q')
- verbose = 0;
- else if (argv[2][0] == 'v')
- verbose = 1;
- else
- verbose = 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);
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 (be_verbose(verbose, &next_time, i,&next_count,count))
+ } 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;
int verbose = 1, write = 0, rw;
int i, o, p;
int len;
- int rc;
if (argc < 2 || argc > 6) {
fprintf(stderr,
write = 1;
else if (argv[2][0] == 'r' || argv[2][0] == '0')
write = 0;
+
+ verbose = get_verbose(argv[3]);
}
- if (argc >= 4) {
- if (argv[3][0] == 's' || argv[3][0] == 'q')
- verbose = 0;
- else if (argv[3][0] == 'v')
- verbose = 1;
- else
- verbose = strtoul(argv[3], NULL, 0);
- }
+
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;
}
* 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)
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 configuration commands */
- {"device", jt_device, 0, "set current device (args device no)"},
+ {"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: )"},
{"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) {
+ if (sig == SIGINT) {
do_disconnect("sigint", 1);
exit(1);
} else {
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], 1);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff