1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* internal.h (rb_execarg): add rlimit_limits field.

Browse Source 
* process.c (EXEC_OPTION_RLIMIT): removed.
  (mark_exec_arg): mark rlimit_limits field.
  (rb_execarg_addopt): update the new fields, instead of options array.
  (run_exec_rlimit): use the new field.
  (rb_execarg_run_options): clear sarg using MEMZERO.  use the new
  field.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-23 07:30:26 +00:00
parent b25b9569e5
commit f732c5046e
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Sat Jun 23 16:27:01 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add rlimit_limits field.
* process.c (EXEC_OPTION_RLIMIT): removed.
(mark_exec_arg): mark rlimit_limits field.
(rb_execarg_addopt): update the new fields, instead of options array.
(run_exec_rlimit): use the new field.
(rb_execarg_run_options): clear sarg using MEMZERO. use the new
field.
Sat Jun 23 14:29:25 2012 Tanaka Akira <akr@fsij.org> Sat Jun 23 14:29:25 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add chdir_given and chdir_dir fields. * internal.h (rb_execarg): add chdir_given and chdir_dir fields.

1
internal.h
View File

@ -184,6 +184,7 @@ struct rb_execarg {
unsigned close_others_do : 1; unsigned close_others_do : 1;
unsigned chdir_given : 1; unsigned chdir_given : 1;
pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */ pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */
VALUE rlimit_limits; /* Qfalse or [[rtype, softlim, hardlim], ...] */
mode_t umask_mask; mode_t umask_mask;
int close_others_maxhint; int close_others_maxhint;
VALUE chdir_dir; VALUE chdir_dir;

28
process.c
View File

@ -1254,7 +1254,6 @@ rb_proc_exec(const char *str)
} }
enum { enum {
EXEC_OPTION_RLIMIT,
EXEC_OPTION_ENV, EXEC_OPTION_ENV,
EXEC_OPTION_DUP2, EXEC_OPTION_DUP2,
EXEC_OPTION_CLOSE, EXEC_OPTION_CLOSE,
@ -1280,6 +1279,7 @@ mark_exec_arg(void *ptr)
rb_gc_mark(eargp->envp_str); rb_gc_mark(eargp->envp_str);
rb_gc_mark(eargp->envp_buf); rb_gc_mark(eargp->envp_buf);
rb_gc_mark(eargp->dup2_tmpbuf); rb_gc_mark(eargp->dup2_tmpbuf);
rb_gc_mark(eargp->rlimit_limits);
rb_gc_mark(eargp->chdir_dir); rb_gc_mark(eargp->chdir_dir);
} }
@ -1588,12 +1588,12 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
#if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM) #if defined(HAVE_SETRLIMIT) && defined(NUM2RLIM)
if (strncmp("rlimit_", rb_id2name(id), 7) == 0 && if (strncmp("rlimit_", rb_id2name(id), 7) == 0 &&
(rtype = rlimit_type_by_lname(rb_id2name(id)+7)) != -1) { (rtype = rlimit_type_by_lname(rb_id2name(id)+7)) != -1) {
VALUE ary = rb_ary_entry(options, EXEC_OPTION_RLIMIT); VALUE ary = eargp->rlimit_limits;
VALUE tmp, softlim, hardlim; VALUE tmp, softlim, hardlim;
if (NIL_P(ary)) { if (eargp->rlimit_limits == Qfalse)
ary = hide_obj(rb_ary_new()); ary = eargp->rlimit_limits = hide_obj(rb_ary_new());
rb_ary_store(options, EXEC_OPTION_RLIMIT, ary); else
} ary = eargp->rlimit_limits;
tmp = rb_check_array_type(val); tmp = rb_check_array_type(val);
if (!NIL_P(tmp)) { if (!NIL_P(tmp)) {
if (RARRAY_LEN(tmp) == 1) if (RARRAY_LEN(tmp) == 1)
@ -2665,7 +2665,6 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
int rtype = NUM2INT(RARRAY_PTR(elt)[0]); int rtype = NUM2INT(RARRAY_PTR(elt)[0]);
struct rlimit rlim; struct rlimit rlim;
if (sargp) { if (sargp) {
VALUE soptions = sargp->options;
VALUE tmp, newary; VALUE tmp, newary;
if (getrlimit(rtype, &rlim) == -1) { if (getrlimit(rtype, &rlim) == -1) {
ERRMSG("getrlimit"); ERRMSG("getrlimit");
@ -2674,11 +2673,10 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
tmp = hide_obj(rb_ary_new3(3, RARRAY_PTR(elt)[0], tmp = hide_obj(rb_ary_new3(3, RARRAY_PTR(elt)[0],
RLIM2NUM(rlim.rlim_cur), RLIM2NUM(rlim.rlim_cur),
RLIM2NUM(rlim.rlim_max))); RLIM2NUM(rlim.rlim_max)));
newary = rb_ary_entry(soptions, EXEC_OPTION_RLIMIT); if (sargp->rlimit_limits == Qfalse)
if (NIL_P(newary)) { newary = sargp->rlimit_limits = hide_obj(rb_ary_new());
newary = hide_obj(rb_ary_new()); else
rb_ary_store(soptions, EXEC_OPTION_RLIMIT, newary); newary = sargp->rlimit_limits;
}
rb_ary_push(newary, tmp); rb_ary_push(newary, tmp);
} }
rlim.rlim_cur = NUM2RLIM(RARRAY_PTR(elt)[1]); rlim.rlim_cur = NUM2RLIM(RARRAY_PTR(elt)[1]);
@ -2732,9 +2730,9 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
if (sargp) { if (sargp) {
/* assume that sargp is always NULL on fork-able environments */ /* assume that sargp is always NULL on fork-able environments */
MEMZERO(sargp, struct rb_execarg, 1);
sargp->options = hide_obj(rb_ary_new()); sargp->options = hide_obj(rb_ary_new());
sargp->redirect_fds = Qnil; sargp->redirect_fds = Qnil;
sargp->envp_str = sargp->envp_buf = 0;
} }
#ifdef HAVE_SETPGID #ifdef HAVE_SETPGID
@ -2745,8 +2743,8 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
#endif #endif
#if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM) #if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM)
obj = rb_ary_entry(options, EXEC_OPTION_RLIMIT); obj = eargp->rlimit_limits;
if (!NIL_P(obj)) { if (obj != Qfalse) {
if (run_exec_rlimit(obj, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */ if (run_exec_rlimit(obj, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */
return -1; return -1;
} }