diff --git a/examples/ChangeLog b/examples/ChangeLog index 9d4c526f..fea4c179 100644 --- a/examples/ChangeLog +++ b/examples/ChangeLog @@ -1,3 +1,8 @@ +1999-05-28 Martin Baulig + + * first.c, second.c: Use LibGTop version conditionals so we can + more easily merge the code into LIBGTOP_STABLE_1_0. + 1999-05-08 Drazen Kacar * mountlist.c: Changed pfintf formats to "%lld" when printing diff --git a/examples/first.c b/examples/first.c index e034e8bf..a7fdce7d 100644 --- a/examples/first.c +++ b/examples/first.c @@ -116,10 +116,16 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_uptime (&data.uptime); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Uptime (0x%08lx): %f, %f, %lu\n", (unsigned long) data.uptime.flags, data.uptime.uptime, data.uptime.idletime, (unsigned long) data.uptime.boot_time); +#else + printf ("Uptime (0x%08lx): %f, %f\n", + (unsigned long) data.uptime.flags, + data.uptime.uptime, data.uptime.idletime); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_loadavg (&data.loadavg); @@ -243,6 +249,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_state (&data.proc_state, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_State PID %5d (0x%08lx): '%s', %u - " "%u, %u, %u, %u - %u, %u, %u\n", (int) pid, (unsigned long) data.proc_state.flags, @@ -251,10 +258,18 @@ main (int argc, char *argv []) data.proc_state.ruid, data.proc_state.rgid, data.proc_state.has_cpu, data.proc_state.processor, data.proc_state.last_processor); +#else + printf ("Proc_State PID %5d (0x%08lx): '%s', %c, %lu, %lu\n", + (int) pid, (unsigned long) data.proc_state.flags, + data.proc_state.cmd, data.proc_state.state, + (unsigned long) data.proc_state.uid, + (unsigned long) data.proc_state.gid); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_uid (&data.proc_uid, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Uid PID %5d (0x%08lx): " "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", (int) pid, (unsigned long) data.proc_uid.flags, @@ -279,6 +294,17 @@ main (int argc, char *argv []) } printf ("\n"); +#else + printf ("Proc_Uid PID %5d (0x%08lx): " + "%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid, + (unsigned long) data.proc_uid.flags, + data.proc_uid.uid, data.proc_uid.euid, + data.proc_uid.gid, data.proc_uid.egid, + data.proc_uid.pid, data.proc_uid.ppid, + data.proc_uid.pgrp, data.proc_uid.session, + data.proc_uid.tty, data.proc_uid.tpgid, + data.proc_uid.priority, data.proc_uid.nice); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_mem (&data.proc_mem, pid); @@ -296,6 +322,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_segment (&data.proc_segment, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Segment PID %5d (0x%08lx): " "%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx " "0x%lx 0x%lx 0x%lx 0x%lx 0x%lx " @@ -318,6 +345,19 @@ main (int argc, char *argv []) (unsigned long) data.proc_segment.arg_end, (unsigned long) data.proc_segment.env_start, (unsigned long) data.proc_segment.env_end); +#else + printf ("Proc_Segment PID %5d (0x%08lx): " + "%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid, + (unsigned long) data.proc_segment.flags, + (unsigned long) data.proc_segment.text_rss, + (unsigned long) data.proc_segment.shlib_rss, + (unsigned long) data.proc_segment.data_rss, + (unsigned long) data.proc_segment.stack_rss, + (unsigned long) data.proc_segment.dirty_size, + (unsigned long) data.proc_segment.start_code, + (unsigned long) data.proc_segment.end_code, + (unsigned long) data.proc_segment.start_stack); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_time (&data.proc_time, pid); @@ -338,6 +378,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_signal (&data.proc_signal, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Signal PID %5d (0x%08lx): " "%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid, (unsigned long) data.proc_signal.flags, @@ -349,6 +390,15 @@ main (int argc, char *argv []) (unsigned long) data.proc_signal.sigignore [1], (unsigned long) data.proc_signal.sigcatch [0], (unsigned long) data.proc_signal.sigcatch [1]); +#else + printf ("Proc_Signal PID %5d (0x%08lx): " + "%lu %lu %lu %lu\n", (int) pid, + (unsigned long) data.proc_signal.flags, + (unsigned long) data.proc_signal.signal, + (unsigned long) data.proc_signal.blocked, + (unsigned long) data.proc_signal.sigignore, + (unsigned long) data.proc_signal.sigcatch); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_kernel (&data.proc_kernel, pid); @@ -387,6 +437,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_state (&data.proc_state, ppid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_State PPID %5d (0x%08lx): '%s', %u - " "%u, %u, %u, %u - %u, %u, %u\n", (int) ppid, (unsigned long) data.proc_state.flags, @@ -395,10 +446,18 @@ main (int argc, char *argv []) data.proc_state.ruid, data.proc_state.rgid, data.proc_state.has_cpu, data.proc_state.processor, data.proc_state.last_processor); +#else + printf ("Proc_State PPID %5d (0x%08lx): '%s', %c, %lu, %lu\n", + (int) ppid, (unsigned long) data.proc_state.flags, + data.proc_state.cmd, data.proc_state.state, + (unsigned long) data.proc_state.uid, + (unsigned long) data.proc_state.gid); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_uid (&data.proc_uid, ppid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Uid PPID %5d (0x%08lx): " "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", (int) ppid, (unsigned long) data.proc_uid.flags, @@ -423,6 +482,17 @@ main (int argc, char *argv []) } printf ("\n"); +#else + printf ("Proc_Uid PPID %5d (0x%08lx): " + "%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) ppid, + (unsigned long) data.proc_uid.flags, + data.proc_uid.uid, data.proc_uid.euid, + data.proc_uid.gid, data.proc_uid.egid, + data.proc_uid.pid, data.proc_uid.ppid, + data.proc_uid.pgrp, data.proc_uid.session, + data.proc_uid.tty, data.proc_uid.tpgid, + data.proc_uid.priority, data.proc_uid.nice); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_mem (&data.proc_mem, ppid); @@ -440,6 +510,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_segment (&data.proc_segment, ppid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Segment PPID %5d (0x%08lx): " "%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx " "0x%lx 0x%lx 0x%lx 0x%lx 0x%lx " @@ -462,6 +533,19 @@ main (int argc, char *argv []) (unsigned long) data.proc_segment.arg_end, (unsigned long) data.proc_segment.env_start, (unsigned long) data.proc_segment.env_end); +#else + printf ("Proc_Segment PPID %5d (0x%08lx): " + "%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid, + (unsigned long) data.proc_segment.flags, + (unsigned long) data.proc_segment.text_rss, + (unsigned long) data.proc_segment.shlib_rss, + (unsigned long) data.proc_segment.data_rss, + (unsigned long) data.proc_segment.stack_rss, + (unsigned long) data.proc_segment.dirty_size, + (unsigned long) data.proc_segment.start_code, + (unsigned long) data.proc_segment.end_code, + (unsigned long) data.proc_segment.start_stack); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_time (&data.proc_time, ppid); @@ -482,6 +566,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_signal (&data.proc_signal, ppid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Signal PPID %5d (0x%08lx): " "%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) ppid, (unsigned long) data.proc_signal.flags, @@ -493,6 +578,14 @@ main (int argc, char *argv []) (unsigned long) data.proc_signal.sigignore [1], (unsigned long) data.proc_signal.sigcatch [0], (unsigned long) data.proc_signal.sigcatch [1]); +#else + printf ("Proc_Signal PPID %5d (0x%08lx): %lu %lu %lu %lu\n", + (int) ppid, (unsigned long) data.proc_signal.flags, + (unsigned long) data.proc_signal.signal, + (unsigned long) data.proc_signal.blocked, + (unsigned long) data.proc_signal.sigignore, + (unsigned long) data.proc_signal.sigcatch); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_kernel (&data.proc_kernel, ppid); @@ -531,6 +624,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_state (&data.proc_state, 1); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_State INIT %5d (0x%08lx): '%s', %u - " "%u, %u, %u, %u - %u, %u, %u\n", 1, (unsigned long) data.proc_state.flags, @@ -539,10 +633,18 @@ main (int argc, char *argv []) data.proc_state.ruid, data.proc_state.rgid, data.proc_state.has_cpu, data.proc_state.processor, data.proc_state.last_processor); +#else + printf ("Proc_State INIT %5d (0x%08lx): '%s', %c, %lu, %lu\n", 1, + (unsigned long) data.proc_state.flags, + data.proc_state.cmd, data.proc_state.state, + (unsigned long) data.proc_state.uid, + (unsigned long) data.proc_state.gid); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_uid (&data.proc_uid, 1); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Uid INIT %5d (0x%08lx): " "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", 1, (unsigned long) data.proc_uid.flags, @@ -567,6 +669,17 @@ main (int argc, char *argv []) } printf ("\n"); +#else + printf ("Proc_Uid INIT %5d (0x%08lx): " + "%d %d %d %d %d %d %d %d %d %d %d %d\n", 1, + (unsigned long) data.proc_uid.flags, + data.proc_uid.uid, data.proc_uid.euid, + data.proc_uid.gid, data.proc_uid.egid, + data.proc_uid.pid, data.proc_uid.ppid, + data.proc_uid.pgrp, data.proc_uid.session, + data.proc_uid.tty, data.proc_uid.tpgid, + data.proc_uid.priority, data.proc_uid.nice); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_mem (&data.proc_mem, 1); @@ -584,6 +697,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_segment (&data.proc_segment, 1); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Segment INIT %5d (0x%08lx): " "%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx " "0x%lx 0x%lx 0x%lx 0x%lx 0x%lx " @@ -606,6 +720,19 @@ main (int argc, char *argv []) (unsigned long) data.proc_segment.arg_end, (unsigned long) data.proc_segment.env_start, (unsigned long) data.proc_segment.env_end); +#else + printf ("Proc_Segment INIT %5d (0x%08lx): " + "%lu %lu %lu %lu %lu %lu %lu %lu\n", 1, + (unsigned long) data.proc_segment.flags, + (unsigned long) data.proc_segment.text_rss, + (unsigned long) data.proc_segment.shlib_rss, + (unsigned long) data.proc_segment.data_rss, + (unsigned long) data.proc_segment.stack_rss, + (unsigned long) data.proc_segment.dirty_size, + (unsigned long) data.proc_segment.start_code, + (unsigned long) data.proc_segment.end_code, + (unsigned long) data.proc_segment.start_stack); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_time (&data.proc_time, 1); @@ -626,6 +753,7 @@ main (int argc, char *argv []) for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_signal (&data.proc_signal, 1); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Signal INIT %5d (0x%08lx): " "%lx %lx %lx %lx %lx %lx %lx %lx\n", 1, (unsigned long) data.proc_signal.flags, @@ -637,6 +765,15 @@ main (int argc, char *argv []) (unsigned long) data.proc_signal.sigignore [1], (unsigned long) data.proc_signal.sigcatch [0], (unsigned long) data.proc_signal.sigcatch [1]); +#else + printf ("Proc_Signal INIT %5d (0x%08lx): " + "%lu %lu %lu %lu\n", 1, + (unsigned long) data.proc_signal.flags, + (unsigned long) data.proc_signal.signal, + (unsigned long) data.proc_signal.blocked, + (unsigned long) data.proc_signal.sigignore, + (unsigned long) data.proc_signal.sigcatch); +#endif for (c = 0; c < PROFILE_COUNT; c++) glibtop_get_proc_kernel (&data.proc_kernel, 1); diff --git a/examples/second.c b/examples/second.c index 6fb7b809..cb9d5657 100644 --- a/examples/second.c +++ b/examples/second.c @@ -52,7 +52,8 @@ output (pid_t pid) printf ("\n"); glibtop_get_proc_state (&data.proc_state, pid); - + +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_State PID %5d (0x%08lx): '%s', %u - " "%u, %u, %u, %u - %u, %u, %u\n", (int) pid, (unsigned long) data.proc_state.flags, @@ -61,9 +62,18 @@ output (pid_t pid) data.proc_state.ruid, data.proc_state.rgid, data.proc_state.has_cpu, data.proc_state.processor, data.proc_state.last_processor); +#else + printf ("Proc_State PID %5d (0x%08lx): " + "'%s', %c, %lu, %lu\n", (int) pid, + (unsigned long) data.proc_state.flags, + data.proc_state.cmd, data.proc_state.state, + (unsigned long) data.proc_state.uid, + (unsigned long) data.proc_state.gid); +#endif glibtop_get_proc_uid (&data.proc_uid, pid); - + +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Uid PID %5d (0x%08lx): " "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", (int) pid, (unsigned long) data.proc_uid.flags, @@ -88,6 +98,17 @@ output (pid_t pid) } printf ("\n"); +#else + printf ("Proc_Uid PID %5d (0x%08lx): " + "%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid, + (unsigned long) data.proc_uid.flags, + data.proc_uid.uid, data.proc_uid.euid, + data.proc_uid.gid, data.proc_uid.egid, + data.proc_uid.pid, data.proc_uid.ppid, + data.proc_uid.pgrp, data.proc_uid.session, + data.proc_uid.tty, data.proc_uid.tpgid, + data.proc_uid.priority, data.proc_uid.nice); +#endif glibtop_get_proc_mem (&data.proc_mem, pid); @@ -103,6 +124,7 @@ output (pid_t pid) glibtop_get_proc_segment (&data.proc_segment, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Segment PID %5d (0x%08lx): " "%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx " "0x%lx 0x%lx 0x%lx 0x%lx 0x%lx " @@ -125,6 +147,19 @@ output (pid_t pid) (unsigned long) data.proc_segment.arg_end, (unsigned long) data.proc_segment.env_start, (unsigned long) data.proc_segment.env_end); +#else + printf ("Proc_Segment PID %5d (0x%08lx): " + "%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid, + (unsigned long) data.proc_segment.flags, + (unsigned long) data.proc_segment.text_rss, + (unsigned long) data.proc_segment.shlib_rss, + (unsigned long) data.proc_segment.data_rss, + (unsigned long) data.proc_segment.stack_rss, + (unsigned long) data.proc_segment.dirty_size, + (unsigned long) data.proc_segment.start_code, + (unsigned long) data.proc_segment.end_code, + (unsigned long) data.proc_segment.start_stack); +#endif glibtop_get_proc_time (&data.proc_time, pid); @@ -143,6 +178,7 @@ output (pid_t pid) glibtop_get_proc_signal (&data.proc_signal, pid); +#if LIBGTOP_VERSION_CODE > 1001000 printf ("Proc_Signal PID %5d (0x%08lx): " "%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid, (unsigned long) data.proc_signal.flags, @@ -154,6 +190,15 @@ output (pid_t pid) (unsigned long) data.proc_signal.sigignore [1], (unsigned long) data.proc_signal.sigcatch [0], (unsigned long) data.proc_signal.sigcatch [1]); +#else + printf ("Proc_Signal PID %5d (0x%08lx): " + "%lu %lu %lu %lu\n", (int) pid, + (unsigned long) data.proc_signal.flags, + (unsigned long) data.proc_signal.signal, + (unsigned long) data.proc_signal.blocked, + (unsigned long) data.proc_signal.sigignore, + (unsigned long) data.proc_signal.sigcatch); +#endif glibtop_get_proc_kernel (&data.proc_kernel, pid); diff --git a/examples/sysdeps.c b/examples/sysdeps.c index 047ea507..a884f797 100644 --- a/examples/sysdeps.c +++ b/examples/sysdeps.c @@ -73,7 +73,9 @@ main (int argc, char *argv []) printf ("Sysdeps (0x%08lx):\n\n" "\tfeatures:\t\t0x%08lx\n\n" +#if LIBGTOP_VERSION_CODE > 1001000 "\tpointer_size:\t\t0x%08lx\n\n" +#endif "\tcpu:\t\t%d\t0x%08lx\n" "\tmem:\t\t%d\t0x%08lx\n" "\tswap:\t\t%d\t0x%08lx\n\n" @@ -98,7 +100,9 @@ main (int argc, char *argv []) "\tppp:\t\t%d\t0x%08lx\n\n", (unsigned long) sysdeps.flags, (unsigned long) sysdeps.features, +#if LIBGTOP_VERSION_CODE > 1001000 (unsigned long) sysdeps.pointer_size, +#endif FEATURE_CHECK(CPU), (unsigned long) sysdeps.cpu, FEATURE_CHECK(MEM),