X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Fobdctl.c;h=b3bf021506c5650fec94f3d59098cb9e43f88d44;hb=87b7907d39425a47f6bc7a908f0bb48b5b329bf5;hp=1cf7e182c06da06b587ac103f8494d0f65cfb4d7;hpb=05c3150e7c1852daf764d8ff8b2e2b546aa2e10a;p=fs%2Flustre-release.git diff --git a/lustre/utils/obdctl.c b/lustre/utils/obdctl.c index 1cf7e18..b3bf021 100644 --- a/lustre/utils/obdctl.c +++ b/lustre/utils/obdctl.c @@ -1,740 +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 - * Author: Phil Schwan + * 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 + * Author: Phil Schwan */ #include -#include -#include -#include -#include -#include #include -#include -#define printk printf - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#define __KERNEL__ -#include -#undef __KERNEL__ - -#include "parser.h" -#include - -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) { \ - fprintf(stderr, "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\n" - "size: %Ld\nblocks: %Ld\nblksize: %d\nmode: %o\nuid: %d\n" - "gid: %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 do_disconnect(const char *func) -{ - struct obd_ioctl_data data; - int rc; - - if (connid == -1) - return 0; - - IOCINIT(data); - - rc = ioctl(fd, OBD_IOC_DISCONNECT , &data); - if (rc < 0) { - fprintf(stderr, "error: %s: %x %s\n", func, - OBD_IOC_DISCONNECT, strerror(errno)); - } else { - printf("Disconnected connid %d\n", connid); - connid = -1; - } - - return rc; -} - -extern command_t cmdlist[]; - -static int jt_device(int argc, char **argv) -{ - struct obd_ioctl_data data; - int rc; - - do_disconnect(argv[0]); - - 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)) { - fprintf(stderr, "error: %s: invalid ioctl\n", 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)); - return errno; - } - - rc = ioctl(fd, OBD_IOC_DEVICE , buf); - if (rc < 0) - fprintf(stderr, "error: %s: %x %s\n", argv[0], - OBD_IOC_DEVICE, 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]); - - if (argc != 1) { - fprintf(stderr, "usage: %s\n", argv[0]); - return -1; - } - - rc = ioctl(fd, OBD_IOC_CONNECT , &data); - if (rc < 0) - fprintf(stderr, "error: %s: %x %s\n", argv[0], - OBD_IOC_CONNECT, strerror(rc = errno)); - else - connid = data.ioc_conn1; - - return rc; -} -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", 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; - - return rc; -} - -static int jt__device(int argc, char **argv) -{ - char *arg2[20]; - int rc; - - if (argc < 3) { - fprintf(stderr, "usage: %s devno \n", - argv[0]); - return -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); - - if (!rc) { - arg2[0] = "disconnect"; - arg2[1] = NULL; - rc = jt_disconnect(1, arg2); - } - - return rc; -} - -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)) { - fprintf(stderr, "error: %s: invalid ioctl\n", 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)); - - return rc; -} - -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) - fprintf(stderr, "error: %s: %s\n", argv[0], strerror(rc=errno)); - - return rc; -} +#include "obdctl.h" +#include -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)); +/* the functions that were in here are now in obd.c */ - if (obd_ioctl_pack(&data, &buf, max)) { - fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]); - return -2; - } - 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) - fprintf(stderr, "error: %s: %x %s\n", argv[0], - OBD_IOC_ATTACH, strerror(rc = errno)); - - return rc; -} - -static int jt_setup(int argc, char **argv) +static int jt_quit(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)) { - fprintf(stderr, "error: %s: invalid ioctl\n", argv[0]); - return -2; - } - 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) - fprintf(stderr, "error: %s: %x %s\n", argv[0], - OBD_IOC_SETUP, strerror(rc = errno)); - - return rc; -} - - -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 < 2 || argc > 4) { - fprintf(stderr, "usage: %s num [mode] [silent]\n", argv[0]); - return -1; - } - num = strtoul(argv[1], NULL, 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) { - fprintf(stderr, "error: %s: #%d - %x %s\n", argv[0], - i, OBD_IOC_CREATE, strerror(rc = errno)); - break; - } - if (!silent) - printf("created obdo %Ld\n", 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) { - fprintf(stderr, "usage: %s id mode\n", argv[0]); - return -1; - } - - 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; - - 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)); - - return rc; -} - -static int jt_destroy(int argc, char **argv) -{ - struct obd_ioctl_data data; - int rc; - - IOCINIT(data); - if (argc != 2) { - fprintf(stderr, "usage: %s id\n", argv[0]); - return -1; - } - - data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0); - data.ioc_obdo1.o_mode = S_IFREG|0644; - - 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)); - - return rc; -} - -static int jt_getattr(int argc, char **argv) -{ - struct obd_ioctl_data data; - int rc; - - if (argc != 2) { - fprintf(stderr, "usage: %s id\n", argv[0]); - return -1; - } - - IOCINIT(data); - data.ioc_obdo1.o_id = strtoul(argv[1], NULL, 0); - /* 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); - - rc = ioctl(fd, OBD_IOC_GETATTR , &data); - if (rc) { - fprintf(stderr, "error: %s: %s\n", argv[0], strerror(rc=errno)); - } else { - printf("attr obdo %Ld, mode %o\n", 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; - int rc; - - if (argc != 2 && argc != 3) { - fprintf(stderr, "usage: %s count [silent]\n", 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); - } - 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)); - - for (i = 0 ; 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)); - break; - } else if (!silent) { - printf("attr number %d\n", 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); - - printf("got %d attrs in %gs (%g attr/s): %s", 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; - char *bulk, *b; - int pages = 1, obdos = 1, count; - int silent = 0, 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]); - return -1; - } - - count = strtoul(argv[1], NULL, 0); - - if (argc >= 3) { - if (argv[2][0] == 'w') - write = 1; - else if (argv[2][0] == 'r') - 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); - } - if (argc >= 5) - pages = strtoul(argv[4], NULL, 0); - if (argc >= 6) - obdos = strtoul(argv[5], NULL, 0); - - if (obdos != 1 && obdos != 2) { - fprintf(stderr, "error: %s: only 1 or 2 obdos supported\n", - argv[0]); - return -2; - } - - len = pages * PAGE_SIZE; - - bulk = calloc(obdos, len); - if (!bulk) { - fprintf(stderr, "error: %s: no memory allocating %dx%d pages\n", - argv[0], obdos, pages); - return -2; - } - IOCINIT(data); - data.ioc_conn2 = connid; - data.ioc_obdo1.o_id = 2; - data.ioc_count = len; - data.ioc_offset = 0; - data.ioc_plen1 = len; - data.ioc_pbuf1 = bulk; - if (obdos > 1) { - data.ioc_obdo2.o_id = 2; - data.ioc_plen2 = len; - data.ioc_pbuf2 = bulk + len; - } - - gettimeofday(&start, NULL); - printf("%s %d (%dx%d pages) (testing only): %s", - 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. - */ - 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++) { - if (write) { - b = bulk + sizeof(struct timeval); - for (o = 0; o < obdos; o++) - for (p = 0; p < pages; p++, b += PAGE_SIZE) - memcpy(b, &count, sizeof(count)); - } - - rc = ioctl(fd, rw, &data); - if (rc) { - fprintf(stderr, "error: %s: #%d - %s on %s\n", argv[0], - i, strerror(rc = errno), - write ? "write" : "read"); - break; - } else if (!silent) - printf("%s number %d\n", write ? "write" : "read", i); - } - - free(bulk); - - 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); - - 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)); - } - return rc; -} - -static int jt_test_ldlm(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; - } + int rc = 0; + Parser_quit(argc, argv); - rc = ioctl(fd, IOC_LDLM_TEST, &data); - if (rc) - fprintf(stderr, "error: %s: test failed: %s\n", argv[0], - strerror(rc = errno)); return rc; } command_t cmdlist[] = { - {"--device", jt__device, 0, "device "}, - {"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: [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 "}, - {"getattr", jt_getattr, 0, "getattr "}, - {"setattr", jt_setattr, 0, "setattr "}, - {"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 [silent]"}, - {"test_brw", jt_test_brw, 0, "test_brw [write [silent]]"}, - {"test_ldlm", jt_test_ldlm, 0, "test lock manager (no args)"}, + /* Metacommands */ + {"--device", jt_opt_device, 0, "--device "}, + {"--threads", jt_opt_threads, 0, + "--threads "}, + + /* 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: [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 [mode [verbose]]"}, + {"destroy", jt_obd_destroy, 0, "destroy [count [verbose]]"}, + {"getattr", jt_obd_getattr, 0, "getattr "}, + {"setattr", jt_obd_setattr, 0, "setattr "}, + {"newconn", jt_obd_newconn, 0, "newconn [newuuid]"}, + {"test_getattr", jt_obd_test_getattr, 0, "test_getattr [verbose [[t]objid]]"}, + {"test_setattr", jt_obd_test_setattr, 0, "test_setattr [verbose [[t]objid]]"}, + {"test_brw", jt_obd_test_brw, 0, "test_brw [t] [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", Parser_quit, 0, "quit"}, - {"quit", Parser_quit, 0, "quit"}, - { 0, 0, 0, NULL } + {"exit", jt_quit, 0, "quit"}, + {"quit", jt_quit, 0, "quit"}, + {0, 0, 0, NULL} }; -static void signal_server(int sig) -{ - if (sig == SIGINT) { - fprintf(stderr,"\nDisconnecting any existing connections...\n"); - do_disconnect("sigint"); - exit(1); - } -} - int main(int argc, char **argv) { - struct sigaction sigact; - int rc = 0; + int rc; - sigact.sa_handler = signal_server; - sigfillset(&sigact.sa_mask); - sigact.sa_flags = SA_RESTART; - sigaction(SIGINT, &sigact, NULL); + setlinebuf(stdout); + if (obd_initialize(argc, argv) < 0) + exit(1); + + Parser_init("obdctl > ", cmdlist); 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(); + rc = Parser_commands(); } - do_disconnect(argv[0]); + obd_finalize(argc, argv); return rc; } -