git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase master to b117
[zfs.git]
/
lib
/
libzpool
/
include
/
sys
/
zfs_context.h
diff --git
a/lib/libzpool/include/sys/zfs_context.h
b/lib/libzpool/include/sys/zfs_context.h
index
0e7019b
..
230c233
100644
(file)
--- a/
lib/libzpool/include/sys/zfs_context.h
+++ b/
lib/libzpool/include/sys/zfs_context.h
@@
-19,7
+19,7
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
@@
-59,6
+59,7
@@
extern "C" {
#include <atomic.h>
#include <dirent.h>
#include <time.h>
#include <atomic.h>
#include <dirent.h>
#include <time.h>
+#include <libsysevent.h>
#include <sys/note.h>
#include <sys/types.h>
#include <sys/cred.h>
#include <sys/note.h>
#include <sys/types.h>
#include <sys/cred.h>
@@
-73,6
+74,7
@@
extern "C" {
#include <sys/kstat.h>
#include <sys/u8_textprep.h>
#include <sys/sysevent/eventdefs.h>
#include <sys/kstat.h>
#include <sys/u8_textprep.h>
#include <sys/sysevent/eventdefs.h>
+#include <sys/sysevent/dev.h>
/*
* Debugging
/*
* Debugging
@@
-316,6
+318,7
@@
typedef void (task_func_t)(void *);
#define TASKQ_PREPOPULATE 0x0001
#define TASKQ_CPR_SAFE 0x0002 /* Use CPR safe protocol */
#define TASKQ_DYNAMIC 0x0004 /* Use dynamic thread scheduling */
#define TASKQ_PREPOPULATE 0x0001
#define TASKQ_CPR_SAFE 0x0002 /* Use CPR safe protocol */
#define TASKQ_DYNAMIC 0x0004 /* Use dynamic thread scheduling */
+#define TASKQ_THREADS_CPU_PCT 0x0008 /* Use dynamic thread scheduling */
#define TQ_SLEEP KM_SLEEP /* Can block for memory */
#define TQ_NOSLEEP KM_NOSLEEP /* cannot block for memory; may fail */
#define TQ_SLEEP KM_SLEEP /* Can block for memory */
#define TQ_NOSLEEP KM_NOSLEEP /* cannot block for memory; may fail */
@@
-490,7
+493,7
@@
typedef struct callb_cpr {
/*
* Hostname information
*/
/*
* Hostname information
*/
-extern char hw_serial[];
+extern char hw_serial[];
/* for userland-emulated hostid access */
extern int ddi_strtoul(const char *str, char **nptr, int base,
unsigned long *result);
extern int ddi_strtoul(const char *str, char **nptr, int base,
unsigned long *result);
@@
-540,6
+543,10
@@
typedef struct ksiddomain {
ksiddomain_t *ksid_lookupdomain(const char *);
void ksiddomain_rele(ksiddomain_t *);
ksiddomain_t *ksid_lookupdomain(const char *);
void ksiddomain_rele(ksiddomain_t *);
+#define DDI_SLEEP KM_SLEEP
+#define ddi_log_sysevent(_a, _b, _c, _d, _e, _f, _g) \
+ sysevent_post_event(_c, _d, _b, "libzpool", _e, _f)
+
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif