X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobdctl.c;h=b3bf021506c5650fec94f3d59098cb9e43f88d44;hp=656f0fdd78913ad4ae9d7c8bd60026af2576096f;hb=87b7907d39425a47f6bc7a908f0bb48b5b329bf5;hpb=f0414c73924d07cc84c086a4b34663901cf17041

diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c
index 656f0fd..b3bf021 100644
--- a/lustre/utils/obdctl.c
+++ b/lustre/utils/obdctl.c
@@ -1,526 +1,120 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/utils/obdctl.c
+ *
+ * Author: Peter J. Braam <braam@clusterfs.com>
+ * Author: Phil Schwan <phil@clusterfs.com>
  */
 
 #include <stdlib.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <stdio.h>
-#define printk printf
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <unistd.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <string.h>
-#include <linux/module.h>
-
-#define __KERNEL__
-#include <linux/list.h>
-#undef __KERNEL__
-
-#include "parser.h"
-#include <stdio.h>
-
-int fd = -1;
-int connid = -1;
-char rawbuf[8192];
-char *buf = rawbuf;
-int max = 8192;
-
-#define IOCINIT(data) do { memset(&data, 0, sizeof(data)); data.ioc_version = OBD_IOCTL_VERSION; data.ioc_conn1 = connid; data.ioc_len = sizeof(data); if (fd < 0) { printf("No device open, use device\n"); return 1;}} while (0)
-
-/*
-    pack "LL LL LL LL LL LL LL L L L L L L L L L a60 a60 L L L", 
-    $obdo->{id}, 0, 
-    $obdo->{gr}, 0, 
-    $obdo->{atime}, 0, 
-    $obdo->{mtime}, 0 ,
-    $obdo->{ctime}, 0, 
-    $obdo->{size}, 0, 
-    $obdo->{blocks}, 0, 
-    $obdo->{blksize},
-    $obdo->{mode},
-    $obdo->{uid},
-    $obdo->{gid},
-    $obdo->{flags},
-    $obdo->{obdflags},
-    $obdo->{nlink},     
-    $obdo->{generation},        
-    $obdo->{valid},     
-    $obdo->{inline},
-    $obdo->{obdmd},
-    0, 0, # struct list_head 
-    0;  #  struct obd_ops 
-}
-
-*/
-
-char * obdo_print(struct obdo *obd)
-{
-	char buf[1024];
-
-	sprintf(buf, "id: %Ld\ngrp: %Ld\natime: %Ld\nmtime: %Ld\nctime: %Ld\nsize: %Ld\nblocks: %Ld\nblksize: %d\nmode: %o\nuid: %d\ngid: %d\nflags: %x\nobdflags: %x\nnlink: %d,\nvalid %x\n",
-		obd->o_id,
-		obd->o_gr,
-		obd->o_atime,
-		obd->o_mtime,
-		obd->o_ctime,
-		obd->o_size,
-		obd->o_blocks,
-		obd->o_blksize,
-		obd->o_mode,
-		obd->o_uid,
-		obd->o_gid,
-		obd->o_flags,
-		obd->o_obdflags,
-		obd->o_nlink,
-		obd->o_valid);
-	return strdup(buf);
-}
-
-static int jt_device(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	memset(&data, 0, sizeof(data));
-	if ( argc != 2 ) {
-		fprintf(stderr, "Usage: %s devno\n", argv[0]);
-		return 1;
-	}
-
-	data.ioc_dev = atoi(argv[1]);
-
-	if (obd_ioctl_pack(&data, &buf, max)) { 
-		printf("invalid ioctl\n"); 
-		return 1;
-	}
-
-	if (fd == -1) 
-		fd = open("/dev/obd", O_RDWR);
-	if (fd == -1) {
-		printf("Opening /dev/obd: %s\n", strerror(errno));
-		return 1;
-	}
-
-	rc = ioctl(fd, OBD_IOC_DEVICE , buf);
-	if (rc < 0) {
-		printf("Device: %x %s\n", OBD_IOC_DEVICE, strerror(errno));
-		return 1;
-	}
-
-	return 0;
-}
 
-static int jt_connect(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-
-	if ( argc != 1 ) {
-		fprintf(stderr, "Usage: %s\n", argv[0]);
-		return 1;
-	}
-
-	rc = ioctl(fd, OBD_IOC_CONNECT , &data);
-	if (rc < 0) {
-		printf("Device: %x %s\n", OBD_IOC_CONNECT, strerror(errno));
-		return 1;
-	}
-	connid = data.ioc_conn1;
+#include "obdctl.h"
+#include <libcfs/libcfsutil.h>
 
-	return 0;
-}
+/* the functions that were in here are now in obd.c */
 
-static int jt_disconnect(int argc, char **argv)
+static int jt_quit(int argc, char **argv)
 {
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-
-	if ( argc != 1 ) {
-		fprintf(stderr, "Usage: %s\n", argv[0]);
-		return 1;
-	}
-
-	rc = ioctl(fd, OBD_IOC_DISCONNECT , &data);
-	if (rc < 0) {
-		printf("Device: %x %s\n", OBD_IOC_DISCONNECT, strerror(errno));
-		return 1;
-	}
-	connid = -1;
-
-	return 0;
-}
-
-
-static int jt_detach(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-
-	if ( argc != 1 ) {
-		fprintf(stderr, "Usage: %s\n", argv[0]);
-		return 1;
-	}
-
-	if (obd_ioctl_pack(&data, &buf, max)) { 
-		printf("invalid ioctl\n"); 
-		return 1;
-	}
-
-	rc = ioctl(fd, OBD_IOC_DETACH , buf);
-	if (rc < 0) {
-		printf("Detach: %s\n", strerror(errno));
-		return 1;
-	}
-	return 0;
-}
-
-static int jt_cleanup(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-
-	if ( argc != 1 ) {
-		fprintf(stderr, "Usage: %s\n", argv[0]);
-		return 1;
-	}
-
-	rc = ioctl(fd, OBD_IOC_CLEANUP , &data);
-	if (rc < 0) {
-		printf("Detach: %s\n", strerror(errno));
-		return 1;
-	}
-	return 0;
-}
-
-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", argv[0]);
-		return 1;
-	}
-
-	data.ioc_inllen1 =  strlen(argv[1]) + 1;
-	data.ioc_inlbuf1 = argv[1];
-	if ( argc == 3 ) { 
-		data.ioc_inllen2 = strlen(argv[2]) + 1;
-		data.ioc_inlbuf2 = argv[2];
-	}
-
-	printf("attach len %d addr %p type %s data %s\n", data.ioc_len, buf, 
-	       MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
-
-	if (obd_ioctl_pack(&data, &buf, max)) { 
-		printf("invalid ioctl\n"); 
-		return 1;
-	}
-	printf("attach len %d addr %p raw %p type %s data %s and %s\n", 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) {
-		printf("Attach: %x %s\n", OBD_IOC_ATTACH, strerror(errno));
-		return 1;
-	}
-	return 0;
-}
-
-static int jt_setup(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-
-	if ( argc > 3  ) {
-		fprintf(stderr, "Usage: %s [device] [fstype]\n", argv[0]);
-		return 1;
-	}
-
-	if (argc > 1) {
-		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("setup len %d addr %p device %s type %s\n", data.ioc_len, buf, 
-	       MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
-
-	if (obd_ioctl_pack(&data, &buf, max)) { 
-		printf("invalid ioctl\n"); 
-		return 1;
-	}
-	printf("setup len %d addr %p raw %p device %s type %s\n", 
-	       data.ioc_len, buf, rawbuf,
-	       MKSTR(data.ioc_inlbuf1), MKSTR(data.ioc_inlbuf2));
-
-	rc = ioctl(fd, OBD_IOC_SETUP , buf);
-	if (rc < 0) {
-		printf("setup: %x %s\n", OBD_IOC_SETUP, strerror(errno));
-		return 1;
-	}
-	return 0;
-}
-
-
-static int jt_create(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int num = 1;
-	int silent = 0;
-	int i;
-	int rc;
-
-	IOCINIT(data);
-	if (argc > 1) { 
-		num = strtoul(argv[1], NULL, 0);
-	} else { 
-		printf("usage %s num [mode] [silent]\n", argv[0]); 
-	}
-
-	if (argc > 2) { 
-		data.ioc_obdo1.o_mode = strtoul(argv[2], NULL, 0);
-	} else { 
-		data.ioc_obdo1.o_mode = 0100644;
-	}
-	data.ioc_obdo1.o_valid = OBD_MD_FLMODE;
-
-	if (argc > 3) { 
-		silent = strtoul(argv[3], NULL, 0);
-	}
-		
-	printf("Creating %d obdos\n", num);
-
-	for (i = 0 ; i<num ; i++) { 
-		rc = ioctl(fd, OBD_IOC_CREATE , &data);
-		if (rc < 0) {
-			printf("Create: %x %s\n", OBD_IOC_CREATE, 
-			       strerror(errno));
-			return 1;
-		}
-		printf("created obdo %Ld\n", data.ioc_obdo1.o_id);
-	}
-	return 0;
-}
-
-static int jt_setattr(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-	if (argc < 2) { 
-		printf("usage: %s id mode\n", argv[0]); 
-		return -1;
-	}
-
-        data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
-        data.ioc_obdo1.o_mode = strtoul(argv[2], NULL, 0);
-        data.ioc_obdo1.o_valid = OBD_MD_FLMODE; 
-
-	rc = ioctl(fd, OBD_IOC_SETATTR , &data);
-	if (rc < 0) {
-		printf("setattr: %x %s\n", OBD_IOC_SETATTR, strerror(errno));
-	}
-	return rc;
-}
-
-static int jt_destroy(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-	int rc;
-
-	IOCINIT(data);
-	if (argc < 1) { 
-		printf("usage %s id\n", argv[0]); 
-	}
-
-        data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0);
-
-	rc = ioctl(fd, OBD_IOC_DESTROY , &data);
-	if (rc < 0) {
-		printf("setattr: %x %s\n", OBD_IOC_DESTROY, strerror(errno));
-	}
-	return rc;
-}
-
-static int jt_multi_getattr(int argc, char **argv)
-{
-	struct obd_ioctl_data data;
-        int count, i;
-	int rc;
-
-	IOCINIT(data);
-	if (argc == 2) { 
-		count = strtoul(argv[1], NULL, 0);
-		data.ioc_obdo1.o_valid = 0xffffffff;
-                data.ioc_obdo1.o_id = 2;
-		printf("getting %d attrs (testing only)\n", count);
-	} else { 
-		printf("usage %s id\n", argv[0]); 
-		return 0;
-	}
-
-        for (i = 0 ; i < count; i++) {
-                rc = ioctl(fd, OBD_IOC_GETATTR , &data);
-                if (rc) { 
-                        printf("Error: %s on i=%d\n", strerror(rc), i); 
-                        break;
-                } else { 
-                        printf("attr number %d\n", i);
-                }
-	}
-	return 0;
-}
-
-static int jt_getattr(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_valid = 0xffffffff;
-		printf("getting attr for %Ld\n", data.ioc_obdo1.o_id);
-	} else { 
-		printf("usage %s id\n", argv[0]); 
-		return 0;
-	}
+        int rc = 0;
+        Parser_quit(argc, argv);
+
+        return rc;
+}
+
+command_t cmdlist[] = {
+        /* Metacommands */
+        {"--device", jt_opt_device, 0, "--device <devno> <command [args ...]>"},
+        {"--threads", jt_opt_threads, 0,
+         "--threads <threads> <devno> <command [args ...]>"},
+
+        /* Device configuration commands */
+        {"lov_setconfig", jt_obd_lov_setconfig, 0, "configure lov data on MDS "
+         "[usage: lovconfig lov-uuid stripecount, stripesize, pattern, UUID1, [UUID2, ...]"},
+        {"list", jt_obd_list, 0, "list the devices (no args)"},
+        {"newdev", jt_obd_newdev, 0, "set device to a new unused obd (no args)"},
+        {"device", jt_obd_device, 0, "set current device (args device_no name)"},
+        {"name2dev", jt_obd_name2dev, 0,
+         "set device by name [usage: name2dev devname]"},
+        {"attach", jt_obd_attach, 0, "name the type of device (args: type data"},
+        {"setup", jt_obd_setup, 0, "setup device (args: <blkdev> [data]"},
+        {"detach", jt_obd_detach, 0, "detach the current device (arg: )"},
+        {"cleanup", jt_obd_cleanup, 0, "cleanup the current device (arg: )"},
+
+        /* Session commands */
+        {"connect", jt_obd_connect, 0, "connect - get a connection to device"},
+        {"disconnect", jt_obd_disconnect, 0,
+         "disconnect - break connection to device"},
+
+        /* Session operations */
+        {"create", jt_obd_create, 0, "create <count> [mode [verbose]]"},
+        {"destroy", jt_obd_destroy, 0, "destroy <id> [count [verbose]]"},
+        {"getattr", jt_obd_getattr, 0, "getattr <id>"},
+        {"setattr", jt_obd_setattr, 0, "setattr <id> <mode>"},
+        {"newconn", jt_obd_newconn, 0, "newconn <olduuid> [newuuid]"},
+        {"test_getattr", jt_obd_test_getattr, 0, "test_getattr <count> [verbose [[t]objid]]"},
+        {"test_setattr", jt_obd_test_setattr, 0, "test_setattr <count> [verbose [[t]objid]]"},
+        {"test_brw", jt_obd_test_brw, 0, "test_brw [t]<count> [write [verbose [pages [[t]objid]]]]"},
+        {"dump_ldlm", jt_obd_dump_ldlm, 0, "dump all lock manager state (no args)"},
+
+        /* User interface commands */
+        {"help", Parser_help, 0, "help"},
+        {"exit", jt_quit, 0, "quit"},
+        {"quit", jt_quit, 0, "quit"},
+        {0, 0, 0, NULL}
+};
 
-	rc = ioctl(fd, OBD_IOC_GETATTR , &data);
-	if (rc) { 
-		printf("Error: %s\n", strerror(rc)); 
-	} else { 
-		printf("attr obdo %Ld, mode %o\n", data.ioc_obdo1.o_id, 
-		       data.ioc_obdo1.o_mode);
-	}
-	return 0;
-}
 
-static int jt_modules(int argc, char **argv)
+int main(int argc, char **argv)
 {
-        char *modules[] = {"portals", "ksocknal", "obdclass", "ptlrpc",
-                           "obdext2", "ost", "osc", "mds", "mdc", "llight",
-                           "obdecho", NULL};
-        char *paths[] = {"portals/linux/oslib", "portals/linux/socknal",
-                         "obd/class", "obd/rpc", "obd/ext2obd", "obd/ost",
-                         "obd/osc", "obd/mds", "obd/mdc", "obd/llight",
-                        "obd/obdecho", NULL};
-        char *path = "..";
-        char *kernel = "linux";
-        int i;
+        int rc;
 
-        if (argc >= 2)
-                path = argv[1];
-        if (argc == 3) 
-                kernel = argv[2];
-        if (argc > 3) {
-                printf("%s [path] [kernel]\n", argv[0]);
-                return 0;
-        }
+        setlinebuf(stdout);
 
-        printf("symbol-file\nsymbol-file %s\nb panic\nb stop\n", kernel); 
+        if (obd_initialize(argc, argv) < 0)
+                exit(1);
 
-        for (i = 0; modules[i] != NULL; i++) {
-                struct module_info info;
-                int rc;
-                size_t crap;
-                int query_module(const char *name, int which, void *buf,
-                                 size_t bufsize, size_t *ret);
+        Parser_init("obdctl > ", cmdlist);
 
-                rc = query_module(modules[i], QM_INFO, &info, sizeof(info),
-                                  &crap);
-                if (rc < 0) {
-                        if (errno != ENOENT)
-                                printf("query_module(%s) failed: %s\n",
-                                       modules[i], strerror(errno));
-                } else {
-                        printf("add-symbol-file %s/%s/%s.o 0x%0lx\n", path,
-                               paths[i], modules[i],
-                               info.addr + sizeof(struct module));
-                }
+        if (argc > 1) {
+                rc = Parser_execarg(argc - 1, argv + 1, cmdlist);
+        } else {
+                rc = Parser_commands();
         }
 
-        return 0;
-}
-
-command_t list[] = {
-	{"device", jt_device, 0, "set current device (args device no)"},
-        {"attach", jt_attach, 0, "name the typed 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"},
-        {"test_getattr", jt_multi_getattr, 0, "test_getattr count [silent]"},
-        {"getattr", jt_getattr, 0, "getattr id"},
-        {"setattr", jt_setattr, 0, "setattr id mode"},
-        {"connect", jt_connect, 0, "connect - get a connection to device"},
-        {"disconnect", jt_disconnect, 0, "disconnect - break connection to device"},
-        {"modules", jt_modules, 0, "provide gdb-friendly module info (arg: <path>)"},
-        {"help", Parser_help, 0, "help"},
-        {"exit", Parser_quit, 0, "quit"},
-        {"quit", Parser_quit, 0, "quit"},
-        { 0, 0, 0, NULL }
-};
-
-int main(int argc, char **argv)
-{
-
-	if (argc > 1) { 
-		return Parser_execarg(argc - 1, &argv[1], list);
-	}
-
-	Parser_init("obdctl > ", list);
-	Parser_commands();
-
-	return 0;
+        obd_finalize(argc, argv);
+        return rc;
 }
-