diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-12 22:04:21 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-12 22:04:21 +0000 |
| commit | e6da459b1596abb233d556176cdb679cbf9d2b6a (patch) | |
| tree | 1f435ff9c599203f52dbf4d4624bc71eb39c7c1c | |
| parent | 6861ec3ea2dc4ffcfd43045c05f4fa1b44b3d174 (diff) | |
| parent | ac58c5db4a5b4615fc374fa3211bdda323263284 (diff) | |
| download | illumos-joyent-e6da459b1596abb233d556176cdb679cbf9d2b6a.tar.gz | |
[illumos-gate merge]
commit ac58c5db4a5b4615fc374fa3211bdda323263284
3985 want mdb api function for iterating object symbols
commit a288e5a9793fdffe5e842d7e61ab45263e75eaca
3975 ddi_periodic_add(9F) is entirely rubbish
commit 2a17138d7a5102bc6e0bf0444224cd0c416d98f0
3989 svc.startd gets stuck in a loop when HOME dir doesn't exist
3990 a misconfigured smf service can cause svc.configd to leak memory and eventually hang
3991 startd, configd spinning due to bad sac start method
commit 0d421f668cdfd7a53019f57234af254738038aa0
3986 svc.startd dies in getutxent_frec()
3987 svc.startd dies in utmpx_postfork()
| -rw-r--r-- | usr/src/cmd/mdb/common/mdb/mdb_target.h | 8 | ||||
| -rw-r--r-- | usr/src/cmd/svc/startd/restarter.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/svc/startd/startd.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/usr/src/cmd/mdb/common/mdb/mdb_target.h b/usr/src/cmd/mdb/common/mdb/mdb_target.h index d886a0a4d0..b511ba07c3 100644 --- a/usr/src/cmd/mdb/common/mdb/mdb_target.h +++ b/usr/src/cmd/mdb/common/mdb/mdb_target.h @@ -27,8 +27,6 @@ #ifndef _MDB_TARGET_H #define _MDB_TARGET_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/utsname.h> #include <sys/types.h> #include <gelf.h> @@ -232,7 +230,11 @@ typedef int mdb_tgt_sym_f(void *, const GElf_Sym *, const char *, /* * Values for selecting symbols of interest by binding and type. These flags - * can be used to construct a bitmask to pass to mdb_tgt_symbol_iter(): + * can be used to construct a bitmask to pass to mdb_tgt_symbol_iter(). The + * module API has its own slightly different names for these values. If you are + * adding a new flag here, you should consider exposing it in the module API. + * If you are changing these flags and their meanings, you will need to update + * the module API implementation to account for those changes. */ #define MDB_TGT_BIND_LOCAL 0x0001 /* Local (static-scope) symbols */ #define MDB_TGT_BIND_GLOBAL 0x0002 /* Global symbols */ diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index c485f1895f..6adb323289 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -1153,7 +1153,7 @@ stop_instance(scf_handle_t *local_handle, restarter_inst_t *inst, if (method_rate_critical(inst)) { log_instance(inst, B_TRUE, "Failing too " "quickly, throttling."); - sleep(WT_SVC_ERR_THROTTLE); + (void) sleep(WT_SVC_ERR_THROTTLE); } } else { (void) update_fault_count(inst, FAULT_COUNT_RESET); diff --git a/usr/src/cmd/svc/startd/startd.h b/usr/src/cmd/svc/startd/startd.h index e4f37a4213..e204fb829f 100644 --- a/usr/src/cmd/svc/startd/startd.h +++ b/usr/src/cmd/svc/startd/startd.h @@ -406,8 +406,8 @@ typedef enum { #define RINST_RETAKE_MASK 0x0f000000 #define RINST_START_TIMES 10 /* up to 10 fails to consider */ -#define RINST_FAILURE_RATE_NS 600000000000LL /* N failures/10 minutes */ -#define RINST_WT_SVC_FAILURE_RATE_NS NANOSEC /* N failures/second */ +#define RINST_FAILURE_RATE_NS 600000000000LL /* 1 failure/10 minutes */ +#define RINST_WT_SVC_FAILURE_RATE_NS NANOSEC /* 1 failure/second */ /* Number of events in the queue when we start dropping ADMIN events. */ #define RINST_QUEUE_THRESHOLD 100 |