diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-03-27 10:06:45 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-05-02 09:50:26 -0700 |
| commit | 93cf283ac1d0119d2ee3842f515f8d0e1bc7cbdb (patch) | |
| tree | e345bda7a70425a86fc8a2e20e2e07d613152146 /usr/src/uts/common/sys | |
| parent | 188db4cedf56a03ce57c157895ddf5bcd0379d42 (diff) | |
| download | illumos-joyent-93cf283ac1d0119d2ee3842f515f8d0e1bc7cbdb.tar.gz | |
6826 want support for nested interpreters
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Cody Mello <cody.mello@joyent.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Dan McDonald <danmcd@omniti.com
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/exec.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/zone.h | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/exec.h b/usr/src/uts/common/sys/exec.h index d36bc20481..b5e2c58be5 100644 --- a/usr/src/uts/common/sys/exec.h +++ b/usr/src/uts/common/sys/exec.h @@ -157,10 +157,11 @@ typedef struct uarg { #endif #define INTPSZ MAXPATHLEN +#define INTP_MAXDEPTH 5 /* Nested interpreter depth matches Linux */ typedef struct intpdata { char *intp; - char *intp_name; - char *intp_arg; + char *intp_name[INTP_MAXDEPTH]; + char *intp_arg[INTP_MAXDEPTH]; } intpdata_t; #define EXECSETID_SETID 0x1 /* setid exec */ diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h index 34d00c3e89..2e69b0d1c7 100644 --- a/usr/src/uts/common/sys/zone.h +++ b/usr/src/uts/common/sys/zone.h @@ -403,6 +403,7 @@ typedef struct { kstat_named_t zm_ffnoproc; kstat_named_t zm_ffnomem; kstat_named_t zm_ffmisc; + kstat_named_t zm_nested_intp; kstat_named_t zm_init_pid; kstat_named_t zm_boot_time; } zone_misc_kstat_t; @@ -601,6 +602,8 @@ typedef struct zone { uint32_t zone_ffnomem; /* as_dup/memory error */ uint32_t zone_ffmisc; /* misc. other error */ + uint32_t zone_nested_intp; /* nested interp. kstat */ + struct loadavg_s zone_loadavg; /* loadavg for this zone */ uint64_t zone_hp_avenrun[3]; /* high-precision avenrun */ int zone_avenrun[3]; /* FSCALED avg. run queue len */ |