#endif
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifndef _IOWR
+#include "ioctl.h"
+#endif
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
list_del(&line->chain);
hdr = line->hdr;
- fprintf(out, "%06x:%06x:%u:%u.%06Lu:%u:%u:%u:(%s:%u:%s()) %s",
+ fprintf(out, "%07x:%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,
{"llog_test", "lustre/obdclass"},
{"ptlrpcs", "lustre/sec"},
{"ptlrpcs_gss", "lustre/sec/gss"},
+ {"gks", "lustre/sec/gks"},
+ {"gkc", "lustre/sec/gks"},
{"ptlrpc", "lustre/ptlrpc"},
{"obdext2", "lustre/obdext2"},
{"ost", "lustre/ost"},
#ifdef HAVE_LINUX_VERSION_H
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
struct mod_paths *mp;
- char *path = "..";
+ char *path = "";
char *kernel = "linux";
if (argc >= 2)
return 0;
}
+ printf("dir\n");
for (mp = mod_paths; mp->name != NULL; mp++) {
struct module_info info;
int rc;
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,
+ printf("add-symbol-file %s%s%s/%s.o 0x%0lx\n", path,
+ path[0] ? "/" : "", mp->path, mp->name,
info.addr + sizeof(struct module));
+ printf("dir %s%s%s\n", path,
+ path[0] ? "/" : "", mp->path);
}
}
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];
return 0;
}
+ printf("dir\n");
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++) {
break;
}
if (mp->name) {
- printf("add-symbol-file %s/%s/%s.o 0x%0lx\n", path,
- mp->path, mp->name, modaddr);
+ printf("add-symbol-file %s%s%s/%s.o 0x%0lx\n", path,
+ path[0] ? "/" : "", mp->path, mp->name, modaddr);
+ printf("dir %s%s%s\n", path,
+ path[0] ? "/" : "", mp->path);
}
}