#include <stdbool.h>
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;
{ "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
WRITE_MSG(fd, "Usage: ");
WRITE_STR(fd, cmd);
WRITE_MSG(fd,
- " [-q] <vserver> <tag>\n"
+ " [-ql] <vserver>|<pid>|<context> <tag>\n"
"Please report bugs to " PACKAGE_BUGREPORT "\n");
exit(res);
}
size_t i;
WRITE_MSG(1, "Valid tags are: ");
- for (i=0; i<TAGS_COUNT; ++i) {
+ for (i=0; i<DIM_OF(TAGS); ++i) {
WRITE_STR(1, delim);
WRITE_STR(1, TAGS[i].tag);
stringToTag(char const *str)
{
size_t i;
- for (i=0; i<TAGS_COUNT; ++i)
+ for (i=0; i<DIM_OF(TAGS); ++i)
if (strcmp(TAGS[i].tag, str)==0) return TAGS[i].val;
return tgNONE;
}
+static vc_uts_type
+utsText2Tag(char const *str)
+{
+ if (strcmp(str, "context") ==0) return vcVHI_CONTEXT;
+ else if (strcmp(str, "sysname") ==0) return vcVHI_SYSNAME;
+ else if (strcmp(str, "nodename") ==0) return vcVHI_NODENAME;
+ else if (strcmp(str, "release") ==0) return vcVHI_RELEASE;
+ else if (strcmp(str, "version") ==0) return vcVHI_VERSION;
+ else if (strcmp(str, "machine") ==0) return vcVHI_MACHINE;
+ else if (strcmp(str, "domainname")==0) return vcVHI_DOMAINNAME;
+ else {
+ WRITE_MSG(2, "Unknown UTS tag\n");
+ exit(1);
+ }
+}
+
static int
-execQuery(char const *vserver, VserverTag tag)
+execQuery(char const *vserver, VserverTag tag, int argc, char *argv[])
{
char const * res = 0;
- char buf[sizeof(xid_t)*4 + 16];
- xid_t ctx;
-
+ char buf[sizeof(xid_t)*4 + 1024];
+ xid_t xid = *vserver!='\0' ? (xid_t)(atoi(vserver)) : VC_SAMECTX;
+
+ memset(buf, 0, sizeof buf);
switch (tag) {
case tgNAME : res = vc_getVserverName(vserver, vcCFG_AUTO); break;
- case tgVDIR : res = vc_getVserverVdir(vserver, vcCFG_AUTO); break;
+ case tgVDIR :
+ res = vc_getVserverVdir(vserver, vcCFG_AUTO, argc>0 && 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;
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
}
}
}
- 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);
}
Eclose(fd);
}
- return execQuery(vserver, tag);
+ return execQuery(vserver, tag, argc-(optind+2), argv+optind+2);
}