X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvserver-info.c;h=1a74f54264566e015dd40e54574960d39e92424b;hb=86a23427cca76a5a9befd60c85535a0e738bc3c6;hp=8a170f08ee07f32af3f9a6dff961e7bb49b5e1c0;hpb=e4120329ce43d920b9c19648768684761ec3ba28;p=util-vserver.git diff --git a/util-vserver/src/vserver-info.c b/util-vserver/src/vserver-info.c index 8a170f0..1a74f54 100644 --- a/util-vserver/src/vserver-info.c +++ b/util-vserver/src/vserver-info.c @@ -21,7 +21,6 @@ #endif #include "util.h" -#include "wrappers.h" #include "internal.h" #include "vserver.h" @@ -30,9 +29,18 @@ #include #include #include +#include + +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include typedef enum { tgNONE,tgCONTEXT, tgRUNNING, - tgVDIR, tgNAME, tgCFGDIR } VserverTag; + tgVDIR, tgNAME, tgCFGDIR, tgAPPDIR, + tgAPIVER, + tgINITPID, tgINITPID_PID, + tgXID, tgUTS, +} VserverTag; static struct { char const * const tag; @@ -43,11 +51,17 @@ static struct { { "RUNNING", tgRUNNING, "gives out '1' when vserver is running; else, it fails without output" }, { "VDIR", tgVDIR, "gives out the root-directory of the vserver" }, { "NAME", tgNAME, "gives out the name of the vserver" }, - { "CFGDIR", tgCFGDIR, "gives out the configuration directory of the vserver" } + { "CFGDIR", tgCFGDIR, "gives out the configuration directory of the vserver" }, + { "APPDIR", tgAPPDIR, "gives out the name of the toplevel application cfgdir" }, + { "INITPID", tgINITPID, "gives out the initpid of the given context" }, + { "INITPID_PID", tgINITPID_PID, "gives out the initpid of the given pid" }, + { "XID", tgXID, "gives out the context-id of the given pid" }, + { "APIVER", tgAPIVER, "gives out the version of the kernel API" }, + { "UTS", tgUTS, ("gives out an uts-entry; possible entries are " + "context, sysname, nodename, release, version, " + "machine and domainname") }, }; -#define TAGS_COUNT (sizeof(TAGS)/sizeof(TAGS[0])) - int wrapper_exit_code = 1; static struct option const @@ -64,7 +78,7 @@ showHelp(int fd, char const *cmd, int res) WRITE_MSG(fd, "Usage: "); WRITE_STR(fd, cmd); WRITE_MSG(fd, - " [-q] \n" + " [-ql] || \n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); exit(res); } @@ -87,7 +101,7 @@ showTags() size_t i; WRITE_MSG(1, "Valid tags are: "); - for (i=0; i0 && atoi(argv[0])); + break; + case tgCFGDIR : res = vc_getVserverCfgDir(vserver, vcCFG_AUTO); break; + case tgAPPDIR : + res = vc_getVserverAppDir(vserver, vcCFG_AUTO, argc==0 ? "" : argv[0]); + break; + case tgCONTEXT : - ctx = vc_getVserverCtx(vserver, vcCFG_AUTO, true, 0); - if (ctx!=VC_NOCTX) { - utilvserver_fmt_long(buf, ctx); + xid = vc_getVserverCtx(vserver, vcCFG_AUTO, true, 0); + if (xid!=VC_NOCTX) { + utilvserver_fmt_long(buf, xid); res = buf; } break; @@ -129,7 +167,91 @@ execQuery(char const *vserver, VserverTag tag) res = (vc_getVserverCtx(vserver, vcCFG_AUTO, false, 0)==VC_NOCTX) ? 0 : "1"; break; - case tgCFGDIR : + case tgXID : + { + pid_t pid = atoi(vserver); + + xid = vc_get_task_xid(pid); + if (xid==VC_NOCTX) perror("vc_get_task_xid()"); + else { + utilvserver_fmt_long(buf, xid); + res = buf; + } + break; + } + + case tgINITPID : + { + struct vc_vx_info info; + if (vc_get_vx_info(xid, &info)==-1) perror("vc_get_vx_info()"); + else { + utilvserver_fmt_long(buf, info.xid); + res = buf; + } + break; + } + + case tgINITPID_PID : + { + pid_t pid = atoi(vserver); + struct vc_vx_info info; + + xid = vc_get_task_xid(pid); + if (xid==VC_NOCTX) perror("vc_get_task_xid()"); + else if (vc_get_vx_info(xid, &info)==-1) perror("vc_get_vx_info()"); + else { + utilvserver_fmt_long(buf, info.xid); + res = buf; + } + break; + } + + case tgAPIVER : + { + int v = vc_get_version(); + if (v!=-1) { + size_t l = utilvserver_fmt_xulong(0, (unsigned int)v); + memcpy(buf, "0x00000000", 10); + utilvserver_fmt_xulong(buf+2+8-l, (unsigned int)v); + res = buf; + } + break; + } + + case tgUTS : + { + if (argc>0) { + vc_uts_type type = utsText2Tag(argv[0]); + if (vc_get_vhi_name(xid, type, buf, sizeof(buf)-1)==-1) + perror("vc_get_vhi_name()"); + else + res=buf; + } + else { + bool is_passed = false; + char tmp[128]; +#define APPEND_UTS(TYPE) \ + (((vc_get_vhi_name(xid, TYPE, tmp, sizeof(tmp)-1)!=-1) && (strcat(buf, tmp), strcat(buf, " "), is_passed=true)) || \ + (strcat(buf, "??? "))) + + APPEND_UTS(vcVHI_CONTEXT) && + APPEND_UTS(vcVHI_SYSNAME) && + APPEND_UTS(vcVHI_NODENAME) && + APPEND_UTS(vcVHI_RELEASE) && + APPEND_UTS(vcVHI_VERSION) && + APPEND_UTS(vcVHI_MACHINE) && + APPEND_UTS(vcVHI_DOMAINNAME) && + is_passed && + (res = buf); + + if (!is_passed) + perror("vc_get_vhi_name()"); + +#undef APPEND_UTS + } + break; + } + default : assert(false); abort(); // TODO } @@ -163,7 +285,7 @@ int main(int argc, char *argv[]) } } - if (optind+2!=argc) { + if (optind+2>argc) { WRITE_MSG(2, "No vserver or tag give; please try '--help' for more information.\n"); exit(1); } @@ -182,5 +304,5 @@ int main(int argc, char *argv[]) Eclose(fd); } - return execQuery(vserver, tag); + return execQuery(vserver, tag, argc-(optind+2), argv+optind+2); }