Module Name: src
Committed By: pooka
Date: Wed Apr 8 12:08:17 UTC 2009
Added Files:
src/tests/fs/ffs: Atffile Makefile t_renamerace.c
Log Message:
regression test for kern/40948
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/fs/ffs/Atffile src/tests/fs/ffs/Makefile \
src/tests/fs/ffs/t_renamerace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/fs/ffs/Atffile
diff -u /dev/null src/tests/fs/ffs/Atffile:1.1
--- /dev/null Wed Apr 8 12:08:17 2009
+++ src/tests/fs/ffs/Atffile Wed Apr 8 12:08:17 2009
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/04/08 12:08:17 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp: t_renamerace
Index: src/tests/fs/ffs/Makefile
diff -u /dev/null src/tests/fs/ffs/Makefile:1.1
--- /dev/null Wed Apr 8 12:08:17 2009
+++ src/tests/fs/ffs/Makefile Wed Apr 8 12:08:17 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/04/08 12:08:17 pooka Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/fs/ffs
+
+TESTS_C= t_renamerace
+
+LDADD.t_renamerace+= -lukfs -lrumpfs_ffs -lrumpfs_ufs -lrumpvfs -lrump
+LDADD.t_renamerace+= -lrumpuser -lpthread
+
+.include <bsd.test.mk>
Index: src/tests/fs/ffs/t_renamerace.c
diff -u /dev/null src/tests/fs/ffs/t_renamerace.c:1.1
--- /dev/null Wed Apr 8 12:08:17 2009
+++ src/tests/fs/ffs/t_renamerace.c Wed Apr 8 12:08:17 2009
@@ -0,0 +1,130 @@
+/* $NetBSD: t_renamerace.c,v 1.1 2009/04/08 12:08:17 pooka Exp $ */
+
+/*
+ * Modified for rump and atf from a program supplied
+ * by Nicolas Joly in kern/40948
+ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+#include <rump/ukfs.h>
+
+#include <ufs/ufs/ufsmount.h>
+
+ATF_TC_WITH_CLEANUP(renamerace);
+ATF_TC_HEAD(renamerace, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "rename(2) race against files "
+ "unlinked mid-operation, kern/40948");
+}
+
+int quit;
+
+static void *
+w1(void *arg)
+{
+ int fd;
+
+ while (!quit) {
+ fd = rump_sys_open("/rename.test1",
+ O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ rump_sys_unlink("/rename.test1");
+ rump_sys_close(fd);
+ }
+ return NULL;
+}
+
+static void *
+w2(void *arg)
+{
+
+ while (!quit)
+ rump_sys_rename("/rename.test1", "/rename.test2");
+
+ return NULL;
+}
+
+/* XXX: how to do cleanup if we use mkdtemp? */
+#define IMAGENAME "/tmp/ffsatf.img"
+static char image[MAXPATHLEN];
+
+ATF_TC_BODY(renamerace, tc)
+{
+ struct ufs_args args;
+ char cmd[256];
+ struct ukfs *fs;
+ pthread_t pt1, pt2;
+
+#if 0
+ strcpy(image, TMPPATH);
+ if (mkdtemp(image) == NULL)
+ atf_tc_fail("can't create tmpdir %s: %d (%s)",
+ TMPPATH, errno, strerror(errno));
+ strcat(image, "/ffsatf.img");
+#else
+ strcpy(image, IMAGENAME);
+#endif
+
+ strcpy(cmd, "newfs -F -s 10000 ");
+ strcat(cmd, image);
+
+ if (system(cmd) == -1)
+ atf_tc_fail("newfs failed: %d (%s)", errno, strerror(errno));
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = image;
+
+ ukfs_init();
+ fs = ukfs_mount(MOUNT_FFS, "ffs", UKFS_DEFAULTMP,
+ 0, &args, sizeof(args));
+ if (fs == NULL)
+ atf_tc_fail("ukfs_mount failed: %d (%s)",
+ errno, strerror(errno));
+
+ pthread_create(&pt1, NULL, w1, fs);
+ pthread_create(&pt2, NULL, w2, fs);
+
+ sleep(10);
+
+ quit = 1;
+ pthread_join(pt1, NULL);
+ pthread_join(pt2, NULL);
+
+ ukfs_release(fs, 0);
+}
+
+ATF_TC_CLEANUP(renamerace, tc)
+{
+#if 0
+ char *img;
+
+ img = strrchr(image, '/');
+ if (!img)
+ return;
+
+ printf("removing %s\n", img+1);
+ unlink(img+1);
+ *img = '\0';
+ rmdir(img);
+#else
+ unlink(IMAGENAME);
+#endif
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, renamerace);
+ return 0; /* ??? */
+}
