Changeset 589
- Timestamp:
- 05/14/07 17:07:24 (2 years ago)
- Files:
-
- trunk/src/vcd/methods.c (modified) (1 diff)
- trunk/src/vcd/methods.h (modified) (1 diff)
- trunk/src/vcd/methods/Makefile.am (modified) (1 diff)
- trunk/src/vcd/methods/vx/vx_limstatus.c (added)
- trunk/src/vcd/methods/vx/vx_netstatus.c (added)
- trunk/src/vcd/methods/vx/vx_status.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcd/methods.c
r588 r589 106 106 MREGISTER("vx.exec", m_vx_exec); 107 107 MREGISTER("vx.kill", m_vx_kill); 108 MREGISTER("vx.limstatus", m_vx_limstatus); 109 MREGISTER("vx.netstatus", m_vx_netstatus); 108 110 MREGISTER("vx.reboot", m_vx_reboot); 109 111 MREGISTER("vx.remove", m_vx_remove); trunk/src/vcd/methods.h
r588 r589 149 149 MPROTO(m_vx_exec); 150 150 MPROTO(m_vx_kill); 151 MPROTO(m_vx_limstatus); 152 MPROTO(m_vx_netstatus); 151 153 MPROTO(m_vx_reboot); 152 154 MPROTO(m_vx_remove); trunk/src/vcd/methods/Makefile.am
r588 r589 45 45 vx/vx_exec.c \ 46 46 vx/vx_kill.c \ 47 vx/vx_limstatus.c \ 48 vx/vx_netstatus.c \ 47 49 vx/vx_reboot.c \ 48 50 vx/vx_remove.c \ trunk/src/vcd/methods/vx/vx_status.c
r579 r589 45 45 char *name; 46 46 xid_t xid; 47 int running = 0, nproc = 0, uptime = 0; 48 char *loadavg1m = NULL, *loadavg5m = NULL, *loadavg15m = NULL; 47 int running = 0, nproc = 0, tasks = 0, thr_total = 0, thr_running = 0; 48 int thr_unintr = 0, thr_onhold = 0, forks_total = 0, uptime = 0; 49 char *load1m = NULL, *load5m = NULL, *load15m = NULL; 49 50 50 51 params = method_init(env, p, c, VCD_CAP_INFO, M_OWNER); … … 61 62 if (vx_info(xid, NULL) == -1) { 62 63 if (errno == ESRCH) { 63 running = 0; 64 nproc = 0; 65 uptime = 0; 66 loadavg1m = "0"; 67 loadavg5m = "0"; 68 loadavg15m = "0"; 64 running = 0; 65 nproc = 0; 66 tasks = 0; 67 thr_total = 0; 68 thr_running = 0; 69 thr_unintr = 0; 70 thr_onhold = 0; 71 forks_total = 0; 72 uptime = 0; 73 load1m = "0"; 74 load5m = "0"; 75 load15m = "0"; 69 76 } 70 77 … … 86 93 87 94 else { 88 running = 1; 89 nproc = (int) limnproc.value; 90 uptime = statb.uptime/1000000000; 91 loadavg1m = pretty_load(statb.load[0]); 92 loadavg5m = pretty_load(statb.load[1]); 93 loadavg15m = pretty_load(statb.load[2]); 95 running = 1; 96 nproc = (int) limnproc.value; 97 tasks = statb.tasks; 98 thr_total = statb.nr_threads; 99 thr_running = statb.nr_running; 100 thr_unintr = statb.nr_unintr; 101 thr_onhold = statb.nr_onhold; 102 forks_total = statb.nr_forks; 103 uptime = statb.uptime/1000000000; 104 load1m = pretty_load(statb.load[0]); 105 load5m = pretty_load(statb.load[1]); 106 load15m = pretty_load(statb.load[2]); 94 107 } 95 108 } 96 109 97 response = xmlrpc_build_value(env, "{s:i,s:i,s:i,s:s,s:s,s:s}", 98 "running", running, 99 "nproc", nproc, 100 "uptime", uptime, 101 "load1m", loadavg1m, 102 "load5m", loadavg5m, 103 "load15m", loadavg15m); 110 response = xmlrpc_build_value(env, 111 "{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:s,s:s,s:s}", 112 "running", running, 113 "nproc", nproc, 114 "tasks", tasks, 115 "thr_total", thr_total, 116 "thr_running", thr_running, 117 "thr_unintr", thr_unintr, 118 "thr_onhold", thr_onhold, 119 "forks_total", forks_total, 120 "uptime", uptime, 121 "load1m", load1m, 122 "load5m", load5m, 123 "load15m", load15m); 104 124 105 125 return response;
