/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+ * GPL HEADER START
*
- * This file is part of Portals, http://www.sf.net/projects/lustre/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Portals 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.
*
- * Portals 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 Portals; 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
*
- * Some day I'll split all of this functionality into a cfs_debug module
- * of its own. That day is not today.
+ * 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 2008 Sun Microsystems, Inc. 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.
*
+ * lnet/utils/debug.c
+ * Some day I'll split all of this functionality into a cfs_debug module
+ * of its own. That day is not today.
*/
#define __USE_FILE_OFFSET64
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
-
-#include <portals/list.h>
-
-#include <stdio.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include "ioctl.h"
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#ifndef __CYGWIN__
-# include <syscall.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#ifdef HAVE_LINUX_VERSION_H
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#define BUG() /* workaround for module.h includes */
-#include <linux/module.h>
#endif
-#endif /* !HAVE_LINUX_VERSION_H */
-#include <sys/utsname.h>
+#include <libcfs/libcfsutil.h>
+#include <lnet/lnetctl.h>
-#include <portals/api-support.h>
-#include <portals/ptlctl.h>
-#include "parser.h"
-
-#include <time.h>
static char rawbuf[8192];
static char *buf = rawbuf;
static int subsystem_mask = ~0;
static int debug_mask = ~0;
-#define MAX_MARK_SIZE 100
+#define MAX_MARK_SIZE 256
-static const char *portal_debug_subsystems[] =
- {"undefined", "mdc", "mds", "osc",
+static const char *libcfs_debug_subsystems[] =
+ {"undefined", "mdc", "mds", "osc",
"ost", "class", "log", "llite",
- "rpc", "mgmt", "portals", "socknal",
- "qswnal", "pinger", "filter", "ptlbd",
- "echo", "ldlm", "lov", "gmnal",
- "router", "cobd", "ibnal", "sm",
- "asobd", "confobd", "lmv", "cmobd",
- "lonal", NULL};
-static const char *portal_debug_masks[] =
- {"trace", "inode", "super", "ext2",
+ "rpc", "mgmt", "lnet", "lnd",
+ "pinger", "filter", "", "echo",
+ "ldlm", "lov", "lquota", "",
+ "", "", "", "lmv",
+ "", "sec", "gss", "",
+ "mgc", "mgs", "fid", "fld", NULL};
+static const char *libcfs_debug_masks[] =
+ {"trace", "inode", "super", "ext2",
"malloc", "cache", "info", "ioctl",
- "blocks", "net", "warning", "buffs",
- "other", "dentry", "portals", "page",
- "dlmtrace", "error", "emerg", "ha",
+ "neterror", "net", "warning", "buffs",
+ "other", "dentry", "nettrace", "page",
+ "dlmtrace", "error", "emerg", "ha",
"rpctrace", "vfstrace", "reada", "mmap",
- "config", NULL};
+ "config", "console", "quota", "sec", NULL};
-struct debug_daemon_cmd {
- char *cmd;
- unsigned int cmdv;
-};
+#ifdef __linux__
-static const struct debug_daemon_cmd portal_debug_daemon_cmd[] = {
- {"start", DEBUG_DAEMON_START},
- {"stop", DEBUG_DAEMON_STOP},
- {0, 0}
-};
+#define DAEMON_CTL_NAME "/proc/sys/lnet/daemon_file"
+#define SUBSYS_DEBUG_CTL_NAME "/proc/sys/lnet/subsystem_debug"
+#define DEBUG_CTL_NAME "/proc/sys/lnet/debug"
+#define DUMP_KERNEL_CTL_NAME "/proc/sys/lnet/dump_kernel"
+
+static int
+dbg_open_ctlhandle(const char *str)
+{
+ int fd;
+ fd = open(str, O_WRONLY);
+ if (fd < 0) {
+ fprintf(stderr, "open %s failed: %s\n", str,
+ strerror(errno));
+ return -1;
+ }
+ return fd;
+}
+
+static void
+dbg_close_ctlhandle(int fd)
+{
+ close(fd);
+}
+
+static int
+dbg_write_cmd(int fd, char *str, int len)
+{
+ int rc = write(fd, str, len);
+
+ return (rc == len ? 0 : 1);
+}
+
+#elif defined(__DARWIN__)
+
+#define DAEMON_CTL_NAME "lnet.trace_daemon"
+#define SUBSYS_DEBUG_CTL_NAME "lnet.subsystem_debug"
+#define DEBUG_CTL_NAME "lnet.debug"
+#define DUMP_KERNEL_CTL_NAME "lnet.trace_dumpkernel"
+
+static char sysctl_name[128];
+static int
+dbg_open_ctlhandle(const char *str)
+{
+
+ if (strlen(str)+1 > 128) {
+ fprintf(stderr, "sysctl name is too long: %s.\n", str);
+ return -1;
+ }
+ strcpy(sysctl_name, str);
+
+ return 0;
+}
+
+static void
+dbg_close_ctlhandle(int fd)
+{
+ sysctl_name[0] = '\0';
+ return;
+}
+
+static int
+dbg_write_cmd(int fd, char *str, int len)
+{
+ int rc;
+
+ rc = sysctlbyname(sysctl_name, NULL, NULL, str, len+1);
+ if (rc != 0) {
+ fprintf(stderr, "sysctl %s with cmd (%s) error: %d\n",
+ sysctl_name, str, errno);
+ }
+ return (rc == 0 ? 0: 1);
+}
+
+#elif defined(__WINNT__)
+
+#define DAEMON_CTL_NAME "/proc/sys/lnet/daemon_file"
+#define SUBSYS_DEBUG_CTL_NAME "/proc/sys/lnet/subsystem_debug"
+#define DEBUG_CTL_NAME "/proc/sys/lnet/debug"
+#define DUMP_KERNEL_CTL_NAME "/proc/sys/lnet/dump_kernel"
+
+static int
+dbg_open_ctlhandle(const char *str)
+{
+ int fd;
+ fd = cfs_proc_open((char *)str, (int)O_WRONLY);
+ if (fd < 0) {
+ fprintf(stderr, "open %s failed: %s\n", str,
+ strerror(errno));
+ return -1;
+ }
+ return fd;
+}
+
+static void
+dbg_close_ctlhandle(int fd)
+{
+ cfs_proc_close(fd);
+}
+
+static int
+dbg_write_cmd(int fd, char *str, int len)
+{
+ int rc = cfs_proc_write(fd, str, len);
+
+ return (rc == len ? 0 : 1);
+}
+
+#else
+#error - Unknown sysctl convention.
+#endif
static int do_debug_mask(char *name, int enable)
{
int found = 0, i;
- for (i = 0; portal_debug_subsystems[i] != NULL; i++) {
- if (strcasecmp(name, portal_debug_subsystems[i]) == 0 ||
+ for (i = 0; libcfs_debug_subsystems[i] != NULL; i++) {
+ if (strcasecmp(name, libcfs_debug_subsystems[i]) == 0 ||
strcasecmp(name, "all_subs") == 0) {
printf("%s output from subsystem \"%s\"\n",
enable ? "Enabling" : "Disabling",
- portal_debug_subsystems[i]);
+ libcfs_debug_subsystems[i]);
if (enable)
subsystem_mask |= (1 << i);
else
found = 1;
}
}
- for (i = 0; portal_debug_masks[i] != NULL; i++) {
- if (strcasecmp(name, portal_debug_masks[i]) == 0 ||
+ for (i = 0; libcfs_debug_masks[i] != NULL; i++) {
+ if (strcasecmp(name, libcfs_debug_masks[i]) == 0 ||
strcasecmp(name, "all_types") == 0) {
printf("%s output of type \"%s\"\n",
enable ? "Enabling" : "Disabling",
- portal_debug_masks[i]);
+ libcfs_debug_masks[i]);
if (enable)
debug_mask |= (1 << i);
else
char buf[64];
int len = snprintf(buf, 64, "%d", value);
- int fd = open(procpath, O_WRONLY);
+ int fd = dbg_open_ctlhandle(procpath);
if (fd == -1) {
fprintf(stderr, "Unable to open %s: %s\n",
procpath, strerror(errno));
return fd;
}
- rc = write(fd, buf, len+1);
- if (rc<0) {
+ rc = dbg_write_cmd(fd, buf, len+1);
+ if (rc != 0) {
fprintf(stderr, "Write to %s failed: %s\n",
procpath, strerror(errno));
- return rc;
}
- close(fd);
- return 0;
+
+ dbg_close_ctlhandle(fd);
+
+ return rc;
}
static void applymask_all(unsigned int subs_mask, unsigned int debug_mask)
{
if (!dump_filename) {
- applymask("/proc/sys/portals/subsystem_debug", subs_mask);
- applymask("/proc/sys/portals/debug", debug_mask);
+ applymask(SUBSYS_DEBUG_CTL_NAME, subs_mask);
+ applymask(DEBUG_CTL_NAME, debug_mask);
} else {
- struct portals_debug_ioctl_data data;
+ struct libcfs_debug_ioctl_data data;
data.hdr.ioc_len = sizeof(data);
data.hdr.ioc_version = 0;
data.subs = subs_mask;
data.debug = debug_mask;
- dump(OBD_DEV_ID, PTL_IOC_DEBUG_MASK, &data);
+ dump(OBD_DEV_ID, LIBCFS_IOC_DEBUG_MASK, &data);
}
- printf("Applied subsystem_debug=%d, debug=%d to /proc/sys/portals\n",
+ printf("Applied subsystem_debug=%d, debug=%d to /proc/sys/lnet\n",
subs_mask, debug_mask);
}
if (strcasecmp(argv[1], "subs") == 0) {
printf("Subsystems: all_subs");
- for (i = 0; portal_debug_subsystems[i] != NULL; i++)
- printf(", %s", portal_debug_subsystems[i]);
+ for (i = 0; libcfs_debug_subsystems[i] != NULL; i++)
+ if (libcfs_debug_subsystems[i][0])
+ printf(", %s", libcfs_debug_subsystems[i]);
printf("\n");
} else if (strcasecmp(argv[1], "types") == 0) {
printf("Types: all_types");
- for (i = 0; portal_debug_masks[i] != NULL; i++)
- printf(", %s", portal_debug_masks[i]);
+ for (i = 0; libcfs_debug_masks[i] != NULL; i++)
+ printf(", %s", libcfs_debug_masks[i]);
printf("\n");
} else if (strcasecmp(argv[1], "applymasks") == 0) {
applymask_all(subsystem_mask, debug_mask);
char *file;
char *fn;
char *text;
- struct list_head chain;
};
-/* nurr. */
-static void list_add_ordered(struct dbg_line *new, struct list_head *head)
+static int cmp_rec(const void *p1, const void *p2)
{
- struct list_head *pos;
- struct dbg_line *curr;
+ struct dbg_line *d1 = *(struct dbg_line **)p1;
+ struct dbg_line *d2 = *(struct dbg_line **)p2;
- list_for_each(pos, head) {
- curr = list_entry(pos, struct dbg_line, chain);
+ if (d1->hdr->ph_sec < d2->hdr->ph_sec)
+ return -1;
+ if (d1->hdr->ph_sec == d2->hdr->ph_sec &&
+ d1->hdr->ph_usec < d2->hdr->ph_usec)
+ return -1;
+ if (d1->hdr->ph_sec == d2->hdr->ph_sec &&
+ d1->hdr->ph_usec == d2->hdr->ph_usec)
+ return 0;
+ return 1;
+}
- if (curr->hdr->ph_sec < new->hdr->ph_sec)
- continue;
- if (curr->hdr->ph_sec == new->hdr->ph_sec &&
- curr->hdr->ph_usec < new->hdr->ph_usec)
- continue;
+static void print_rec(struct dbg_line ***linevp, int used, int fdout)
+{
+ struct dbg_line **linev = *linevp;
+ int i;
- list_add(&new->chain, pos->prev);
- return;
+ qsort(linev, used, sizeof(struct dbg_line *), cmp_rec);
+ for (i = 0; i < used; i++) {
+ struct dbg_line *line = linev[i];
+ struct ptldebug_header *hdr = line->hdr;
+ char out[4097];
+ char *buf = out;
+ int bytes;
+ ssize_t bytes_written;
+
+ bytes = sprintf(out, "%08x:%08x:%u.%u%s:%u.%06llu:%u:%u:%u:(%s:%u:%s()) %s",
+ hdr->ph_subsys, hdr->ph_mask,
+ hdr->ph_cpu_id, hdr->ph_type,
+ hdr->ph_flags & PH_FLAG_FIRST_RECORD ? "F" : "",
+ hdr->ph_sec, (unsigned long long)hdr->ph_usec,
+ hdr->ph_stack, hdr->ph_pid, hdr->ph_extern_pid,
+ line->file, hdr->ph_line_num, line->fn, line->text);
+ while (bytes > 0) {
+ bytes_written = write(fdout, buf, bytes);
+ if (bytes_written <= 0)
+ break;
+ bytes -= bytes_written;
+ buf += bytes_written;
+ }
+ free(line->hdr);
+ free(line);
}
- list_add_tail(&new->chain, head);
+ free(linev);
+ *linevp = NULL;
}
-static void print_saved_records(struct list_head *list, FILE *out)
+static int add_rec(struct dbg_line *line, struct dbg_line ***linevp, int *lenp,
+ int used)
{
- struct list_head *pos, *tmp;
+ struct dbg_line **linev = *linevp;
- list_for_each_safe(pos, tmp, list) {
- struct dbg_line *line;
- struct ptldebug_header *hdr;
+ if (used == *lenp) {
+ int nlen = *lenp + 4096;
+ int nsize = nlen * sizeof(struct dbg_line *);
- line = list_entry(pos, struct dbg_line, chain);
- list_del(&line->chain);
+ linev = realloc(*linevp, nsize);
+ if (!linev)
+ return -ENOMEM;
- hdr = line->hdr;
- fprintf(out, "%06x:%06x:%u:%u.%06Lu:%u:%u:%u:(%s:%u:%s()) %s",
- hdr->ph_subsys, hdr->ph_mask, hdr->ph_cpu_id,
- hdr->ph_sec, (unsigned long long)hdr->ph_usec,
- hdr->ph_stack, hdr->ph_pid, hdr->ph_extern_pid,
- line->file, hdr->ph_line_num, line->fn, line->text);
- free(line->hdr);
- free(line);
+ *linevp = linev;
+ *lenp = nlen;
}
-}
+ linev[used] = line;
-static int parse_buffer(FILE *in, FILE *out)
+ return 0;
+}
+
+static void dump_hdr(unsigned long long offset, struct ptldebug_header *hdr)
+{
+ fprintf(stderr, "badly-formed record at offset = %llu\n", offset);
+ fprintf(stderr, " len = %u\n", hdr->ph_len);
+ fprintf(stderr, " flags = %x\n", hdr->ph_flags);
+ fprintf(stderr, " subsystem = %x\n", hdr->ph_subsys);
+ fprintf(stderr, " mask = %x\n", hdr->ph_mask);
+ fprintf(stderr, " cpu_id = %u\n", hdr->ph_cpu_id);
+ fprintf(stderr, " type = %u\n", hdr->ph_type);
+ fprintf(stderr, " seconds = %u\n", hdr->ph_sec);
+ fprintf(stderr, " microseconds = %lu\n", (long)hdr->ph_usec);
+ fprintf(stderr, " stack = %u\n", hdr->ph_stack);
+ fprintf(stderr, " pid = %u\n", hdr->ph_pid);
+ fprintf(stderr, " host pid = %u\n", hdr->ph_extern_pid);
+ fprintf(stderr, " line number = %u\n", hdr->ph_line_num);
+}
+
+#define HDR_SIZE sizeof(*hdr)
+
+static int parse_buffer(int fdin, int fdout)
{
struct dbg_line *line;
struct ptldebug_header *hdr;
- char buf[4097], *p;
+ char buf[4097], *ptr;
+ unsigned long dropped = 0, kept = 0, bad = 0;
+ struct dbg_line **linev = NULL;
+ int linev_len = 0;
int rc;
- unsigned long dropped = 0, kept = 0;
- struct list_head chunk_list;
-
- INIT_LIST_HEAD(&chunk_list);
-
+
+ hdr = (void *)buf;
+
while (1) {
- rc = fread(buf, sizeof(hdr->ph_len), 1, in);
+ int first_bad = 1;
+ int count;
+
+ count = HDR_SIZE;
+ ptr = buf;
+ readhdr:
+ rc = read(fdin, ptr, count);
if (rc <= 0)
- break;
-
- hdr = (void *)buf;
- if (hdr->ph_len == 0)
- break;
- if (hdr->ph_len > 4094) {
- fprintf(stderr, "unexpected large record: %d bytes. "
- "aborting.\n",
- hdr->ph_len);
- break;
- }
+ goto print;
+
+ ptr += rc;
+ count -= rc;
+ if (count > 0)
+ goto readhdr;
+
+ if (hdr->ph_len > 4094 || /* is this header bogus? */
+ hdr->ph_type >= CFS_TCD_TYPE_MAX ||
+ hdr->ph_stack > 65536 ||
+ hdr->ph_sec < (1 << 30) ||
+ hdr->ph_usec > 1000000000 ||
+ hdr->ph_line_num > 65536) {
+ if (first_bad)
+ dump_hdr(lseek(fdin, 0, SEEK_CUR), hdr);
+ bad += first_bad;
+ first_bad = 0;
+
+ /* try to restart on next line */
+ while (count < HDR_SIZE && buf[count] != '\n')
+ count++;
+ if (buf[count] == '\n')
+ count++; /* move past '\n' */
+ if (HDR_SIZE - count > 0) {
+ int left = HDR_SIZE - count;
+
+ memmove(buf, buf + count, left);
+ ptr = buf + left;
+
+ goto readhdr;
+ }
- if (hdr->ph_flags & PH_FLAG_FIRST_RECORD) {
- print_saved_records(&chunk_list, out);
- assert(list_empty(&chunk_list));
+ continue;
}
+
+ if (hdr->ph_len == 0)
+ continue;
- rc = fread(buf + sizeof(hdr->ph_len), 1,
- hdr->ph_len - sizeof(hdr->ph_len), in);
+ count = hdr->ph_len - HDR_SIZE;
+ readmore:
+ rc = read(fdin, ptr, count);
if (rc <= 0)
break;
-
- if (hdr->ph_mask &&
- (!(subsystem_mask & hdr->ph_subsys) ||
- (!(debug_mask & hdr->ph_mask)))) {
+
+ ptr += rc;
+ count -= rc;
+ if (count > 0)
+ goto readmore;
+
+ first_bad = 1;
+
+ if ((hdr->ph_subsys && !(subsystem_mask & hdr->ph_subsys)) ||
+ (hdr->ph_mask && !(debug_mask & hdr->ph_mask))) {
dropped++;
continue;
}
-
+
+ retry_alloc:
line = malloc(sizeof(*line));
if (line == NULL) {
- fprintf(stderr, "malloc failed; printing accumulated "
- "records and exiting.\n");
+ if (linev) {
+ fprintf(stderr, "error: line malloc(%u): "
+ "printing accumulated records\n",
+ (unsigned int)sizeof(*line));
+ print_rec(&linev, kept, fdout);
+
+ goto retry_alloc;
+ }
+ fprintf(stderr, "error: line malloc(%u): exiting\n",
+ (unsigned int)sizeof(*line));
break;
}
line->hdr = malloc(hdr->ph_len + 1);
if (line->hdr == NULL) {
- fprintf(stderr, "malloc failed; printing accumulated "
- "records and exiting.\n");
+ free(line);
+ if (linev) {
+ fprintf(stderr, "error: hdr malloc(%u): "
+ "printing accumulated records\n",
+ hdr->ph_len + 1);
+ print_rec(&linev, kept, fdout);
+
+ goto retry_alloc;
+ }
+ fprintf(stderr, "error: hdr malloc(%u): exiting\n",
+ hdr->ph_len + 1);
break;
}
-
- p = (void *)line->hdr;
+
+ ptr = (void *)line->hdr;
memcpy(line->hdr, buf, hdr->ph_len);
- p[hdr->ph_len] = '\0';
-
- p += sizeof(*hdr);
- line->file = p;
- p += strlen(line->file) + 1;
- line->fn = p;
- p += strlen(line->fn) + 1;
- line->text = p;
-
- list_add_ordered(line, &chunk_list);
+ ptr[hdr->ph_len] = '\0';
+
+ ptr += sizeof(*hdr);
+ line->file = ptr;
+ ptr += strlen(line->file) + 1;
+ line->fn = ptr;
+ ptr += strlen(line->fn) + 1;
+ line->text = ptr;
+
+ retry_add:
+ if (add_rec(line, &linev, &linev_len, kept) < 0) {
+ if (linev) {
+ fprintf(stderr, "error: add_rec[%u] failed; "
+ "print accumulated records\n",
+ linev_len);
+ print_rec(&linev, kept, fdout);
+
+ goto retry_add;
+ }
+ fprintf(stderr, "error: add_rec[0] failed; exiting\n");
+ break;
+ }
kept++;
}
- print_saved_records(&chunk_list, out);
+print:
+ if (linev)
+ print_rec(&linev, kept, fdout);
+
+ printf("Debug log: %lu lines, %lu kept, %lu dropped, %lu bad.\n",
+ dropped + kept + bad, kept, dropped, bad);
- printf("Debug log: %lu lines, %lu kept, %lu dropped.\n",
- dropped + kept, kept, dropped);
return 0;
}
{
char filename[4096];
struct stat st;
- int rc, raw = 0, fd;
- FILE *in, *out = stdout;
+ int raw = 0;
+ int save_errno;
+ int fdin;
+ int fdout;
+ int rc;
if (argc > 3) {
fprintf(stderr, "usage: %s [file] [raw]\n", argv[0]);
if (argc > 1 && raw)
strcpy(filename, argv[1]);
else
- sprintf(filename, "/tmp/lustre-log.%lu.%u",time(NULL),getpid());
+ sprintf(filename, "%s"CFS_TIME_T".%u",
+ LIBCFS_DEBUG_FILE_PATH_DEFAULT, time(NULL), getpid());
if (stat(filename, &st) == 0 && S_ISREG(st.st_mode))
unlink(filename);
- fd = open("/proc/sys/portals/dump_kernel", O_WRONLY);
- if (fd < 0) {
+ fdin = dbg_open_ctlhandle(DUMP_KERNEL_CTL_NAME);
+ if (fdin < 0) {
fprintf(stderr, "open(dump_kernel) failed: %s\n",
strerror(errno));
return 1;
}
- rc = write(fd, filename, strlen(filename));
- if (rc != strlen(filename)) {
+ rc = dbg_write_cmd(fdin, filename, strlen(filename));
+ save_errno = errno;
+ dbg_close_ctlhandle(fdin);
+ if (rc != 0) {
fprintf(stderr, "write(%s) failed: %s\n", filename,
- strerror(errno));
- close(fd);
+ strerror(save_errno));
return 1;
}
- close(fd);
if (raw)
return 0;
- in = fopen(filename, "r");
- if (in == NULL) {
+ fdin = open(filename, O_RDONLY);
+ if (fdin < 0) {
if (errno == ENOENT) /* no dump file created */
return 0;
-
fprintf(stderr, "fopen(%s) failed: %s\n", filename,
strerror(errno));
return 1;
}
if (argc > 1) {
- out = fopen(argv[1], "w");
- if (out == NULL) {
+ fdout = open(argv[1], O_WRONLY | O_CREAT | O_TRUNC,
+ S_IRUSR | S_IWUSR);
+ if (fdout < 0) {
fprintf(stderr, "fopen(%s) failed: %s\n", argv[1],
strerror(errno));
- fclose(in);
+ close(fdin);
return 1;
}
- }
+ } else {
+ fdout = fileno(stdout);
+ }
- rc = parse_buffer(in, out);
- fclose(in);
+ rc = parse_buffer(fdin, fdout);
+ close(fdin);
if (argc > 1)
- fclose(out);
+ close(fdout);
if (rc) {
fprintf(stderr, "parse_buffer failed; leaving tmp file %s "
"behind.\n", filename);
"unlink tmp file %s: %s\n", filename,
strerror(errno));
}
+
return rc;
}
int jt_dbg_debug_file(int argc, char **argv)
{
- int fdin,fdout;
- FILE *in, *out = stdout;
+ int fdin;
+ int fdout;
+ int rc;
+
if (argc > 3 || argc < 2) {
fprintf(stderr, "usage: %s <input> [output]\n", argv[0]);
return 0;
}
fdin = open(argv[1], O_RDONLY | O_LARGEFILE);
- if (fdin == -1) {
+ if (fdin < 0) {
fprintf(stderr, "open(%s) failed: %s\n", argv[1],
strerror(errno));
return 1;
}
- in = fdopen(fdin, "r");
- if (in == NULL) {
- fprintf(stderr, "fopen(%s) failed: %s\n", argv[1],
- strerror(errno));
- close(fdin);
- return 1;
- }
if (argc > 2) {
- fdout = open(argv[2], O_CREAT | O_WRONLY | O_LARGEFILE);
- if (fdout == -1) {
+ fdout = open(argv[2],
+ O_CREAT | O_TRUNC | O_WRONLY | O_LARGEFILE,
+ 0600);
+ if (fdout < 0) {
fprintf(stderr, "open(%s) failed: %s\n", argv[2],
strerror(errno));
- fclose(in);
- return 1;
- }
- out = fdopen(fdout, "w");
- if (out == NULL) {
- fprintf(stderr, "fopen(%s) failed: %s\n", argv[2],
- strerror(errno));
- fclose(in);
- close(fdout);
+ close(fdin);
return 1;
}
+ } else {
+ fdout = fileno(stdout);
}
- return parse_buffer(in, out);
-}
+ rc = parse_buffer(fdin, fdout);
-static int
-dbg_write_cmd(int fd, char *str)
-{
- int len = strlen(str);
- int rc = write(fd, str, len);
-
- return (rc == len ? 0 : 1);
+ close(fdin);
+ if (fdout != fileno(stdout))
+ close(fdout);
+
+ return rc;
}
const char debug_daemon_usage[] = "usage: %s {start file [MB]|stop}\n";
-#define DAEMON_FILE "/proc/sys/portals/daemon_file"
+
int jt_dbg_debug_daemon(int argc, char **argv)
{
int rc;
return 1;
}
- fd = open(DAEMON_FILE, O_WRONLY);
- if (fd < 0) {
- fprintf(stderr, "open %s failed: %s\n", DAEMON_FILE,
- strerror(errno));
+ fd = dbg_open_ctlhandle(DAEMON_CTL_NAME);
+ if (fd < 0)
return -1;
- }
-
+
rc = -1;
if (strcasecmp(argv[1], "start") == 0) {
- if (argc < 3 || argc > 4 ||
+ if (argc < 3 || argc > 4 ||
(argc == 4 && strlen(argv[3]) > 5)) {
fprintf(stderr, debug_daemon_usage, argv[0]);
goto out;
}
-
if (argc == 4) {
char buf[12];
const long min_size = 10;
char *end;
size = strtoul(argv[3], &end, 0);
- if (size < min_size ||
+ if (size < min_size ||
size > max_size ||
*end != 0) {
fprintf(stderr, "size %s invalid, must be in "
min_size, max_size);
goto out;
}
-
snprintf(buf, sizeof(buf), "size=%ld", size);
- rc = dbg_write_cmd(fd, buf);
+ rc = dbg_write_cmd(fd, buf, strlen(buf));
+
if (rc != 0) {
fprintf(stderr, "set %s failed: %s\n",
buf, strerror(errno));
}
}
- rc = dbg_write_cmd(fd, "start");
+ rc = dbg_write_cmd(fd, argv[2], strlen(argv[2]));
if (rc != 0) {
fprintf(stderr, "start debug_daemon on %s failed: %s\n",
argv[2], strerror(errno));
goto out;
}
-
rc = 0;
goto out;
}
-
if (strcasecmp(argv[1], "stop") == 0) {
- rc = dbg_write_cmd(fd, "stop");
+ rc = dbg_write_cmd(fd, "stop", 4);
if (rc != 0) {
fprintf(stderr, "stopping debug_daemon failed: %s\n",
strerror(errno));
fprintf(stderr, debug_daemon_usage, argv[0]);
rc = -1;
out:
- close(fd);
+ dbg_close_ctlhandle(fd);
return rc;
}
int jt_dbg_clear_debug_buf(int argc, char **argv)
{
int rc;
- struct portal_ioctl_data data;
+ struct libcfs_ioctl_data data;
if (argc != 1) {
fprintf(stderr, "usage: %s\n", argv[0]);
}
memset(&data, 0, sizeof(data));
- if (portal_ioctl_pack(&data, &buf, max) != 0) {
- fprintf(stderr, "portal_ioctl_pack failed.\n");
+ if (libcfs_ioctl_pack(&data, &buf, max) != 0) {
+ fprintf(stderr, "libcfs_ioctl_pack failed.\n");
return -1;
}
- rc = l_ioctl(PORTALS_DEV_ID, IOC_PORTAL_CLEAR_DEBUG, buf);
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_CLEAR_DEBUG, buf);
if (rc) {
- fprintf(stderr, "IOC_PORTAL_CLEAR_DEBUG failed: %s\n",
+ fprintf(stderr, "IOC_LIBCFS_CLEAR_DEBUG failed: %s\n",
strerror(errno));
return -1;
}
int jt_dbg_mark_debug_buf(int argc, char **argv)
{
+ static char scratch[MAX_MARK_SIZE] = { '\0' };
int rc, max_size = MAX_MARK_SIZE-1;
- struct portal_ioctl_data data;
+ struct libcfs_ioctl_data data = { 0 };
char *text;
time_t now = time(NULL);
if (argc > 1) {
- int counter;
- text = malloc(MAX_MARK_SIZE);
+ int count;
+ text = scratch;
strncpy(text, argv[1], max_size);
max_size-=strlen(argv[1]);
- for(counter = 2; (counter < argc) && (max_size > 0) ; counter++){
- strncat(text, " ", 1);
- max_size-=1;
- strncat(text, argv[counter], max_size);
- max_size-=strlen(argv[counter]);
+ for (count = 2; (count < argc) && (max_size > 0); count++){
+ strncat(text, " ", max_size);
+ max_size -= 1;
+ strncat(text, argv[count], max_size);
+ max_size -= strlen(argv[count]);
}
} else {
text = ctime(&now);
- text[strlen(text) - 1] = '\0'; /* stupid \n */
- }
- if (!max_size) {
- text[MAX_MARK_SIZE - 1] = '\0';
}
- memset(&data, 0, sizeof(data));
data.ioc_inllen1 = strlen(text) + 1;
data.ioc_inlbuf1 = text;
- if (portal_ioctl_pack(&data, &buf, max) != 0) {
- fprintf(stderr, "portal_ioctl_pack failed.\n");
+ if (libcfs_ioctl_pack(&data, &buf, max) != 0) {
+ fprintf(stderr, "libcfs_ioctl_pack failed.\n");
return -1;
}
- rc = l_ioctl(PORTALS_DEV_ID, IOC_PORTAL_MARK_DEBUG, buf);
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_MARK_DEBUG, buf);
if (rc) {
- fprintf(stderr, "IOC_PORTAL_MARK_DEBUG failed: %s\n",
+ fprintf(stderr, "IOC_LIBCFS_MARK_DEBUG failed: %s\n",
strerror(errno));
return -1;
}
static struct mod_paths {
char *name, *path;
} mod_paths[] = {
- {"libcfs", "lustre/portals/libcfs"},
- {"portals", "lustre/portals/portals"},
- {"ksocknal", "lustre/portals/knals/socknal"},
- {"kptlrouter", "lustre/portals/router"},
+ {"libcfs", "libcfs/libcfs"},
+ {"lnet", "lnet/lnet"},
+ {"kciblnd", "lnet/klnds/ciblnd"},
+ {"kgmlnd", "lnet/klnds/gmlnd"},
+ {"kmxlnd", "lnet/klnds/mxlnd"},
+ {"kiiblnd", "lnet/klnds/iiblnd"},
+ {"ko2iblnd", "lnet/klnds/o2iblnd"},
+ {"kopeniblnd", "lnet/klnds/openiblnd"},
+ {"kptllnd", "lnet/klnds/ptllnd"},
+ {"kqswlnd", "lnet/klnds/qswlnd"},
+ {"kralnd", "lnet/klnds/ralnd"},
+ {"ksocklnd", "lnet/klnds/socklnd"},
+ {"ktdilnd", "lnet/klnds/tdilnd"},
+ {"kviblnd", "lnet/klnds/viblnd"},
{"lvfs", "lustre/lvfs"},
{"obdclass", "lustre/obdclass"},
{"llog_test", "lustre/obdclass"},
+ {"ptlrpc_gss", "lustre/ptlrpc/gss"},
{"ptlrpc", "lustre/ptlrpc"},
- {"obdext2", "lustre/obdext2"},
+ {"gks", "lustre/sec/gks"},
+ {"gkc", "lustre/sec/gks"},
{"ost", "lustre/ost"},
{"osc", "lustre/osc"},
{"mds", "lustre/mds"},
{"mdc", "lustre/mdc"},
{"llite", "lustre/llite"},
- {"ldiskfs", "lustre/ldiskfs"},
+ {"lustre", "lustre/llite"},
+ {"llite_lloop", "lustre/llite"},
+ {"ldiskfs", "ldiskfs/ldiskfs"},
{"smfs", "lustre/smfs"},
{"obdecho", "lustre/obdecho"},
{"ldlm", "lustre/ldlm"},
{"obdfilter", "lustre/obdfilter"},
- {"extN", "lustre/extN"},
{"lov", "lustre/lov"},
{"lmv", "lustre/lmv"},
{"fsfilt_ext3", "lustre/lvfs"},
- {"fsfilt_extN", "lustre/lvfs"},
{"fsfilt_reiserfs", "lustre/lvfs"},
{"fsfilt_smfs", "lustre/lvfs"},
{"fsfilt_ldiskfs", "lustre/lvfs"},
- {"mds_ext2", "lustre/mds"},
{"mds_ext3", "lustre/mds"},
- {"mds_extN", "lustre/mds"},
- {"ptlbd", "lustre/ptlbd"},
- {"mgmt_svc", "lustre/mgmt"},
- {"mgmt_cli", "lustre/mgmt"},
{"cobd", "lustre/cobd"},
{"cmobd", "lustre/cmobd"},
- {"conf_obd", "lustre/obdclass"},
+ {"lquota", "lustre/quota"},
+ {"mgs", "lustre/mgs"},
+ {"mgc", "lustre/mgc"},
+ {"mdt", "lustre/mdt"},
+ {"mdd", "lustre/mdd"},
+ {"osd", "lustre/osd"},
+ {"cmm", "lustre/cmm"},
+ {"fid", "lustre/fid"},
+ {"fld", "lustre/fld"},
{NULL, NULL}
};
static int jt_dbg_modules_2_4(int argc, char **argv)
{
-#ifdef HAVE_LINUX_VERSION_H
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
- struct mod_paths *mp;
- char *path = "..";
- char *kernel = "linux";
-
- if (argc >= 2)
- path = argv[1];
- if (argc == 3)
- kernel = argv[2];
- if (argc > 3) {
- printf("%s [path] [kernel]\n", argv[0]);
- return 0;
- }
-
- for (mp = mod_paths; mp->name != NULL; mp++) {
- 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);
-
- rc = query_module(mp->name, QM_INFO, &info, sizeof(info),
- &crap);
- if (rc < 0) {
- if (errno != ENOENT)
- printf("query_module(%s) failed: %s\n",
- mp->name, strerror(errno));
- } else {
- printf("add-symbol-file %s/%s/%s.o 0x%0lx\n", path,
- mp->path, mp->name,
- info.addr + sizeof(struct module));
- }
- }
-
- return 0;
-#endif /* Headers are 2.6-only */
-#endif /* !HAVE_LINUX_VERSION_H */
return -EINVAL;
}
static int jt_dbg_modules_2_5(int argc, char **argv)
{
struct mod_paths *mp;
- char *path = "..";
+ char *path = "";
char *kernel = "linux";
const char *proc = "/proc/modules";
- char modname[128], others[128];
+ char modname[128], buf[4096];
long modaddr;
- int rc;
FILE *file;
if (argc >= 2)
return 0;
}
- while ((rc = fscanf(file, "%s %s %s %s %s %lx\n",
- modname, others, others, others, others, &modaddr)) == 6) {
- for (mp = mod_paths; mp->name != NULL; mp++) {
- if (!strcmp(mp->name, modname))
- break;
- }
- if (mp->name) {
- printf("add-symbol-file %s/%s/%s.o 0x%0lx\n", path,
- mp->path, mp->name, modaddr);
+ while (fgets(buf, sizeof(buf), file) != NULL) {
+ if (sscanf(buf, "%s %*s %*s %*s %*s %lx", modname, &modaddr) == 2) {
+ for (mp = mod_paths; mp->name != NULL; mp++) {
+ if (!strcmp(mp->name, modname))
+ break;
+ }
+ if (mp->name) {
+ printf("add-symbol-file %s%s%s/%s.o 0x%0lx\n",
+ path, path[0] ? "/" : "",
+ mp->path, mp->name, modaddr);
+ }
}
}
+ fclose(file);
return 0;
}
int jt_dbg_panic(int argc, char **argv)
{
int rc;
- struct portal_ioctl_data data;
+ struct libcfs_ioctl_data data;
if (argc != 1) {
fprintf(stderr, "usage: %s\n", argv[0]);
}
memset(&data, 0, sizeof(data));
- if (portal_ioctl_pack(&data, &buf, max) != 0) {
- fprintf(stderr, "portal_ioctl_pack failed.\n");
+ if (libcfs_ioctl_pack(&data, &buf, max) != 0) {
+ fprintf(stderr, "libcfs_ioctl_pack failed.\n");
return -1;
}
- rc = l_ioctl(PORTALS_DEV_ID, IOC_PORTAL_PANIC, buf);
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_PANIC, buf);
if (rc) {
- fprintf(stderr, "IOC_PORTAL_PANIC failed: %s\n",
+ fprintf(stderr, "IOC_LIBCFS_PANIC failed: %s\n",
strerror(errno));
return -1;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff