- Timestamp:
- 06/04/07 18:15:25 (1 year ago)
- Files:
-
- trunk/src/vcc/vcc/limstatus.c (modified) (3 diffs)
- trunk/src/vcc/vcc/netstatus.c (modified) (3 diffs)
- trunk/src/vcd/methods/vx/vx_limstatus.c (modified) (3 diffs)
- trunk/src/vcd/methods/vx/vx_netstatus.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/vcc/vcc/limstatus.c
r600 r617 27 27 { 28 28 xmlrpc_value *response, *result; 29 char *name, *type; 30 int min = 0, cur = 0, max = 0; 29 char *name, *type, *min, *cur, *max; 31 30 int len, i; 32 31 … … 49 48 50 49 xmlrpc_decompose_value(env, result, 51 "{s:s,s: i,s:i,s:i,*}",50 "{s:s,s:s,s:s,s:s,*}", 52 51 "type", &type, 53 52 "min", &min, … … 58 57 xmlrpc_DECREF(result); 59 58 60 printf("%-14s - cur: % d, min: %d, max: %d\n", type, cur, min, max);59 printf("%-14s - cur: %s, min: %s, max: %s\n", type, cur, min, max); 61 60 } 62 61 trunk/src/vcc/vcc/netstatus.c
r597 r617 27 27 { 28 28 xmlrpc_value *response, *result; 29 char *name, *type; 30 int recvp = 0, recvb = 0, sendp = 0, sendb = 0, failp = 0, failb = 0; 29 char *name, *type, *recvp, *recvb, *sendp, *sendb, *failp, *failb; 31 30 int len, i; 32 31 … … 49 48 50 49 xmlrpc_decompose_value(env, result, 51 "{s:s,s: i,s:i,s:i,s:i,s:i,s:i,*}",50 "{s:s,s:s,s:s,s:s,s:s,s:s,s:s,*}", 52 51 "type", &type, 53 52 "recvp", &recvp, … … 61 60 xmlrpc_DECREF(result); 62 61 63 printf("%-10s - received: % d/%d, sent: %d/%d, failed: %d/%d\n",62 printf("%-10s - received: %s/%s, sent: %s/%s, failed: %s/%s\n", 64 63 type, recvp, recvb, sendp, sendb, failp, failb); 65 64 } trunk/src/vcd/methods/vx/vx_limstatus.c
r601 r617 20 20 #include <vserver.h> 21 21 #include <sys/resource.h> 22 #include <inttypes.h> 22 23 23 24 #include "auth.h" … … 26 27 27 28 #include <lucid/log.h> 29 #include <lucid/printf.h> 28 30 29 31 static 30 int pagestobytes(int pages) {31 int bytes;32 bytes = (pages * getpagesize()) / 1024;32 uint64_t pagestobytes(uint64_t pages) { 33 uint64_t bytes; 34 bytes = (pages * (uint64_t) getpagesize()) / 1024; 33 35 return bytes; 34 36 } … … 107 109 } 108 110 109 int min = 0, cur = 0, max = 0;111 uint64_t min = 0, cur = 0, max = 0; 110 112 111 113 if (LIMIT[i].pagestobytes == 1) { 112 min = pagestobytes( (int)limstat.minimum);113 cur = pagestobytes( (int)limstat.value);114 max = pagestobytes( (int)limstat.maximum);114 min = pagestobytes(limstat.minimum); 115 cur = pagestobytes(limstat.value); 116 max = pagestobytes(limstat.maximum); 115 117 } 116 118 117 119 else { 118 min = (int)limstat.minimum;119 cur = (int)limstat.value;120 max = (int)limstat.maximum;120 min = limstat.minimum; 121 cur = limstat.value; 122 max = limstat.maximum; 121 123 } 122 124 125 char *mins, *curs, *maxs; 126 asprintf(&mins, "%" PRIu64, min); 127 asprintf(&curs, "%" PRIu64, cur); 128 asprintf(&maxs, "%" PRIu64, max); 129 123 130 xmlrpc_array_append_item(env, response, xmlrpc_build_value(env, 124 "{s:s,s: i,s:i,s:i}",131 "{s:s,s:s,s:s,s:s}", 125 132 "type", LIMIT[i].db, 126 "min", min ,127 "cur", cur ,128 "max", max ));133 "min", mins, 134 "cur", curs, 135 "max", maxs)); 129 136 } 130 137 } trunk/src/vcd/methods/vx/vx_netstatus.c
r596 r617 18 18 19 19 #include <vserver.h> 20 #include <inttypes.h> 20 21 21 22 #include "auth.h" … … 24 25 25 26 #include <lucid/log.h> 27 #include <lucid/printf.h> 26 28 27 29 static … … 82 84 } 83 85 86 char *recvps, *recvbs, *sendps, *sendbs, *failps, *failbs; 87 asprintf(&recvps, "%" PRIu32, netstat.count[0]); 88 asprintf(&recvbs, "%" PRIu64, netstat.total[0]); 89 asprintf(&sendps, "%" PRIu32, netstat.count[1]); 90 asprintf(&sendbs, "%" PRIu64, netstat.total[1]); 91 asprintf(&failps, "%" PRIu32, netstat.count[2]); 92 asprintf(&failbs, "%" PRIu64, netstat.total[2]); 93 84 94 xmlrpc_array_append_item(env, response, xmlrpc_build_value(env, 85 "{s:s,s: i,s:i,s:i,s:i,s:i,s:i}",95 "{s:s,s:s,s:s,s:s,s:s,s:s,s:s}", 86 96 "type", NET[i].db, 87 "recvp", (int) netstat.count[0],88 "recvb", (int) netstat.total[0],89 "sendp", (int) netstat.count[1],90 "sendb", (int) netstat.total[1],91 "failp", (int) netstat.count[2],92 "failb", (int) netstat.total[2]));97 "recvp", recvps, 98 "recvb", recvbs, 99 "sendp", sendps, 100 "sendb", sendbs, 101 "failp", failps, 102 "failb", failbs)); 93 103 } 94 104 }
