X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fvlimit.c;h=b2d128e6738bd673bd45341efa58f01b7aa995c4;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=18a28b258fe595e452665af3a2c8578e08bb37b1;hpb=06e1018272502e1d15d6d8f32b80fa96420785b8;p=util-vserver.git

diff --git a/src/vlimit.c b/src/vlimit.c
index 18a28b2..b2d128e 100644
--- a/src/vlimit.c
+++ b/src/vlimit.c
@@ -1,4 +1,4 @@
-// $Id: vlimit.c,v 1.1.2.2 2003/12/30 13:47:08 ensc Exp $
+// $Id: vlimit.c 2403 2006-11-24 23:06:08Z dhozac $
 
 // Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 //  
@@ -29,7 +29,8 @@
 #include "compat.h"
 
 #include "vserver.h"
-#include "vserver-internal.h"
+#include "internal.h"
+#include "util.h"
 
 #include <getopt.h>
 #include <string.h>
@@ -37,26 +38,46 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <libgen.h>
+#include <sys/resource.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <ctype.h>
 
-#define VERSION_COPYRIGHT_DISCLAIMER
+#define ENSC_WRAPPERS_PREFIX	"vlimit: "
+#define ENSC_WRAPPERS_UNISTD	1
+#define ENSC_WRAPPERS_VSERVER	1
+#include <wrappers.h>
 
-inline static void UNUSED
-writeStr(int fd, char const *cmd)
-{
-  (void)write(fd, cmd, strlen(cmd));
-}
+#define CMD_HELP		0x1000
+#define CMD_VERSION		0x1001
+#define CMD_XID			0x4000
+#define CMD_DIR			0x8000
+#define CMD_MISSINGOK		0x8001
 
-#define WRITE_MSG(FD,X)         (void)(write(FD,X,sizeof(X)-1))
-#define WRITE_STR(FD,X)         writeStr(FD,X)
+int		wrapper_exit_code = 255;
+
+#ifndef RLIMIT_MSGQUEUE
+#  define RLIMIT_MSGQUEUE	12
+#endif
 
 #define NUMLIM(X) \
 { #X, required_argument, 0, 2048|X }
+#define OPT_RESLIM(RES,V) \
+  { #RES, required_argument, 0, 2048|RLIMIT_##V }
+#define OPT_VLIMIT(RES,V) \
+  { #RES, required_argument, 0, 2048|VC_VLIMIT_##V }
 
 static struct option const
 CMDLINE_OPTIONS[] = {
-  { "help",     no_argument,  0, 'h' },
-  { "version",  no_argument,  0, 'v' },
-  { "all",      no_argument,  0, 'a' },
+  { "help",      no_argument,       0, CMD_HELP },
+  { "version",   no_argument,       0, CMD_VERSION },
+  { "all",       no_argument,       0, 'a' },
+  { "xid",       required_argument, 0, CMD_XID },
+  { "dir",       required_argument, 0, CMD_DIR },
+  { "missingok", no_argument,       0, CMD_MISSINGOK },
   NUMLIM( 0), NUMLIM( 1), NUMLIM( 2), NUMLIM( 3),
   NUMLIM( 4), NUMLIM( 5), NUMLIM( 6), NUMLIM( 7),
   NUMLIM( 8), NUMLIM( 9), NUMLIM(10), NUMLIM(11),
@@ -65,16 +86,69 @@ CMDLINE_OPTIONS[] = {
   NUMLIM(20), NUMLIM(21), NUMLIM(22), NUMLIM(23),
   NUMLIM(24), NUMLIM(25), NUMLIM(26), NUMLIM(27),
   NUMLIM(28), NUMLIM(29), NUMLIM(30), NUMLIM(31),
+  OPT_RESLIM(cpu,      CPU),
+  OPT_RESLIM(fsize,    FSIZE),
+  OPT_RESLIM(data,     DATA),
+  OPT_RESLIM(stack,    STACK),
+  OPT_RESLIM(core,     CORE),
+  OPT_RESLIM(rss,      RSS),
+  OPT_RESLIM(nproc,    NPROC),
+  OPT_RESLIM(nofile,   NOFILE),
+  OPT_RESLIM(memlock,  MEMLOCK),
+  OPT_RESLIM(as,       AS),
+  OPT_RESLIM(locks,    LOCKS),
+  OPT_RESLIM(msgqueue, MSGQUEUE),
+  OPT_VLIMIT(nsock,    NSOCK),
+  OPT_VLIMIT(openfd,   OPENFD),
+  OPT_VLIMIT(anon,     ANON),
+  OPT_VLIMIT(shmem,    SHMEM),
+  OPT_VLIMIT(semary,   SEMARY),
+  OPT_VLIMIT(nsems,    NSEMS),
+  OPT_VLIMIT(dentry,   DENTRY),
   { 0,0,0,0 }
 };
 
+#define REV_RESLIM(X)	[RLIMIT_##X] = #X
+#define REV_VLIMIT(X)	[VC_VLIMIT_##X] = #X
+static char const * const LIMIT_STR[] = {
+  REV_RESLIM(CPU),     REV_RESLIM(FSIZE),  REV_RESLIM(DATA),  REV_RESLIM(STACK),
+  REV_RESLIM(CORE),    REV_RESLIM(RSS),    REV_RESLIM(NPROC), REV_RESLIM(NOFILE),
+  REV_RESLIM(MEMLOCK), REV_RESLIM(AS),     REV_RESLIM(LOCKS), REV_RESLIM(MSGQUEUE),
+  REV_VLIMIT(NSOCK),   REV_VLIMIT(OPENFD), REV_VLIMIT(ANON),  REV_VLIMIT(SHMEM),
+  REV_VLIMIT(SEMARY),  REV_VLIMIT(NSEMS),  REV_VLIMIT(DENTRY),
+};
+
 static void
 showHelp(int fd, char const *cmd, int res)
 {
+  VSERVER_DECLARE_CMD(cmd);
+  
   WRITE_MSG(fd, "Usage:  ");
   WRITE_STR(fd, cmd);
   WRITE_MSG(fd,
-	    " [-c|--ctx <ctx>] [-a|--all] [-MSH  --<nr> <value>]*\n"
+	    " [--xid|-c <xid>] [-nd] [-a|--all] [[-MSH] --(<resource>|<nr>) <value>]*\n"
+	    "               [--dir <pathname> [--missingok]] [--] [<program> <args>*]\n\n"
+	    "Options:\n"
+	    "    -c|--xid <xid>\n"
+	    "                ...  operate on context <xid>\n"
+	    "    -a|--all    ...  show all available limits\n"
+	    "    -n          ...  do not resolve limit-names\n"
+	    "    -d          ...  show limits in decimal\n"
+	    "    -M          ...  set Minimum limit\n"
+	    "    -S          ...  set Soft limit\n"
+	    "    -H          ...  set Hard limit (assumed by default, when neither\n"
+	    "                     M nor S was requested)\n"
+	    "    --dir <pathname>\n"
+	    "                ...  read limits from <pathname>/; allowed filenames are\n"
+	    "                     <resource> and <resource>.{min,soft,hard}. When a limit\n"
+	    "                     was set by the CLI already, the corresponding file\n"
+	    "                     will be ignored\n"
+	    "    --missingok ...  do not fail when <pathname> does not exist\n"
+	    "    --<resource>|<nr> <value>\n"
+	    "                ...  set specified (MSH) limit for <resource> to <value>\n\n"
+	    "Valid values for resource are cpu, fsize, data, stack, core, rss, nproc,\n"
+	    "nofile, memlock, as, locks, msgqueue, nsock, openfd, anon, shmem, semary,\n"
+	    "nsems, and dentry.\n\n"
 	    "Please report bugs to " PACKAGE_BUGREPORT "\n");
   exit(res);
 }
@@ -90,6 +164,16 @@ showVersion()
   exit(0);
 }
 
+static size_t
+fmtHex(char *ptr, vc_limit_t lim)
+{
+  memcpy(ptr, "0x", 2);
+  return utilvserver_fmt_xuint64(ptr+2, lim) + 2;
+}
+
+static bool		do_resolve = true;
+static size_t		(*fmt_func)(char *, vc_limit_t) = fmtHex;
+
 static void *
 appendLimit(char *ptr, bool do_it, vc_limit_t lim)
 {
@@ -97,15 +181,11 @@ appendLimit(char *ptr, bool do_it, vc_limit_t lim)
   ptr += 2;
   if (do_it) {
     if (lim==VC_LIM_INFINITY) {
-      strcpy(ptr, "INF");
+      memcpy(ptr, "inf", 3);
       ptr += 3;
     }
     else {
-      memcpy(ptr, "0x", 2);
-      ptr += 2;
-
-      ptr += utilvserver_uint2str(ptr, 20, (lim>>32),      16);
-      ptr += utilvserver_uint2str(ptr, 20, lim&0xffffffff, 16);
+      ptr += (*fmt_func)(ptr, lim);
       *ptr = ' ';
     }
   }
@@ -123,54 +203,151 @@ showAll(int ctx)
   struct vc_rlimit_mask	mask;
   size_t		i;
 
-  if (vc_get_rlimit_mask(-2, &mask)==-1) {
+  if (vc_get_rlimit_mask(ctx, &mask)==-1) {
     perror("vc_get_rlimit_mask()");
-    //exit(1);
+    exit(wrapper_exit_code);
   }
 
   for (i=0; i<32; ++i) {
     uint32_t		bitmask = (1<<i);
     struct vc_rlimit	limit;
-    char		buf[100], *ptr=buf;
-    
+    char		buf[128], *ptr=buf;
+
+    if (((mask.min|mask.soft|mask.hard) & bitmask)==0) continue;
     if (vc_get_rlimit(ctx, i, &limit)==-1) {
       perror("vc_get_rlimit()");
-      //continue;
+      continue;
     }
 
     memset(buf, ' ', sizeof buf);
-    ptr += utilvserver_uint2str(ptr, 100, i, 10);
-    *ptr = ' ';
+    if (do_resolve && i<DIM_OF(LIMIT_STR)) {
+      size_t		l = strlen(LIMIT_STR[i]);
+      memcpy(ptr, LIMIT_STR[i], l);
+      ptr += l;
+    }
+    else {
+      ptr += utilvserver_fmt_uint(ptr, i);
+      *ptr = ' ';
+    }
 
     ptr  = appendLimit(buf+10, mask.min &bitmask, limit.min);
     ptr  = appendLimit(buf+30, mask.soft&bitmask, limit.soft);
     ptr  = appendLimit(buf+50, mask.hard&bitmask, limit.hard);
 
     *ptr++ = '\n';
-    write(1, buf, ptr-buf);
- }
+    Vwrite(1, buf, ptr-buf);
+  }
 }
 
 static void
-  setLimits(int ctx, struct vc_rlimit const limits[], uint32_t mask)
+setLimits(int ctx, struct vc_rlimit const limits[], uint32_t mask)
 {
   size_t		i;
   for (i=0; i<32; ++i) {
     if ((mask & (1<<i))==0) continue;
-    if (vc_set_rlimit(-2, i, limits+i)) {
+    if (vc_set_rlimit(ctx, i, limits+i)) {
       perror("vc_set_rlimit()");
     }
   }
 }
 
+static vc_limit_t
+readValue(int fd, char const *filename)
+{
+  char		buf[128];
+  size_t	len = Eread(fd, buf, sizeof(buf)-1);
+  vc_limit_t	res;
+
+  buf[len] = '\0';
+
+  if (!vc_parseLimit(buf, &res)) {
+    WRITE_MSG(2, "Invalid limit in '");
+    WRITE_STR(2, filename);
+    WRITE_STR(2, "'\n");
+    exit(wrapper_exit_code);
+  }
+
+  return res;
+}
+
+static bool
+readFile(char const *file, char *base, char const *suffix,
+	 vc_limit_t *limit)
+{
+  int		fd;
+  
+  strcpy(base, suffix);
+  fd = open(file, O_RDONLY);
+  if (fd!=-1) {
+    *limit = readValue(fd, file);
+    Eclose(fd);
+  }
+
+  return fd!=-1;
+}
+	 
+static void
+readFromDir(struct vc_rlimit limits[32], uint_least32_t *mask,
+	    char const *pathname, bool missing_ok)
+{
+  struct stat		st;
+  size_t		i;
+  size_t		l_pathname = strlen(pathname);
+  char			buf[l_pathname + sizeof("/memlock.hard") + 32];
+  
+  if (stat(pathname, &st)==-1) {
+    if (errno==ENOENT && missing_ok) return;
+    PERROR_Q("vlimit: fstat", pathname);
+    exit(wrapper_exit_code);
+  }
+
+  memcpy(buf, pathname, l_pathname);
+  if (l_pathname>0 && pathname[l_pathname-1]!='/')
+    buf[l_pathname++] = '/';
+    
+  for (i=0; i<DIM_OF(LIMIT_STR); ++i) {
+    size_t	l_res;
+    char *	ptr   = buf+l_pathname;
+
+    // ignore unimplemented limits
+    if (LIMIT_STR[i]==0) continue;
+    
+    // ignore limits set on cli already
+    if (*mask & (1<<i)) continue;
+
+    l_res = strlen(LIMIT_STR[i]);
+    memcpy(ptr, LIMIT_STR[i], l_res+1);
+    while (*ptr) {
+      *ptr = tolower(*ptr);
+      ++ptr;
+    }
+
+    if (readFile(buf, ptr, "", &limits[i].min)) {
+      limits[i].soft = limits[i].hard = limits[i].min;
+      *mask |= (1<<i);
+    }
+
+    if (readFile(buf, ptr, ".min",  &limits[i].min))
+      *mask |= (1<<i);
+
+    if (readFile(buf, ptr, ".soft", &limits[i].soft))
+      *mask |= (1<<i);
+
+    if (readFile(buf, ptr, ".hard", &limits[i].hard))
+      *mask |= (1<<i);
+  }
+}
+
 int main (int argc, char *argv[])
 {
   // overall used limits
   uint32_t		lim_mask = 0;
   int			set_mask = 0;
   struct vc_rlimit	limits[32];
-  bool			show_all = false;
-  xid_t			ctx      = VC_SAMECTX;
+  bool			show_all   = false;
+  xid_t			ctx        = VC_NOCTX;
+  char const *		dir        = 0;
+  bool			missing_ok = false;
 
   {
     size_t		i;
@@ -182,28 +359,39 @@ int main (int argc, char *argv[])
   }
   
   while (1) {
-    int		c = getopt_long(argc, argv, "MSHhvac:", CMDLINE_OPTIONS, 0);
+    int		c = getopt_long(argc, argv, "+MSHndac:", CMDLINE_OPTIONS, 0);
     if (c==-1) break;
 
     if (2048<=c && c<2048+32) {
       int		id  = c-2048;
       vc_limit_t	val;
       
-      if (strcmp(optarg, "inf")==0) val = VC_LIM_INFINITY;
-      else			    val = atoll(optarg);
+      if (!vc_parseLimit(optarg, &val)) {
+	WRITE_MSG(2, "Can not parse limit '");
+	WRITE_STR(2, optarg);
+	WRITE_STR(2, "'\n");
+	exit(wrapper_exit_code);
+      }
 
+      if (set_mask==0)  set_mask=4;
+      
       if (set_mask & 1) limits[id].min  = val;
       if (set_mask & 2) limits[id].soft = val;
-      if (set_mask & 4) limits[id].soft = val;
+      if (set_mask & 4) limits[id].hard = val;
 
       lim_mask |= (1<<id);
       set_mask  = 0;
     }
     else switch (c) {
-      case 'h'		:  showHelp(1, argv[0], 0);
-      case 'v'		:  showVersion();
-      case 'c'		:  ctx      = atoi(optarg); break;
-      case 'a'		:  show_all = true;         break;
+      case CMD_HELP	:  showHelp(1, argv[0], 0);
+      case CMD_VERSION	:  showVersion();
+      case 'a'		:  show_all   = true;            break;
+      case 'n'		:  do_resolve = false;           break;
+      case CMD_DIR	:  dir        = optarg;          break;
+      case CMD_MISSINGOK:  missing_ok = true;            break;
+      case CMD_XID	:  /*@fallthrough@*/
+      case 'c'		:  ctx = Evc_xidopt2xid(optarg,true);   break;
+      case 'd'		:  fmt_func   = utilvserver_fmt_uint64; break;
       case 'M'		:
       case 'S'		:
       case 'H'		:
@@ -218,14 +406,23 @@ int main (int argc, char *argv[])
       default		:
 	WRITE_MSG(2, "Try '");
 	WRITE_STR(2, argv[0]);
-	WRITE_MSG(2, " --help\" for more information.\n");
-	return EXIT_FAILURE;
+	WRITE_MSG(2, " --help' for more information.\n");
+	exit(wrapper_exit_code) ;
 	break;
     }
   }
 
+  if (ctx==VC_NOCTX)
+    ctx = Evc_get_task_xid(0);
+
+  if (dir)
+    readFromDir(limits, &lim_mask, dir, missing_ok);
+
   setLimits(ctx, limits, lim_mask);
   if (show_all) showAll(ctx);
 
+  if (optind<argc)
+    EexecvpD(argv[optind], argv+optind);
+
   return EXIT_SUCCESS;
 }