X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvserver-stat.c;h=101b916984f68cca384a0a023fa12538f0a958ef;hb=a923f0462d73c4f46c639b8ec4eb86e189047586;hp=efb87063f861764f46c27625f575d8e0e76c82d7;hpb=fc84d2d3d5179f3bbbcee0f7e8d8cb155239edfd;p=util-vserver.git diff --git a/src/vserver-stat.c b/src/vserver-stat.c index efb8706..101b916 100644 --- a/src/vserver-stat.c +++ b/src/vserver-stat.c @@ -24,6 +24,7 @@ #include "vserver.h" #include "util.h" #include "internal.h" +#include "pathconfig.h" #include @@ -67,9 +68,9 @@ static unsigned long pagesize=0x42; struct XidData { xid_t xid; - int process_count; - int VmSize_total; - int VmRSS_total; + unsigned int process_count; + uint64_t VmSize_total; + uint64_t VmRSS_total; uint64_t start_time_oldest; uint64_t stime_total, utime_total; @@ -116,7 +117,7 @@ showHelp(char const *cmd) WRITE_STR(1, cmd); WRITE_MSG(1, "\n" - "Show informations about all the active context.\n\n" + "Show information about all active contexts.\n\n" " CTX# Context number\n" " #0 = root context\n" " #1 = monitoring context\n" @@ -279,6 +280,123 @@ registerXidVstat(struct Vector *vec, unsigned long xid_l) } } +static void +registerXidCgroups(struct Vector *vec, struct process_info *process) +{ + xid_t xid = (xid_t) process->s_context; + struct XidData *res; + + switch (vc_getXIDType(xid)) { + case vcTYPE_STATIC: + case vcTYPE_DYNAMIC: + break; + default: + return; + } + + res = Vector_search(vec, &xid, cmpData); + if (res == 0) { + struct vc_rlimit_stat limit; + struct vc_virt_stat vstat; + struct vc_sched_info sched; + int cpu; + char vhi_name[65], + filename[128], + cgroup[65], + buf[30]; + int fd; + ssize_t cgroup_len; + unsigned long long rss; + char *endptr; + + if (vc_virt_stat(xid, &vstat) == -1) { + perror("vc_virt_stat()"); + return; + } + if (vc_rlimit_stat(xid, RLIMIT_NPROC, &limit) == -1) { + perror("vc_rlimit_stat(RLIMIT_NRPOC)"); + return; + } + if (vc_get_vhi_name(xid, vcVHI_CONTEXT, vhi_name, sizeof(vhi_name)) == -1) { + perror("vc_get_vhi_name(CONTEXT)"); + return; + } + + if ((fd = open(DEFAULTCONFDIR "/cgroup/mnt", O_RDONLY)) == -1) { + strcpy(cgroup, "/dev/cgroup/"); + cgroup_len = sizeof("/dev/cgroup"); + } + else { + cgroup_len = read(fd, cgroup, sizeof(cgroup)); + if (cgroup_len == -1) { + perror("read(cgroup/mnt)"); + return; + } + close(fd); + cgroup[cgroup_len] = '/'; + cgroup_len += 1; + cgroup[cgroup_len] = 0; + } + + snprintf(filename, sizeof(filename), "%s/cgroup/name", vhi_name); + if ((fd = open(filename, O_RDONLY)) == -1) { + char *dir = strrchr(vhi_name, '/'); + if (dir == NULL) { + fprintf(stderr, "invalid context name: %s\n", dir); + return; + } + snprintf(cgroup + cgroup_len, sizeof(cgroup) - cgroup_len, "%s", dir); + } + else { + ssize_t ret; + ret = read(fd, cgroup + cgroup_len, sizeof(cgroup) - cgroup_len); + if (ret == -1) { + perror("read(cgroup/name)"); + return; + } + close(fd); + } + + snprintf(filename, sizeof(filename), "%s/memory.usage_in_bytes", cgroup); + if ((fd = open(filename, O_RDONLY)) == -1) { + perror("open(memory.usage_in_bytes)"); + return; + } + if (read(fd, buf, sizeof(buf)) == -1) { + perror("read(memory.usage_in_bytes)"); + return; + } + close(fd); + if ((rss = strtoull(buf, &endptr, 0)) == ULLONG_MAX || + (*endptr != '\n' && *endptr != '\0')) { + perror("strtoull(memory.usage_in_bytes)"); + return; + } + + res = Vector_insert(vec, &xid, cmpData); + res->xid = xid; + + res->process_count = limit.value; + res->VmRSS_total = rss / 4096; + res->start_time_oldest= getUptime() - vstat.uptime/1000000; + + res->utime_total = 0; + res->stime_total = 0; + // XXX: arbitrary CPU limit. + for (cpu = 0; cpu < 1024; cpu++) { + sched.cpu_id = cpu; + sched.bucket_id = 0; + if (vc_sched_info(xid, &sched) == -1) + break; + + res->utime_total += sched.user_msec; + res->stime_total += sched.sys_msec; + } + } + + res->VmSize_total += process->VmSize; +} + static inline uint64_t toMsec(uint64_t v) { @@ -613,22 +731,9 @@ int main(int argc, char **argv) if (hertz==0x42) initHertz(); if (pagesize==0x42) initPageSize(); - my_pid = getpid(); - - if (!switchToWatchXid(&errptr)) { - perror(errptr); - exit(1); - } - - if (access("/proc/uptime",R_OK)==-1 && errno==ENOENT) - WRITE_MSG(2, - "WARNING: can not access /proc/uptime. Usually, this is caused by\n" - " procfs-security. Please read the FAQ for more details\n" - " http://linux-vserver.org/Proc-Security\n"); - Vector_init(&xid_data, sizeof(struct XidData)); - if (vc_isSupported(vcFEATURE_VSTAT)) { + if (vc_isSupported(vcFEATURE_VSTAT) && !vc_isSupported(vcFEATURE_MEMCG)) { unsigned long xid; Echdir(PROC_VIRT_DIR_NAME); proc_dir = Eopendir("."); @@ -641,6 +746,26 @@ int main(int argc, char **argv) closedir(proc_dir); } else { + void (*handler)(struct Vector *vec, struct process_info *process); + + my_pid = getpid(); + + if (!switchToWatchXid(&errptr)) { + perror(errptr); + exit(1); + } + + if (access("/proc/uptime",R_OK)==-1 && errno==ENOENT) + WRITE_MSG(2, + "WARNING: can not access /proc/uptime. Usually, this is caused by\n" + " procfs-security. Please read the FAQ for more details\n" + " http://linux-vserver.org/Proc-Security\n"); + + if (vc_isSupported(vcFEATURE_MEMCG)) + handler = registerXidCgroups; + else + handler = registerXid; + Echdir(PROC_DIR_NAME); proc_dir = Eopendir("."); while ((dir_entry = readdir(proc_dir)) != NULL) @@ -652,7 +777,7 @@ int main(int argc, char **argv) if (atoi(dir_entry->d_name) != my_pid) { struct process_info * info = get_process_info(dir_entry->d_name); if (info) - registerXid(&xid_data, info); + handler(&xid_data, info); } } closedir(proc_dir);