Author: mdf
Date: Fri Jul 8 20:41:07 2011
New Revision: 223875
URL: http://svn.freebsd.org/changeset/base/223875
Log:
style(9) and cleanup fixes.
MFC after: 1 week
Modified:
head/sys/kern/kern_fail.c
Modified: head/sys/kern/kern_fail.c
==============================================================================
--- head/sys/kern/kern_fail.c Fri Jul 8 17:45:38 2011 (r223874)
+++ head/sys/kern/kern_fail.c Fri Jul 8 20:41:07 2011 (r223875)
@@ -52,6 +52,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/ctype.h>
#include <sys/errno.h>
#include <sys/fail.h>
#include <sys/kernel.h>
@@ -88,16 +89,20 @@ enum fail_point_t {
FAIL_POINT_BREAK, /**< break into the debugger */
FAIL_POINT_PRINT, /**< print a message */
FAIL_POINT_SLEEP, /**< sleep for some msecs */
- FAIL_POINT_INVALID, /**< placeholder */
+ FAIL_POINT_NUMTYPES
};
-static const char *fail_type_strings[] = {
- "off",
- "panic",
- "return",
- "break",
- "print",
- "sleep",
+static struct {
+ const char *name;
+ int nmlen;
+} fail_type_strings[] = {
+#define FP_TYPE_NM_LEN(s) { s, sizeof(s) - 1 }
+ [FAIL_POINT_OFF] = FP_TYPE_NM_LEN("off"),
+ [FAIL_POINT_PANIC] = FP_TYPE_NM_LEN("panic"),
+ [FAIL_POINT_RETURN] = FP_TYPE_NM_LEN("return"),
+ [FAIL_POINT_BREAK] = FP_TYPE_NM_LEN("break"),
+ [FAIL_POINT_PRINT] = FP_TYPE_NM_LEN("print"),
+ [FAIL_POINT_SLEEP] = FP_TYPE_NM_LEN("sleep"),
};
/**
@@ -120,7 +125,7 @@ fail_point_sleep(struct fail_point *fp,
/* convert from millisecs to ticks, rounding up */
int timo = ((msecs * hz) + 999) / 1000;
- if (timo) {
+ if (timo > 0) {
if (fp->fp_sleep_fn == NULL) {
msleep(fp, &g_fp_mtx, PWAIT, "failpt", timo);
} else {
@@ -191,19 +196,13 @@ fail_point_init(struct fail_point *fp, c
void
fail_point_destroy(struct fail_point *fp)
{
- struct fail_point_entry *ent;
- if (fp->fp_flags & FAIL_POINT_DYNAMIC_NAME && fp->fp_name != NULL) {
- fp_free((void *)(intptr_t)fp->fp_name);
+ if ((fp->fp_flags & FAIL_POINT_DYNAMIC_NAME) != 0) {
+ fp_free(__DECONST(void *, fp->fp_name));
fp->fp_name = NULL;
}
fp->fp_flags = 0;
-
- while (!TAILQ_EMPTY(&fp->fp_entries)) {
- ent = TAILQ_FIRST(&fp->fp_entries);
- TAILQ_REMOVE(&fp->fp_entries, ent, fe_entries);
- fp_free(ent);
- }
+ clear_entries(&fp->fp_entries);
}
/**
@@ -222,16 +221,12 @@ fail_point_eval_nontrivial(struct fail_p
FP_LOCK();
- ent = TAILQ_FIRST(&fp->fp_entries);
- while (ent) {
+ TAILQ_FOREACH_SAFE(ent, &fp->fp_entries, fe_entries, next) {
int cont = 0; /* don't continue by default */
- next = TAILQ_NEXT(ent, fe_entries);
if (ent->fe_prob < PROB_MAX &&
- ent->fe_prob < random() % PROB_MAX) {
- cont = 1;
- goto loop_end;
- }
+ ent->fe_prob < random() % PROB_MAX)
+ continue;
switch (ent->fe_type) {
case FAIL_POINT_PANIC:
@@ -239,13 +234,14 @@ fail_point_eval_nontrivial(struct fail_p
/* NOTREACHED */
case FAIL_POINT_RETURN:
- if (return_value)
+ if (return_value != NULL)
*return_value = ent->fe_arg;
ret = FAIL_POINT_RC_RETURN;
break;
case FAIL_POINT_BREAK:
- printf("fail point %s breaking to debugger\n",
fp->fp_name);
+ printf("fail point %s breaking to debugger\n",
+ fp->fp_name);
breakpoint();
break;
@@ -273,13 +269,9 @@ fail_point_eval_nontrivial(struct fail_p
break;
}
- if (ent && ent->fe_count > 0 && --ent->fe_count == 0)
+ if (ent != NULL && ent->fe_count > 0 && --ent->fe_count == 0)
free_entry(&fp->fp_entries, ent);
-
-loop_end:
- if (cont)
- ent = next;
- else
+ if (cont == 0)
break;
}
@@ -290,7 +282,7 @@ loop_end:
FP_UNLOCK();
- return ret;
+ return (ret);
}
/**
@@ -320,7 +312,7 @@ fail_point_get(struct fail_point *fp, st
}
if (ent->fe_count > 0)
sbuf_printf(sb, "%d*", ent->fe_count);
- sbuf_printf(sb, "%s", fail_type_strings[ent->fe_type]);
+ sbuf_printf(sb, "%s", fail_type_strings[ent->fe_type].name);
if (ent->fe_arg)
sbuf_printf(sb, "(%d)", ent->fe_arg);
if (TAILQ_NEXT(ent, fe_entries))
@@ -380,7 +372,7 @@ fail_point_set(struct fail_point *fp, ch
fp->fp_name, fp->fp_location, buf);
#endif /* IWARNING */
- return error;
+ return (error);
}
#define MAX_FAIL_POINT_BUF 1023
@@ -422,9 +414,8 @@ fail_point_sysctl(SYSCTL_HANDLER_ARGS)
}
out:
- if (buf)
- fp_free(buf);
- return error;
+ fp_free(buf);
+ return (error);
}
/**
@@ -437,12 +428,17 @@ parse_fail_point(struct fail_point_entri
/* <fail_point> ::
* <term> ( "->" <term> )*
*/
- if (!(p = parse_term(ents, p)))
- return 0;
- while (*p)
- if (p[0] != '-' || p[1] != '>' || !(p = parse_term(ents, p+2)))
- return 0;
- return p;
+ p = parse_term(ents, p);
+ if (p == NULL)
+ return (NULL);
+ while (*p != '\0') {
+ if (p[0] != '-' || p[1] != '>')
+ return (NULL);
+ p = parse_term(ents, p + 2);
+ if (p == NULL)
+ return (NULL);
+ }
+ return (p);
}
/**
@@ -465,11 +461,12 @@ parse_term(struct fail_point_entries *en
*/
/* ( (<float> "%") | (<integer> "*" ) )* */
- while (('0' <= *p && *p <= '9') || *p == '.') {
+ while (isdigit(*p) || *p == '.') {
int units, decimal;
- if (!(p = parse_number(&units, &decimal, p)))
- return 0;
+ p = parse_number(&units, &decimal, p);
+ if (p == NULL)
+ return (NULL);
if (*p == '%') {
if (units > 100) /* prevent overflow early */
@@ -477,37 +474,33 @@ parse_term(struct fail_point_entries *en
ent->fe_prob = units * (PROB_MAX / 100) + decimal;
if (ent->fe_prob > PROB_MAX)
ent->fe_prob = PROB_MAX;
-
} else if (*p == '*') {
if (!units || decimal)
- return 0;
+ return (NULL);
ent->fe_count = units;
-
- } else {
- return 0;
- }
-
+ } else
+ return (NULL);
p++;
}
/* <type> */
- if (!(p = parse_type(ent, p)))
- return 0;
+ p = parse_type(ent, p);
+ if (p == NULL)
+ return (NULL);
if (*p == '\0')
- return p;
+ return (p);
/* [ "(" <integer> ")" ] */
if (*p != '(')
return p;
p++;
- if (('0' <= *p && *p <= '9') || *p == '-')
- ent->fe_arg = strtol(p, &p, 0);
- else
- return 0;
+ if (!isdigit(*p) && *p != '-')
+ return (NULL);
+ ent->fe_arg = strtol(p, &p, 0);
if (*p++ != ')')
- return 0;
+ return (NULL);
- return p;
+ return (p);
}
/**
@@ -528,14 +521,14 @@ parse_number(int *out_units, int *out_de
old_p = p;
*out_units = strtol(p, &p, 10);
if (p == old_p && *p != '.')
- return 0;
+ return (NULL);
/* fractional part */
*out_decimal = 0;
if (*p == '.') {
int digits = 0;
p++;
- while ('0' <= *p && *p <= '9') {
+ while (isdigit(*p)) {
int digit = *p - '0';
if (digits < PROB_DIGITS - 2)
*out_decimal = *out_decimal * 10 + digit;
@@ -545,12 +538,12 @@ parse_number(int *out_units, int *out_de
p++;
}
if (!digits) /* need at least one digit after '.' */
- return 0;
+ return (NULL);
while (digits++ < PROB_DIGITS - 2) /* add implicit zeros */
*out_decimal *= 10;
}
- return p; /* success */
+ return (p); /* success */
}
/**
@@ -560,21 +553,16 @@ static char *
parse_type(struct fail_point_entry *ent, char *beg)
{
enum fail_point_t type;
- char *end = beg;
- while ('a' <= *end && *end <= 'z')
- end++;
- if (beg == end)
- return 0;
- for (type = FAIL_POINT_OFF; type != FAIL_POINT_INVALID; type++) {
- const char *p = fail_type_strings[type];
- const char *q = beg;
- while (q < end && *p++ == *q++);
- if (q == end && *p == '\0') {
+ int len;
+
+ for (type = FAIL_POINT_OFF; type < FAIL_POINT_NUMTYPES; type++) {
+ len = fail_type_strings[type].nmlen;
+ if (strncmp(fail_type_strings[type].name, beg, len) == 0) {
ent->fe_type = type;
- return end;
+ return (beg + len);
}
}
- return 0;
+ return (NULL);
}
/**
@@ -595,6 +583,7 @@ static void
clear_entries(struct fail_point_entries *ents)
{
struct fail_point_entry *ent, *ent_next;
+
TAILQ_FOREACH_SAFE(ent, ents, fe_entries, ent_next)
fp_free(ent);
TAILQ_INIT(ents);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
