Mercurial > illumos > illumos-gate

diff usr/src/lib/fm/libfmevent/common/fmev_evaccess.c @ 12979:ab9ae749152f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC/2009/617 Software Events Notification Parameters CLI PSARC/2009/618 snmp-notify: SNMP Notification Daemon for Software Events PSARC/2009/619 smtp-notify: Email Notification Daemon for Software Events PSARC/2010/225 fmd for non-global Solaris zones PSARC/2010/226 Solaris Instance UUID PSARC/2010/227 nvlist_nvflag(3NVPAIR) PSARC/2010/228 libfmevent additions PSARC/2010/257 sysevent_evc_setpropnvl and sysevent_evc_getpropnvl PSARC/2010/265 FMRI and FMA Event Stabilty, 'ireport' category 1 event class, and the 'sw' FMRI scheme PSARC/2010/278 FMA/SMF integration: instance state transitions PSARC/2010/279 Modelling panics within FMA PSARC/2010/290 logadm.conf upgrade 6392476 fmdump needs to pretty-print 6393375 userland ereport/ireport event generation interfaces 6445732 Add email notification agent for FMA and software events 6804168 RFE: Allow an efficient means to monitor SMF services status changes 6866661 scf_values_destroy(3SCF) will segfault if is passed NULL 6884709 Add snmp notification agent for FMA and software events 6884712 Add private interface to tap into libfmd_msg macro expansion capabilities 6897919 fmd to run in a non-global zone 6897937 fmd use of non-private doors is not safe 6900081 add a UUID to Solaris kernel image for use in crashdump identification 6914884 model panic events as a defect diagnosis in FMA 6944862 fmd_case_open_uuid, fmd_case_uuisresolved, fmd_nvl_create_defect 6944866 log legacy sysevents in fmd 6944867 enumerate svc scheme in topo 6944868 software-diagnosis and software-response fmd modules 6944870 model SMF maintenance state as a defect diagnosis in FMA 6944876 savecore runs in foreground for systems with zfs root and dedicated dump 6965796 Implement notification parameters for SMF state transitions and FMA events 6968287 SUN-FM-MIB.mib needs to be updated to reflect Oracle information 6972331 logadm.conf upgrade PSARC/2010/290
author Gavin Maltby <gavin.maltby@oracle.com>
date Fri, 30 Jul 2010 17:04:17 +1000
parents b91faef0c984
children
line wrap: on
line diff
--- a/usr/src/lib/fm/libfmevent/common/fmev_evaccess.c	Thu Jul 29 22:45:58 2010 -0700
+++ b/usr/src/lib/fm/libfmevent/common/fmev_evaccess.c	Fri Jul 30 17:04:17 2010 +1000
@@ -20,8 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -38,9 +37,8 @@
 
 #include "fmev_impl.h"
 
-#define	API_ENTERV1(iep) \
-	((void) fmev_api_enter(fmev_shdl_cmn(((iep)->ei_hdl)), \
-	LIBFMEVENT_VERSION_1))
+#define	FMEV_API_ENTER(iep, v) \
+	fmev_api_enter(fmev_shdl_cmn(((iep)->ei_hdl)), LIBFMEVENT_VERSION_##v)
 
 typedef struct {
 	uint32_t ei_magic;		/* _FMEVMAGIC */
@@ -137,7 +135,7 @@
 
 	ASSERT(EVENT_VALID(iep));
 
-	API_ENTERV1(iep);
+	(void) FMEV_API_ENTER(iep, 1);
 
 	atomic_inc_32(&iep->ei_refcnt);
 }
@@ -149,7 +147,7 @@
 
 	ASSERT(EVENT_VALID(iep));
 
-	API_ENTERV1(iep);
+	(void) FMEV_API_ENTER(iep, 1);
 
 	if (atomic_dec_32_nv(&iep->ei_refcnt) == 0)
 		fmev_free(iep);
@@ -163,7 +161,8 @@
 
 	ASSERT(EVENT_VALID(iep));
 
-	API_ENTERV1(iep);
+	if (!FMEV_API_ENTER(iep, 1))
+		return (NULL);	/* fmev_errno set */
 
 	if (ev == NULL) {
 		(void) fmev_seterr(FMEVERR_API);
@@ -194,7 +193,8 @@
 
 	ASSERT(EVENT_VALID(iep));
 
-	API_ENTERV1(iep);
+	if (!FMEV_API_ENTER(iep, 1))
+		return (NULL);	/* fmev_errno set */
 
 	if (ev == NULL) {
 		(void) fmev_seterr(FMEVERR_API);
@@ -215,7 +215,8 @@
 
 	ASSERT(EVENT_VALID(iep));
 
-	API_ENTERV1(iep);
+	if (!FMEV_API_ENTER(iep, 1))
+		return (NULL);	/* fmev_errno set */
 
 	if (ev == NULL) {
 		(void) fmev_seterr(FMEVERR_API);
@@ -238,7 +239,8 @@
 	uint64_t timetlimit;
 
 	ASSERT(EVENT_VALID(iep));
-	API_ENTERV1(iep);
+	if (!FMEV_API_ENTER(iep, 1))
+		return (fmev_errno);
 
 #ifdef	_LP64
 	timetlimit = INT64_MAX;
@@ -275,3 +277,14 @@
 	seconds = (time_t)fmev_time_sec(ev);
 	return (localtime_r(&seconds, tm));
 }
+
+fmev_shdl_t
+fmev_ev2shdl(fmev_t ev)
+{
+	fmev_impl_t *iep = FMEV2IMPL(ev);
+
+	if (!FMEV_API_ENTER(iep, 2))
+		return (NULL);
+
+	return (iep->ei_hdl);
+}