DeforaOS/Probe
DeforaOS/Probe
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug to the standard error stream

Browse Source
This commit is contained in:
Pierre Pronchery 2016-03-07 02:37:49 +01:00
parent f3e6a94661
commit 30662f123a
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/probe.c
View File

@ -696,7 +696,7 @@ static int _probe_timeout(Probe * probe)
uint32_t Probe_uptime(Probe * probe, AppServerClient * asc) uint32_t Probe_uptime(Probe * probe, AppServerClient * asc)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%ld%s", "Uptime: ", probe->sysinfo.uptime, "\n"); fprintf(stderr, "%s() %ld\n", __func__, probe->sysinfo.uptime);
#endif #endif
return probe->sysinfo.uptime; return probe->sysinfo.uptime;
} }
@ -707,9 +707,8 @@ int32_t Probe_load(Probe * probe, AppServerClient * asc, uint32_t * load1,
uint32_t * load5, uint32_t * load15) uint32_t * load5, uint32_t * load15)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%lu%s%lu%s%lu%s", "Load 1: ", probe->sysinfo.loads[0], fprintf(stderr, "%s() %lu %lu %lu\n", __func__, probe->sysinfo.loads[0],
", Load 5: ", probe->sysinfo.loads[1], probe->sysinfo.loads[1], probe->sysinfo.loads[2]);
", Load 15: ", probe->sysinfo.loads[2], "\n");
#endif #endif
*load1 = probe->sysinfo.loads[0]; *load1 = probe->sysinfo.loads[0];
*load5 = probe->sysinfo.loads[1]; *load5 = probe->sysinfo.loads[1];
@ -723,11 +722,10 @@ int32_t Probe_ram(Probe * probe, AppServerClient * asc, uint32_t * total,
uint32_t * free, uint32_t * shared, uint32_t * buffer) uint32_t * free, uint32_t * shared, uint32_t * buffer)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%lu%s%lu%s%lu%s%lu%s", fprintf(stderr, "%s() total %lu, free %lu, shared %lu, buffered %lu\n",
"Total RAM: ", probe->sysinfo.totalram, __func__, probe->sysinfo.totalram,
", Free RAM: ", probe->sysinfo.freeram, probe->sysinfo.freeram, probe->sysinfo.sharedram,
", Shared RAM: ", probe->sysinfo.sharedram, probe->sysinfo.bufferram);
", Buffered RAM: ", probe->sysinfo.bufferram, "\n");
#endif #endif
*total = probe->sysinfo.totalram; *total = probe->sysinfo.totalram;
*free = probe->sysinfo.freeram; *free = probe->sysinfo.freeram;
@ -742,8 +740,9 @@ int32_t Probe_swap(Probe * probe, AppServerClient * asc, uint32_t * total,
uint32_t * free) uint32_t * free)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%lu%s", "Total swap: ", probe->sysinfo.totalswap, "\n"); fprintf(stderr, "%s() %lu/%lu\n", __func__,
printf("%s%lu%s", "Free swap: ", probe->sysinfo.freeswap, "\n"); probe->sysinfo.totalswap - probe->sysinfo.freeswap,
probe->sysinfo.totalswap);
#endif #endif
*total = probe->sysinfo.totalswap; *total = probe->sysinfo.totalswap;
*free = probe->sysinfo.freeswap; *free = probe->sysinfo.freeswap;
@ -755,7 +754,7 @@ int32_t Probe_swap(Probe * probe, AppServerClient * asc, uint32_t * total,
uint32_t Probe_procs(Probe * probe, AppServerClient * asc) uint32_t Probe_procs(Probe * probe, AppServerClient * asc)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%u%s", "Procs: ", probe->sysinfo.procs, "\n"); fprintf(stderr, "%s() %u\n", __func__, probe->sysinfo.procs);
#endif #endif
return probe->sysinfo.procs; return probe->sysinfo.procs;
} }
@ -765,7 +764,7 @@ uint32_t Probe_procs(Probe * probe, AppServerClient * asc)
uint32_t Probe_users(Probe * probe, AppServerClient * asc) uint32_t Probe_users(Probe * probe, AppServerClient * asc)
{ {
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%u%s", "Users: ", probe->users, "\n"); fprintf(stderr, "%s() %u\n", __func__, probe->users);
#endif #endif
return probe->users; return probe->users;
} }
@ -782,8 +781,8 @@ uint32_t Probe_ifrxbytes(Probe * probe, AppServerClient * asc,
if(i == probe->ifinfo_cnt) if(i == probe->ifinfo_cnt)
return -1; return -1;
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%s%s%u%s", "Interface ", probe->ifinfo[i].name, " RX: ", fprintf(stderr, "%s() %s %u\n", __func__, probe->ifinfo[i].name,
probe->ifinfo[i].ibytes, "\n"); probe->ifinfo[i].ibytes);
#endif #endif
return probe->ifinfo[i].ibytes; return probe->ifinfo[i].ibytes;
} }
@ -800,8 +799,8 @@ uint32_t Probe_iftxbytes(Probe * probe, AppServerClient * asc,
if(i == probe->ifinfo_cnt) if(i == probe->ifinfo_cnt)
return -1; return -1;
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%s%s%u%s", "Interface ", probe->ifinfo[i].name, " TX: ", fprintf(stderr, "%s() %s %u\n", __func__, probe->ifinfo[i].name,
probe->ifinfo[i].obytes, "\n"); probe->ifinfo[i].obytes);
#endif #endif
return probe->ifinfo[i].obytes; return probe->ifinfo[i].obytes;
} }
@ -819,8 +818,8 @@ uint32_t Probe_voltotal(Probe * probe, AppServerClient * asc,
if(i == probe->volinfo_cnt) if(i == probe->volinfo_cnt)
return -1; return -1;
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%s%s%lu%s", "Volume ", probe->volinfo[i].name, " total: ", fprintf(stderr, "%s() %s %lu\n", __func__, probe->volinfo[i].name,
probe->volinfo[i].total, "\n"); probe->volinfo[i].total);
#endif #endif
return probe->volinfo[i].total * (probe->volinfo[i].block_size / 1024); return probe->volinfo[i].total * (probe->volinfo[i].block_size / 1024);
} }
@ -838,8 +837,8 @@ uint32_t Probe_volfree(Probe * probe, AppServerClient * asc,
if(i == probe->volinfo_cnt) if(i == probe->volinfo_cnt)
return -1; return -1;
#if defined(DEBUG) #if defined(DEBUG)
printf("%s%s%s%lu%s", "Volume ", probe->volinfo[i].name, " free: ", fprintf(stderr, "%s() %s %lu\n", __func__, probe->volinfo[i].name,
probe->volinfo[i].free, "\n"); probe->volinfo[i].free);
#endif #endif
return probe->volinfo[i].free * (probe->volinfo[i].block_size / 1024); return probe->volinfo[i].free * (probe->volinfo[i].block_size / 1024);
} }