X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-lockfile.c;h=99f68794c4bbdce2f1d11e592387f296438471df;hb=3b401f9baf4c0dd9e9eebb0a9f4417fdf3a80774;hp=808ed1e351ddd06da5c5dcff2bfe0d8e77d48560;hpb=77c513a44ab85264aed7c38387ef221ad30e461c;p=sliver-openvswitch.git

diff --git a/tests/test-lockfile.c b/tests/test-lockfile.c
index 808ed1e35..99f68794c 100644
--- a/tests/test-lockfile.c
+++ b/tests/test-lockfile.c
@@ -54,7 +54,7 @@ run_lock_and_unlock(void)
 {
     struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 }
 
@@ -63,10 +63,10 @@ run_lock_and_unlock_twice(void)
 {
     struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 }
 
@@ -75,8 +75,8 @@ run_lock_blocks_same_process(void)
 {
     struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
-    CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), EDEADLK);
     lockfile_unlock(lockfile);
 }
 
@@ -85,9 +85,9 @@ run_lock_blocks_same_process_twice(void)
 {
     struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
-    CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK);
-    CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), EDEADLK);
     lockfile_unlock(lockfile);
 }
 
@@ -96,7 +96,6 @@ do_fork(void)
 {
     switch (fork()) {
     case 0:
-        time_postfork();
         lockfile_postfork();
         return CHILD;
 
@@ -118,10 +117,10 @@ run_lock_blocks_other_process(void)
      * this function that does the wait() call. */
     static struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     if (do_fork() == CHILD) {
         lockfile_unlock(lockfile);
-        CHECK(lockfile_lock("file", 0, &lockfile), EAGAIN);
+        CHECK(lockfile_lock("file", &lockfile), EAGAIN);
         exit(11);
     }
 }
@@ -131,10 +130,10 @@ run_lock_twice_blocks_other_process(void)
 {
     struct lockfile *lockfile, *dummy;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
-    CHECK(lockfile_lock("file", 0, &dummy), EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), 0);
+    CHECK(lockfile_lock("file", &dummy), EDEADLK);
     if (do_fork() == CHILD) {
-        CHECK(lockfile_lock("file", 0, &dummy), EAGAIN);
+        CHECK(lockfile_lock("file", &dummy), EAGAIN);
         exit(11);
     }
 }
@@ -144,72 +143,31 @@ run_lock_and_unlock_allows_other_process(void)
 {
     struct lockfile *lockfile;
 
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 
     if (do_fork() == CHILD) {
-        CHECK(lockfile_lock("file", 0, &lockfile), 0);
+        CHECK(lockfile_lock("file", &lockfile), 0);
         exit(11);
     }
 }
 
-static void
-run_lock_timeout_gets_the_lock(void)
-{
-    struct lockfile *lockfile;
-
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
-
-    if (do_fork() == CHILD) {
-        lockfile_unlock(lockfile);
-        CHECK(lockfile_lock("file", TIME_UPDATE_INTERVAL * 3, &lockfile), 0);
-        exit(11);
-    } else {
-        long long int now = time_msec();
-        while (time_msec() < now + TIME_UPDATE_INTERVAL) {
-            pause();
-        }
-        lockfile_unlock(lockfile);
-    }
-}
-
-static void
-run_lock_timeout_runs_out(void)
-{
-    struct lockfile *lockfile;
-
-    CHECK(lockfile_lock("file", 0, &lockfile), 0);
-
-    if (do_fork() == CHILD) {
-        lockfile_unlock(lockfile);
-        CHECK(lockfile_lock("file", TIME_UPDATE_INTERVAL, &lockfile),
-              ETIMEDOUT);
-        exit(11);
-    } else {
-        long long int now = time_msec();
-        while (time_msec() < now + TIME_UPDATE_INTERVAL * 3) {
-            pause();
-        }
-        lockfile_unlock(lockfile);
-    }
-}
-
 static void
 run_lock_multiple(void)
 {
     struct lockfile *a, *b, *c, *dummy;
 
-    CHECK(lockfile_lock("a", 0, &a), 0);
-    CHECK(lockfile_lock("b", 0, &b), 0);
-    CHECK(lockfile_lock("c", 0, &c), 0);
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lockfile_lock("b", &b), 0);
+    CHECK(lockfile_lock("c", &c), 0);
 
     lockfile_unlock(a);
-    CHECK(lockfile_lock("a", 0, &a), 0);
-    CHECK(lockfile_lock("a", 0, &dummy), EDEADLK);
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lockfile_lock("a", &dummy), EDEADLK);
     lockfile_unlock(a);
 
     lockfile_unlock(b);
-    CHECK(lockfile_lock("a", 0, &a), 0);
+    CHECK(lockfile_lock("a", &a), 0);
 
     lockfile_unlock(c);
     lockfile_unlock(a);
@@ -231,14 +189,14 @@ run_lock_symlink(void)
     CHECK(stat(".b.~lock~", &s), -1);
     CHECK(errno, ENOENT);
 
-    CHECK(lockfile_lock("a", 0, &a), 0);
-    CHECK(lockfile_lock("a", 0, &dummy), EDEADLK);
-    CHECK(lockfile_lock("b", 0, &dummy), EDEADLK);
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lockfile_lock("a", &dummy), EDEADLK);
+    CHECK(lockfile_lock("b", &dummy), EDEADLK);
     lockfile_unlock(a);
 
-    CHECK(lockfile_lock("b", 0, &b), 0);
-    CHECK(lockfile_lock("b", 0, &dummy), EDEADLK);
-    CHECK(lockfile_lock("a", 0, &dummy), EDEADLK);
+    CHECK(lockfile_lock("b", &b), 0);
+    CHECK(lockfile_lock("b", &dummy), EDEADLK);
+    CHECK(lockfile_lock("a", &dummy), EDEADLK);
     lockfile_unlock(b);
 
     CHECK(lstat(".a.~lock~", &s), 0);
@@ -249,6 +207,35 @@ run_lock_symlink(void)
     CHECK(S_ISREG(s.st_mode) != 0, 1);
 }
 
+/* Checks that locking a file that is itself a symlink yields a lockfile in the
+ * directory that the symlink points to, named for the target of the
+ * symlink.
+ *
+ * (That is, if "a" is a symlink to "dir/b", then "a"'s lockfile is named
+ * "dir/.b.~lock".) */
+static void
+run_lock_symlink_to_dir(void)
+{
+    struct lockfile *a, *dummy;
+    struct stat s;
+
+    /* Create a symlink "a" pointing to "dir/b". */
+    CHECK(mkdir("dir", 0700), 0);
+    CHECK(symlink("dir/b", "a"), 0);
+    CHECK(lstat("a", &s), 0);
+    CHECK(S_ISLNK(s.st_mode) != 0, 1);
+
+    /* Lock 'a'. */
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lstat("dir/.b.~lock~", &s), 0);
+    CHECK(S_ISREG(s.st_mode) != 0, 1);
+    CHECK(lstat(".a.~lock~", &s), -1);
+    CHECK(errno, ENOENT);
+    CHECK(lockfile_lock("dir/b", &dummy), EDEADLK);
+
+    lockfile_unlock(a);
+}
+
 static void
 run_help(void)
 {
@@ -271,10 +258,9 @@ static const struct test tests[] = {
     TEST(lock_blocks_other_process),
     TEST(lock_twice_blocks_other_process),
     TEST(lock_and_unlock_allows_other_process),
-    TEST(lock_timeout_gets_the_lock),
-    TEST(lock_timeout_runs_out),
     TEST(lock_multiple),
     TEST(lock_symlink),
+    TEST(lock_symlink_to_dir),
     TEST(help),
     { NULL, NULL }
 #undef TEST
@@ -283,11 +269,11 @@ static const struct test tests[] = {
 int
 main(int argc, char *argv[])
 {
-    extern struct vlog_module VLM_lockfile;
     size_t i;
 
     set_program_name(argv[0]);
-    vlog_set_levels(&VLM_lockfile, VLF_ANY_FACILITY, VLL_ERR);
+    vlog_set_pattern(VLF_CONSOLE, "%c|%p|%m");
+    vlog_set_levels(NULL, VLF_SYSLOG, VLL_OFF);
 
     if (argc != 2) {
         ovs_fatal(0, "exactly one argument required; use \"%s help\" for help",