X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Fportals.c;h=f8107d8068603fa41ade8ec3e9c4404bb20a81cb;hb=2dc9c16e770415d56839e1996015fec5fab93f29;hp=86b2da896c4e00c4130a6094d69e91ac9957a5f6;hpb=9f59ef764e80542d82f3b78902615124ddac1020;p=fs%2Flustre-release.git diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c index 86b2da8..f8107d8 100644 --- a/lnet/utils/portals.c +++ b/lnet/utils/portals.c @@ -81,7 +81,6 @@ static name2num_t nalnames[] = { {"elan", QSWNAL}, {"gm", GMNAL}, {"ib", IBNAL}, - {"scimac", SCIMACNAL}, {NULL, -1} }; @@ -1566,14 +1565,11 @@ lwt_put_string(char *ustr) static int lwt_print(FILE *f, cycles_t t0, cycles_t tlast, double mhz, int cpu, lwt_event_t *e) { - char whenstr[32]; char *where = lwt_get_string(e->lwte_where); if (where == NULL) return (-1); - sprintf(whenstr, LPU64, (__u64)(e->lwte_when - t0)); - fprintf(f, "%#010lx %#010lx %#010lx %#010lx: %#010lx %1d %10.6f %10.2f %s\n", e->lwte_p1, e->lwte_p2, e->lwte_p3, e->lwte_p4, (long)e->lwte_task, cpu, (e->lwte_when - t0) / (mhz * 1000000.0), @@ -1625,6 +1621,7 @@ jt_ptl_lwt(int argc, char **argv) cycles_t tnow; struct timeval tvnow; int printed_date = 0; + int nlines = 0; FILE *f = stdout; if (argc < 2 || @@ -1774,6 +1771,12 @@ jt_ptl_lwt(int argc, char **argv) rc = lwt_print(f, t0, tlast, mhz, cpu, next_event[cpu]); if (rc != 0) break; + + if (++nlines % 10000 == 0 && f != stdout) { + /* show some activity... */ + printf("."); + fflush (stdout); + } } tlast = next_event[cpu]->lwte_when; @@ -1787,8 +1790,10 @@ jt_ptl_lwt(int argc, char **argv) next_event[cpu] = NULL; } - if (f != stdout) + if (f != stdout) { + printf("\n"); fclose(f); + } free(events); return (0);