From 697c67cc70100ca443329d085f68fb82f30087c9 Mon Sep 17 00:00:00 2001 From: braam Date: Mon, 14 Jul 2003 23:42:05 +0000 Subject: [PATCH] - merge b_unify into b_ad. This makes b_ad almost ready to be landed on b_unify and we may just do that next. --- lnet/include/lnet/lltrace.h | 48 ++++++++++++++++---------------- lnet/utils/debug.c | 2 ++ lustre/portals/include/portals/lltrace.h | 48 ++++++++++++++++---------------- lustre/portals/utils/debug.c | 2 ++ 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/lnet/include/lnet/lltrace.h b/lnet/include/lnet/lltrace.h index 7d1b304..d389aab 100644 --- a/lnet/include/lnet/lltrace.h +++ b/lnet/include/lnet/lltrace.h @@ -2,7 +2,7 @@ * vim:expandtab:shiftwidth=8:tabstop=8: * * Compile with: - * cc -I../../portals/include -o fio fio.c -L../../portals/linux/utils -lptlctl + * cc -I../../portals/include -o fio fio.c -L../../portals/linux/utils -lptlctl */ #ifndef __LTRACE_H_ #define __LTRACE_H_ @@ -31,20 +31,20 @@ static inline int ltrace_write_file(char* fname) argv[0] = "debug_kernel"; argv[1] = fname; argv[2] = "1"; - + fprintf(stderr, "[ptlctl] %s %s %s\n", argv[0], argv[1], argv[2]); - + return jt_dbg_debug_kernel(3, argv); } static inline int ltrace_clear() { char* argv[1]; - + argv[0] = "clear"; - + fprintf(stderr, "[ptlctl] %s\n", argv[0]); - + return jt_dbg_clear_debug_buf(1, argv); } @@ -52,9 +52,9 @@ static inline int ltrace_mark(int indent_level, char* text) { char* argv[2]; char mark_buf[PATH_MAX]; - + snprintf(mark_buf, PATH_MAX, "====%d=%s", indent_level, text); - + argv[0] = "mark"; argv[1] = mark_buf; return jt_dbg_mark_debug_buf(2, argv); @@ -65,9 +65,9 @@ static inline int ltrace_applymasks() char* argv[2]; argv[0] = "list"; argv[1] = "applymasks"; - + fprintf(stderr, "[ptlctl] %s %s\n", argv[0], argv[1]); - + return jt_dbg_list(2, argv); } @@ -95,19 +95,19 @@ static inline int ltrace_start() #ifdef PORTALS_DEV_ID rc = register_ioc_dev(PORTALS_DEV_ID, PORTALS_DEV_PATH); #endif - ltrace_filter("class"); + ltrace_filter("class"); ltrace_filter("socknal"); - ltrace_filter("qswnal"); - ltrace_filter("gmnal"); - ltrace_filter("portals"); - - ltrace_show("all_types"); - ltrace_filter("trace"); - ltrace_filter("malloc"); - ltrace_filter("net"); - ltrace_filter("page"); - ltrace_filter("other"); - ltrace_filter("info"); + ltrace_filter("qswnal"); + ltrace_filter("gmnal"); + ltrace_filter("portals"); + + ltrace_show("all_types"); + ltrace_filter("trace"); + ltrace_filter("malloc"); + ltrace_filter("net"); + ltrace_filter("page"); + ltrace_filter("other"); + ltrace_filter("info"); ltrace_applymasks(); return rc; @@ -146,7 +146,7 @@ static inline void ltrace_add_processnames(char* fname) struct timezone tz; int nob; int underuml = !not_uml(); - + gettimeofday(&tv, &tz); nob = snprintf(cmdbuf, LTRACE_MAX_NOB, "ps --no-headers -eo \""); @@ -167,7 +167,7 @@ static inline void ltrace_add_processnames(char* fname) "(%s:%d:%s() %d+%lu): ", "lltrace.h", __LINE__, __FUNCTION__, 0, 0L); } - + nob += snprintf(cmdbuf+nob, LTRACE_MAX_NOB, " %%p %%c\" >> %s", fname); system(cmdbuf); } diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c index 9ab1c73d..78271d5 100644 --- a/lnet/utils/debug.c +++ b/lnet/utils/debug.c @@ -551,6 +551,8 @@ int jt_dbg_modules(int argc, char **argv) {"mds_ext3", "lustre/mds"}, {"mds_extN", "lustre/mds"}, {"ptlbd", "lustre/ptlbd"}, + {"mgmt_svc", "lustre/mgmt"}, + {"mgmt_cli", "lustre/mgmt"}, {NULL, NULL} }; char *path = ".."; diff --git a/lustre/portals/include/portals/lltrace.h b/lustre/portals/include/portals/lltrace.h index 7d1b304..d389aab 100644 --- a/lustre/portals/include/portals/lltrace.h +++ b/lustre/portals/include/portals/lltrace.h @@ -2,7 +2,7 @@ * vim:expandtab:shiftwidth=8:tabstop=8: * * Compile with: - * cc -I../../portals/include -o fio fio.c -L../../portals/linux/utils -lptlctl + * cc -I../../portals/include -o fio fio.c -L../../portals/linux/utils -lptlctl */ #ifndef __LTRACE_H_ #define __LTRACE_H_ @@ -31,20 +31,20 @@ static inline int ltrace_write_file(char* fname) argv[0] = "debug_kernel"; argv[1] = fname; argv[2] = "1"; - + fprintf(stderr, "[ptlctl] %s %s %s\n", argv[0], argv[1], argv[2]); - + return jt_dbg_debug_kernel(3, argv); } static inline int ltrace_clear() { char* argv[1]; - + argv[0] = "clear"; - + fprintf(stderr, "[ptlctl] %s\n", argv[0]); - + return jt_dbg_clear_debug_buf(1, argv); } @@ -52,9 +52,9 @@ static inline int ltrace_mark(int indent_level, char* text) { char* argv[2]; char mark_buf[PATH_MAX]; - + snprintf(mark_buf, PATH_MAX, "====%d=%s", indent_level, text); - + argv[0] = "mark"; argv[1] = mark_buf; return jt_dbg_mark_debug_buf(2, argv); @@ -65,9 +65,9 @@ static inline int ltrace_applymasks() char* argv[2]; argv[0] = "list"; argv[1] = "applymasks"; - + fprintf(stderr, "[ptlctl] %s %s\n", argv[0], argv[1]); - + return jt_dbg_list(2, argv); } @@ -95,19 +95,19 @@ static inline int ltrace_start() #ifdef PORTALS_DEV_ID rc = register_ioc_dev(PORTALS_DEV_ID, PORTALS_DEV_PATH); #endif - ltrace_filter("class"); + ltrace_filter("class"); ltrace_filter("socknal"); - ltrace_filter("qswnal"); - ltrace_filter("gmnal"); - ltrace_filter("portals"); - - ltrace_show("all_types"); - ltrace_filter("trace"); - ltrace_filter("malloc"); - ltrace_filter("net"); - ltrace_filter("page"); - ltrace_filter("other"); - ltrace_filter("info"); + ltrace_filter("qswnal"); + ltrace_filter("gmnal"); + ltrace_filter("portals"); + + ltrace_show("all_types"); + ltrace_filter("trace"); + ltrace_filter("malloc"); + ltrace_filter("net"); + ltrace_filter("page"); + ltrace_filter("other"); + ltrace_filter("info"); ltrace_applymasks(); return rc; @@ -146,7 +146,7 @@ static inline void ltrace_add_processnames(char* fname) struct timezone tz; int nob; int underuml = !not_uml(); - + gettimeofday(&tv, &tz); nob = snprintf(cmdbuf, LTRACE_MAX_NOB, "ps --no-headers -eo \""); @@ -167,7 +167,7 @@ static inline void ltrace_add_processnames(char* fname) "(%s:%d:%s() %d+%lu): ", "lltrace.h", __LINE__, __FUNCTION__, 0, 0L); } - + nob += snprintf(cmdbuf+nob, LTRACE_MAX_NOB, " %%p %%c\" >> %s", fname); system(cmdbuf); } diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c index 9ab1c73d..78271d5 100644 --- a/lustre/portals/utils/debug.c +++ b/lustre/portals/utils/debug.c @@ -551,6 +551,8 @@ int jt_dbg_modules(int argc, char **argv) {"mds_ext3", "lustre/mds"}, {"mds_extN", "lustre/mds"}, {"ptlbd", "lustre/ptlbd"}, + {"mgmt_svc", "lustre/mgmt"}, + {"mgmt_cli", "lustre/mgmt"}, {NULL, NULL} }; char *path = ".."; -- 1.8.3.1