Module Name: src
Committed By: kamil
Date: Sun May 26 01:44:34 UTC 2019
Modified Files:
src/share/man/man4: kcov.4
src/sys/sys: kcov.h
src/tests/modules: t_kcov.c
Log Message:
Drop no longer needed macros KCOV_STORE() KCOV_LOAD() in kcov(4)
Corrently KCOV_STORE() and KCOV_LOAD() are equivalent to x=y.
Obtained from <R3x>
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/kcov.4
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/kcov.h
cvs rdiff -u -r1.9 -r1.10 src/tests/modules/t_kcov.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/kcov.4
diff -u src/share/man/man4/kcov.4:1.4 src/share/man/man4/kcov.4:1.5
--- src/share/man/man4/kcov.4:1.4 Sun Mar 10 17:51:00 2019
+++ src/share/man/man4/kcov.4 Sun May 26 01:44:34 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: kcov.4,v 1.4 2019/03/10 17:51:00 kamil Exp $
+.\" $NetBSD: kcov.4,v 1.5 2019/05/26 01:44:34 kamil Exp $
.\"
.\" Copyright (c) 2018 Anton Lindqvist <[email protected]>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd March 10, 2019
+.Dd May 26, 2019
.Dt KCOV 4
.Os
.Sh NAME
@@ -171,12 +171,12 @@ main(void)
mode = KCOV_MODE_TRACE_PC;
if (ioctl(fd, KCOV_IOC_ENABLE, &mode) == -1)
err(1, "ioctl: KCOV_IOC_ENABLE");
- KCOV_STORE(cover[0], 0);
+ cover[0] = 0;
read(-1, NULL, 0); /* syscall paths to be traced */
- n = KCOV_LOAD(cover[0]);
+ n = cover[0];
if (ioctl(fd, KCOV_IOC_DISABLE) == -1)
err(1, "ioctl: KCOV_IOC_DISABLE");
- for (i = 0; i < cover[0]; i++)
+ for (i = 0; i < n; i++)
printf("%p\en", (void *)cover[i + 1]);
if (munmap(cover, size * KCOV_ENTRY_SIZE) == -1)
err(1, "munmap");
Index: src/sys/sys/kcov.h
diff -u src/sys/sys/kcov.h:1.5 src/sys/sys/kcov.h:1.6
--- src/sys/sys/kcov.h:1.5 Thu Apr 11 11:20:46 2019
+++ src/sys/sys/kcov.h Sun May 26 01:44:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kcov.h,v 1.5 2019/04/11 11:20:46 kamil Exp $ */
+/* $NetBSD: kcov.h,v 1.6 2019/05/26 01:44:34 kamil Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -47,7 +47,4 @@
typedef volatile uint64_t kcov_int_t;
#define KCOV_ENTRY_SIZE sizeof(kcov_int_t)
-#define KCOV_STORE(x,v) (x) = (v)
-#define KCOV_LOAD(x) (x)
-
#endif /* !_SYS_KCOV_H_ */
Index: src/tests/modules/t_kcov.c
diff -u src/tests/modules/t_kcov.c:1.9 src/tests/modules/t_kcov.c:1.10
--- src/tests/modules/t_kcov.c:1.9 Thu Apr 4 10:53:20 2019
+++ src/tests/modules/t_kcov.c Sun May 26 01:44:34 2019
@@ -339,10 +339,10 @@ kcov_basic(bool fd_dup, int mode)
ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_ENABLE, &mode) == 0,
"Unable to enable kcov ");
- KCOV_STORE(buf[0], 0);
+ buf[0] = 0;
sleep(0); /* XXX: Is it enough for all trace types? */
- ATF_REQUIRE_MSG(KCOV_LOAD(buf[0]) != 0, "No records found");
+ ATF_REQUIRE_MSG(buf[0] != 0, "No records found");
ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_DISABLE) == 0,
"Unable to disable kcov");
@@ -409,7 +409,7 @@ thread_buffer_access_test_helper(void *p
kcov_int_t *buf = ptr;
/* Test mapped buffer access from a custom thread */
- KCOV_STORE(buf[0], KCOV_LOAD(buf[0]));
+ buf[0] = buf[0];
return NULL;
}
@@ -470,10 +470,10 @@ ATF_TC_BODY(kcov_thread, tc)
/* The thread does something, does not matter what exactly. */
pthread_create(&thread, NULL, thread_test_helper, __UNVOLATILE(buf));
- KCOV_STORE(buf[0], 0);
+ buf[0] = 0;
for (i = 0; i < 10000; i++)
continue;
- ATF_REQUIRE_EQ_MSG(KCOV_LOAD(buf[0]), 0,
+ ATF_REQUIRE_EQ_MSG(buf[0], 0,
"Records changed in blocked thread");
pthread_join(thread, NULL);
@@ -496,10 +496,10 @@ multiple_threads_helper(void *ptr __unus
ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_ENABLE, &mode) == 0,
"Unable to enable kcov ");
- KCOV_STORE(buf[0], 0);
+ buf[0] = 0;
sleep(0);
- ATF_REQUIRE_MSG(KCOV_LOAD(buf[0]) != 0, "No records found");
+ ATF_REQUIRE_MSG(buf[0] != 0, "No records found");
ATF_REQUIRE_MSG(ioctl(fd, KCOV_IOC_DISABLE) == 0,
"Unable to disable kcov");
