Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added additional `int' parameter for the retval from the sysdeps

Browse Source 
1999-10-24  Martin Baulig  <martin@home-of-linux.org>

	* io.c (do_output): Added additional `int' parameter for the
	retval from the sysdeps functions.
This commit is contained in:
Martin Baulig
1999-10-24 20:03:35 +00:00
committed by Martin Baulig
parent 2dc529b19f
commit 1dadfb6d15
5 changed files with 97 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/daemon/main.c
View File

@@ -42,7 +42,7 @@ handle_parent_connection (int s)
char parameter [BUFSIZ];
unsigned short device;
int64_t *param_ptr;
int all_fs;
int all_fs, retval;
pid_t pid;
void *ptr;
@@ -89,48 +89,48 @@ handle_parent_connection (int s)
switch (cmnd->command) {
case GLIBTOP_CMND_QUIT:
do_output (s, resp, 0, 0, NULL);
do_output (s, resp, 0, 0, NULL, 0);
return;
case GLIBTOP_CMND_SYSDEPS:
memcpy (&resp->u.sysdeps, &server->sysdeps,
sizeof (glibtop_sysdeps));
resp->u.sysdeps.features = GLIBTOP_SYSDEPS_ALL;
do_output (s, resp, _offset_union (sysdeps), 0, NULL);
do_output (s, resp, _offset_union (sysdeps), 0, NULL, retval);
break;
case GLIBTOP_CMND_CPU:
glibtop_get_cpu_l (server, &resp->u.data.cpu);
do_output (s, resp, _offset_data (cpu), 0, NULL);
retval = glibtop_get_cpu_l (server, &resp->u.data.cpu);
do_output (s, resp, _offset_data (cpu), 0, NULL, retval);
break;
case GLIBTOP_CMND_MEM:
glibtop_get_mem_l (server, &resp->u.data.mem);
do_output (s, resp, _offset_data (mem), 0, NULL);
retval = glibtop_get_mem_l (server, &resp->u.data.mem);
do_output (s, resp, _offset_data (mem), 0, NULL, retval);
break;
case GLIBTOP_CMND_SWAP:
glibtop_get_swap_l (server, &resp->u.data.swap);
do_output (s, resp, _offset_data (swap), 0, NULL);
retval = glibtop_get_swap_l (server, &resp->u.data.swap);
do_output (s, resp, _offset_data (swap), 0, NULL, retval);
break;
case GLIBTOP_CMND_UPTIME:
glibtop_get_uptime_l (server, &resp->u.data.uptime);
do_output (s, resp, _offset_data (uptime), 0, NULL);
retval = glibtop_get_uptime_l (server, &resp->u.data.uptime);
do_output (s, resp, _offset_data (uptime), 0, NULL, retval);
break;
case GLIBTOP_CMND_LOADAVG:
glibtop_get_loadavg_l (server, &resp->u.data.loadavg);
do_output (s, resp, _offset_data (loadavg), 0, NULL);
retval = glibtop_get_loadavg_l (server, &resp->u.data.loadavg);
do_output (s, resp, _offset_data (loadavg), 0, NULL, retval);
break;
case GLIBTOP_CMND_SHM_LIMITS:
glibtop_get_shm_limits_l
retval = glibtop_get_shm_limits_l
(server, &resp->u.data.shm_limits);
do_output (s, resp, _offset_data (shm_limits), 0, NULL);
do_output (s, resp, _offset_data (shm_limits), 0, NULL, retval);
break;
case GLIBTOP_CMND_MSG_LIMITS:
glibtop_get_msg_limits_l
retval = glibtop_get_msg_limits_l
(server, &resp->u.data.msg_limits);
do_output (s, resp, _offset_data (msg_limits), 0, NULL);
do_output (s, resp, _offset_data (msg_limits), 0, NULL, retval);
break;
case GLIBTOP_CMND_SEM_LIMITS:
glibtop_get_sem_limits_l
retval = glibtop_get_sem_limits_l
(server, &resp->u.data.sem_limits);
do_output (s, resp, _offset_data (sem_limits), 0, NULL);
do_output (s, resp, _offset_data (sem_limits), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROCLIST:
param_ptr = (int64_t *) parameter;
@@ -139,7 +139,8 @@ handle_parent_connection (int s)
param_ptr [0],
param_ptr [1]);
do_output (s, resp, _offset_data (proclist),
resp->u.data.proclist.total, ptr);
resp->u.data.proclist.total, ptr,
(ptr != NULL) ? 0 : -1);
glibtop_free_r (server, ptr);
break;
case GLIBTOP_CMND_PROC_MAP:
@@ -148,7 +149,8 @@ handle_parent_connection (int s)
&resp->u.data.proc_map,
pid);
do_output (s, resp, _offset_data (proc_map),
resp->u.data.proc_map.total, ptr);
resp->u.data.proc_map.total, ptr,
(ptr != NULL) ? 0 : -1);
glibtop_free_r (server, ptr);
break;
case GLIBTOP_CMND_PROC_ARGS:
@@ -157,76 +159,78 @@ handle_parent_connection (int s)
&resp->u.data.proc_args,
pid, 0);
do_output (s, resp, _offset_data (proc_args),
ptr ? resp->u.data.proc_args.size+1 : 0, ptr);
ptr ? resp->u.data.proc_args.size+1 : 0, ptr,
(ptr != NULL) ? 0 : -1);
glibtop_free_r (server, ptr);
break;
case GLIBTOP_CMND_PROC_STATE:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_state_l
retval = glibtop_get_proc_state_l
(server, &resp->u.data.proc_state, pid);
do_output (s, resp, _offset_data (proc_state), 0, NULL);
do_output (s, resp, _offset_data (proc_state), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_UID:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_uid_l
retval = glibtop_get_proc_uid_l
(server, &resp->u.data.proc_uid, pid);
do_output (s, resp, _offset_data (proc_uid), 0, NULL);
do_output (s, resp, _offset_data (proc_uid), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_MEM:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_mem_l
retval = glibtop_get_proc_mem_l
(server, &resp->u.data.proc_mem, pid);
do_output (s, resp, _offset_data (proc_mem), 0, NULL);
do_output (s, resp, _offset_data (proc_mem), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_TIME:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_time_l
retval = glibtop_get_proc_time_l
(server, &resp->u.data.proc_time, pid);
do_output (s, resp, _offset_data (proc_time), 0, NULL);
do_output (s, resp, _offset_data (proc_time), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_SIGNAL:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_signal_l
retval = glibtop_get_proc_signal_l
(server, &resp->u.data.proc_signal, pid);
do_output (s, resp, _offset_data (proc_signal), 0, NULL);
do_output (s, resp, _offset_data (proc_signal), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_KERNEL:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_kernel_l
retval = glibtop_get_proc_kernel_l
(server, &resp->u.data.proc_kernel, pid);
do_output (s, resp, _offset_data (proc_kernel), 0, NULL);
do_output (s, resp, _offset_data (proc_kernel), 0, NULL, retval);
break;
case GLIBTOP_CMND_PROC_SEGMENT:
memcpy (&pid, parameter, sizeof (pid_t));
glibtop_get_proc_segment_l
retval = glibtop_get_proc_segment_l
(server, &resp->u.data.proc_segment, pid);
do_output (s, resp, _offset_data (proc_segment), 0, NULL);
do_output (s, resp, _offset_data (proc_segment), 0, NULL, retval);
break;
case GLIBTOP_CMND_MOUNTLIST:
memcpy (&all_fs, parameter, sizeof (all_fs));
mount_list = glibtop_get_mountlist_l
(server, &resp->u.data.mountlist, all_fs);
do_output (s, resp, _offset_data (mountlist),
resp->u.data.mountlist.total, mount_list);
resp->u.data.mountlist.total, mount_list,
(mount_list != NULL) ? 0 : -1);
glibtop_free_r (server, mount_list);
break;
case GLIBTOP_CMND_FSUSAGE:
glibtop_get_fsusage_l
retval = glibtop_get_fsusage_l
(server, &resp->u.data.fsusage, parameter);
do_output (s, resp, _offset_data (fsusage),
0, NULL);
0, NULL, retval);
break;
case GLIBTOP_CMND_PPP:
memcpy (&device, parameter, sizeof (device));
glibtop_get_ppp_l
retval = glibtop_get_ppp_l
(server, &resp->u.data.ppp, device);
do_output (s, resp, _offset_data (ppp), 0, NULL);
do_output (s, resp, _offset_data (ppp), 0, NULL, retval);
break;
case GLIBTOP_CMND_NETLOAD:
glibtop_get_netload_l
retval = glibtop_get_netload_l
(server, &resp->u.data.netload, parameter);
do_output (s, resp, _offset_data (netload),
0, NULL);
0, NULL, retval);
break;
default:
syslog_message (LOG_ERR, "Parent received unknown command %u.",