d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize fp_location for explicitly managed fail points, and push

Browse Source 
the parentheses around the location for simple fail points into the
location string.  This makes the print on fail point set more
consistent between the two versions.

Also fix up fail.h a little for style(9): only use one of sys/param.h
and sys/types.h, and use the existing __XSTRING() macro instead of
rolling our own.  Also fix up a few tabs on changed and nearby lines.

Lastly, since KFAIL_POINT_{BEGIN,END} are not meant for use outside
this file, just eliminate the macros entirely.

MFC after: 1 week
This commit is contained in:
Matthew D Fleming 2010-12-21 18:23:03 +00:00
parent 5c98f5b0da
commit 4b7c684420
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=216620
2 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/kern_fail.c
View File

@ -177,6 +177,7 @@ fail_point_init(struct fail_point *fp, const char *fmt, ...)
va_end(ap);
}
fp->fp_name = name;
fp->fp_location = "";
fp->fp_flags |= FAIL_POINT_DYNAMIC_NAME;
fp->fp_sleep_fn = NULL;
fp->fp_sleep_arg = NULL;
@ -372,10 +373,10 @@ fail_point_set(struct fail_point *fp, char *buf)
end:
#ifdef IWARNING
if (error)
IWARNING("Failed to set %s (%s) to %s",
IWARNING("Failed to set %s %s to %s",
fp->fp_name, fp->fp_location, buf);
else
INOTICE("Set %s (%s) to %s",
INOTICE("Set %s %s to %s",
fp->fp_name, fp->fp_location, buf);
#endif /* IWARNING */

75
sys/sys/fail.h
View File

@ -32,10 +32,9 @@
#ifndef _SYS_FAIL_H_
#define _SYS_FAIL_H_
#include <sys/types.h>
#include <sys/linker_set.h>
#include <sys/param.h>
#include <sys/cdefs.h>
#include <sys/linker_set.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
@ -129,10 +128,8 @@ fail_point_eval(struct fail_point *fp, int *ret)
__END_DECLS
/* Declare a fail_point and its sysctl in a function. */
#define _FAIL_POINT_NAME(name) _fail_point_##name
#define _STRINGIFY_HELPER(x) #x
#define _STRINGIFY(x) _STRINGIFY_HELPER(x)
#define _FAIL_POINT_LOCATION() __FILE__ ":" _STRINGIFY(__LINE__)
#define _FAIL_POINT_NAME(name) _fail_point_##name
#define _FAIL_POINT_LOCATION() "(" __FILE__ ":" __XSTRING(__LINE__) ")"
/**
* Instantiate a failpoint which returns "value" from the function when triggered.
@ -178,53 +175,43 @@ __END_DECLS
/**
* Instantiate a failpoint which runs arbitrary code when triggered.
* @param parent The parent sysctl under which to locate the sysctl
* @param name The name of the failpoint in the sysctl tree (and printouts)
* @param name The name of the failpoint in the sysctl tree
* (and printouts)
* @param code The arbitrary code to run when triggered. Can reference
* "RETURN_VALUE" if desired to extract the specified user
* return-value when triggered
* "RETURN_VALUE" if desired to extract the specified
* user return-value when triggered. Note that this is
* implemented with a do-while loop so be careful of
* break and continue statements.
*/
#define KFAIL_POINT_CODE(parent, name, code) \
KFAIL_POINT_START(parent, name) { \
do { \
int RETURN_VALUE; \
static struct fail_point _FAIL_POINT_NAME(name) = { \
#name, \
_FAIL_POINT_LOCATION(), \
TAILQ_HEAD_INITIALIZER(_FAIL_POINT_NAME(name).fp_entries), \
0, \
NULL, NULL, \
}; \
SYSCTL_OID(parent, OID_AUTO, name, \
CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, \
&_FAIL_POINT_NAME(name), 0, fail_point_sysctl, \
"A", ""); \
\
if (__predict_false( \
fail_point_eval(&_FAIL_POINT_NAME(name), &RETURN_VALUE))) { \
\
code; \
} FAIL_POINT_END
\
} \
} while (0)
/**
* @}
* (end group failpoint)
*/
/**
* Internal macro to implement above #defines -- should not be used directly.
* @ingroup failpoint_private
*/
#define KFAIL_POINT_START(parent, name) \
do { \
int RETURN_VALUE; \
static struct fail_point _FAIL_POINT_NAME(name) = { \
#name, \
_FAIL_POINT_LOCATION(), \
TAILQ_HEAD_INITIALIZER( \
_FAIL_POINT_NAME(name).fp_entries), \
0, \
NULL, NULL, \
}; \
SYSCTL_OID(parent, OID_AUTO, name, \
CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, \
&_FAIL_POINT_NAME(name), 0, fail_point_sysctl, \
"A", ""); \
\
if (__predict_false( \
fail_point_eval(&_FAIL_POINT_NAME(name), \
&RETURN_VALUE))) {
/**
* Internal macro to implement above #defines -- should not be used directly.
* @ingroup failpoint_private
*/
#define FAIL_POINT_END \
} \
} while (0)
#ifdef _KERNEL
int fail_point_sysctl(SYSCTL_HANDLER_ARGS);