Changeset 579
- Timestamp:
- 05/13/07 19:34:22 (2 years ago)
- Files:
-
- trunk/src/vcc/vcc/status.c (modified) (3 diffs)
- trunk/src/vcd/methods/vx/vx_status.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vcc/status.c
r548 r579 51 51 xmlrpc_value *result; 52 52 int running, nproc, uptime; 53 char *loadavg1m, *loadavg5m, *loadavg15m; 53 54 54 55 if (argc < 1) … … 61 62 62 63 xmlrpc_decompose_value(env, result, 63 "{s:i,s:i,s:i, *}",64 "{s:i,s:i,s:i,s:s,s:s,s:s,*}", 64 65 "running", &running, 65 66 "nproc", &nproc, 66 "uptime", &uptime); 67 "uptime", &uptime, 68 "load1m", &loadavg1m, 69 "load5m", &loadavg5m, 70 "load15m", &loadavg15m); 67 71 return_if_fault(env); 68 72 … … 76 80 printf("nproc: %d\n", nproc); 77 81 printf("uptime: %s\n", pretty_uptime(uptime)); 82 printf("load average: %s, %s, %s\n", loadavg1m, loadavg5m, loadavg15m); 78 83 } 79 84 } trunk/src/vcd/methods/vx/vx_status.c
r524 r579 25 25 26 26 #include <lucid/log.h> 27 #include <lucid/printf.h> 28 29 static 30 char *pretty_load(int load) 31 { 32 char *buf = NULL; 33 34 asprintf(&buf, "%d.%02d", load >> 11, ((load & ((1 << 11) - 1)) * 100) >> 11); 35 36 return buf; 37 } 27 38 28 39 /* vx.status(string name) */ … … 35 46 xid_t xid; 36 47 int running = 0, nproc = 0, uptime = 0; 48 char *loadavg1m = NULL, *loadavg5m = NULL, *loadavg15m = NULL; 37 49 38 50 params = method_init(env, p, c, VCD_CAP_INFO, M_OWNER); … … 52 64 nproc = 0; 53 65 uptime = 0; 66 loadavg1m = "0"; 67 loadavg5m = "0"; 68 loadavg15m = "0"; 54 69 } 55 70 … … 74 89 nproc = (int) limnproc.value; 75 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]); 76 94 } 77 95 } 78 96 79 response = xmlrpc_build_value(env, "{s:i,s:i,s:i }",97 response = xmlrpc_build_value(env, "{s:i,s:i,s:i,s:s,s:s,s:s}", 80 98 "running", running, 81 99 "nproc", nproc, 82 "uptime", uptime); 100 "uptime", uptime, 101 "load1m", loadavg1m, 102 "load5m", loadavg5m, 103 "load15m", loadavg15m); 83 104 84 105 return response;
