Author: mav
Date: Thu Dec 19 01:28:05 2019
New Revision: 355892
URL: https://svnweb.freebsd.org/changeset/base/355892
Log:
MFC r355412, r355420: Wrap g_trace() into a macro to avoid unneeded calls.
In most cases with debug disabled this function does nothing, but argument
passing and the call still cost measurable time due to cache misses, etc.
While there, define G_F_FOOTSHOOTING instead of numeric constants.
Modified:
stable/12/sys/geom/geom.h
stable/12/sys/geom/geom_dump.c
stable/12/sys/geom/geom_int.h
stable/12/sys/geom/geom_subr.c
stable/12/sys/geom/mirror/g_mirror_ctl.c
stable/12/sys/geom/part/g_part.c
stable/12/sys/geom/part/g_part_mbr.c
stable/12/sys/geom/part/g_part_vtoc8.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/geom/geom.h
==============================================================================
--- stable/12/sys/geom/geom.h Thu Dec 19 01:25:44 2019 (r355891)
+++ stable/12/sys/geom/geom.h Thu Dec 19 01:28:05 2019 (r355892)
@@ -255,11 +255,18 @@ void g_dev_physpath_changed(void);
struct g_provider *g_dev_getprovider(struct cdev *dev);
/* geom_dump.c */
-void g_trace(int level, const char *, ...);
-# define G_T_TOPOLOGY 1
-# define G_T_BIO 2
-# define G_T_ACCESS 4
-
+void (g_trace)(int level, const char *, ...) __printflike(2, 3);
+#define G_T_TOPOLOGY 0x01
+#define G_T_BIO 0x02
+#define G_T_ACCESS 0x04
+extern int g_debugflags;
+#define G_F_FOOTSHOOTING 0x10
+#define G_F_DISKIOCTL 0x40
+#define G_F_CTLDUMP 0x80
+#define g_trace(level, fmt, ...) do { \
+ if (__predict_false(g_debugflags & (level))) \
+ (g_trace)(level, fmt, ## __VA_ARGS__); \
+} while (0)
/* geom_event.c */
typedef void g_event_t(void *, int flag);
Modified: stable/12/sys/geom/geom_dump.c
==============================================================================
--- stable/12/sys/geom/geom_dump.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/geom_dump.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -319,7 +319,7 @@ g_confxml(void *p, int flag)
}
void
-g_trace(int level, const char *fmt, ...)
+(g_trace)(int level, const char *fmt, ...)
{
va_list ap;
Modified: stable/12/sys/geom/geom_int.h
==============================================================================
--- stable/12/sys/geom/geom_int.h Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/geom_int.h Thu Dec 19 01:28:05 2019
(r355892)
@@ -44,18 +44,6 @@ extern int g_collectstats;
#define G_STATS_PROVIDERS 1 /* Collect I/O stats for providers */
#define G_STATS_CONSUMERS 2 /* Collect I/O stats for consumers */
-extern int g_debugflags;
-/*
- * 1 G_T_TOPOLOGY
- * 2 G_T_BIO
- * 4 G_T_ACCESS
- * 8 (unused)
- * 16 Allow footshooting on rank#1 providers
- * 32 G_T_DETAILS
- */
-#define G_F_DISKIOCTL 64
-#define G_F_CTLDUMP 128
-
/* geom_dump.c */
void g_confxml(void *, int flag);
void g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp,
struct g_provider *pp, struct g_consumer *cp);
Modified: stable/12/sys/geom/geom_subr.c
==============================================================================
--- stable/12/sys/geom/geom_subr.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/geom_subr.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -944,7 +944,7 @@ g_access(struct g_consumer *cp, int dcr, int dcw, int
pp, pp->name);
/* If foot-shooting is enabled, any open on rank#1 is OK */
- if ((g_debugflags & 16) && gp->rank == 1)
+ if ((g_debugflags & G_F_FOOTSHOOTING) && gp->rank == 1)
;
/* If we try exclusive but already write: fail */
else if (dce > 0 && pw > 0)
Modified: stable/12/sys/geom/mirror/g_mirror_ctl.c
==============================================================================
--- stable/12/sys/geom/mirror/g_mirror_ctl.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/mirror/g_mirror_ctl.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -852,7 +852,7 @@ g_mirror_ctl_resize(struct gctl_req *req, struct g_cla
return;
}
/* Deny shrinking of an opened provider */
- if ((g_debugflags & 16) == 0 && sc->sc_provider_open > 0) {
+ if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && sc->sc_provider_open > 0)
{
if (sc->sc_mediasize > mediasize) {
gctl_error(req, "Device %s is busy.",
sc->sc_provider->name);
Modified: stable/12/sys/geom/part/g_part.c
==============================================================================
--- stable/12/sys/geom/part/g_part.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/part/g_part.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -1383,7 +1383,7 @@ g_part_ctl_resize(struct gctl_req *req, struct g_part_
}
pp = entry->gpe_pp;
- if ((g_debugflags & 16) == 0 &&
+ if ((g_debugflags & G_F_FOOTSHOOTING) == 0 &&
(pp->acr > 0 || pp->acw > 0 || pp->ace > 0)) {
if (entry->gpe_end - entry->gpe_start + 1 > gpp->gpp_size) {
/* Deny shrinking of an opened partition. */
Modified: stable/12/sys/geom/part/g_part_mbr.c
==============================================================================
--- stable/12/sys/geom/part/g_part_mbr.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/part/g_part_mbr.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -381,7 +381,7 @@ g_part_mbr_resize(struct g_part_table *basetable,
return (EINVAL);
/* XXX: prevent unexpected shrinking. */
pp = baseentry->gpe_pp;
- if ((g_debugflags & 0x10) == 0 && size < gpp->gpp_size &&
+ if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && size < gpp->gpp_size &&
pp->mediasize / pp->sectorsize > size)
return (EBUSY);
entry = (struct g_part_mbr_entry *)baseentry;
Modified: stable/12/sys/geom/part/g_part_vtoc8.c
==============================================================================
--- stable/12/sys/geom/part/g_part_vtoc8.c Thu Dec 19 01:25:44 2019
(r355891)
+++ stable/12/sys/geom/part/g_part_vtoc8.c Thu Dec 19 01:28:05 2019
(r355892)
@@ -373,7 +373,7 @@ g_part_vtoc8_resize(struct g_part_table *basetable,
return (EINVAL);
/* XXX: prevent unexpected shrinking. */
pp = entry->gpe_pp;
- if ((g_debugflags & 0x10) == 0 && size < gpp->gpp_size &&
+ if ((g_debugflags & G_F_FOOTSHOOTING) == 0 && size < gpp->gpp_size &&
pp->mediasize / pp->sectorsize > size)
return (EBUSY);
entry->gpe_end = entry->gpe_start + size - 1;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
