X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-lockfile.c;h=0bf3fe6dd1529ba7729059470a676fc5fbef5c2f;hb=84f7a5273bc627df61c9d71f4ce9f1f058c18545;hp=31e13a72c42d7006543dbb1d1b0cc3a9e8d7b3fc;hpb=58fda1dab104041fc693032475ec4662c1a52849;p=sliver-openvswitch.git

diff --git a/tests/test-lockfile.c b/tests/test-lockfile.c
index 31e13a72c..0bf3fe6dd 100644
--- a/tests/test-lockfile.c
+++ b/tests/test-lockfile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,29 +20,42 @@
 
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "process.h"
 #include "timeval.h"
 #include "util.h"
-
-#undef NDEBUG
-#include <assert.h>
+#include "vlog.h"
+#include "ovstest.h"
 
 struct test {
     const char *name;
     void (*function)(void);
 };
 
-static const struct test tests[];
+static void run_help(void);
+
+#define CHECK(A, B) check(A, B, #A, #B, __FILE__, __LINE__)
+static void
+check(int a, int b,
+      const char *a_string, const char *b_string, const char *file, int line)
+{
+    if (a != b) {
+        fprintf(stderr, "%s:%d: expected %s == %s but %d != %d\n",
+                file, line, a_string, b_string, a, b);
+        fflush(stderr);
+        abort();
+    }
+}
 
 static void
 run_lock_and_unlock(void)
 {
     struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 }
 
@@ -51,10 +64,10 @@ run_lock_and_unlock_twice(void)
 {
     struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 }
 
@@ -63,8 +76,8 @@ run_lock_blocks_same_process(void)
 {
     struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
-    assert(lockfile_lock("file", 0, &lockfile) == EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), 0);
+    CHECK(lockfile_lock("file", &lockfile), EDEADLK);
     lockfile_unlock(lockfile);
 }
 
@@ -73,9 +86,9 @@ run_lock_blocks_same_process_twice(void)
 {
     struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
-    assert(lockfile_lock("file", 0, &lockfile) == EDEADLK);
-    assert(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);
 }
 
@@ -84,7 +97,6 @@ do_fork(void)
 {
     switch (fork()) {
     case 0:
-        time_postfork();
         lockfile_postfork();
         return CHILD;
 
@@ -100,11 +112,16 @@ do_fork(void)
 static void
 run_lock_blocks_other_process(void)
 {
-    struct lockfile *lockfile;
+    /* Making this static prevents a memory leak warning from valgrind for the
+     * parent process, which cannot easily unlock (and free) 'lockfile' because
+     * it can only do so after the child has exited, and it's the caller of
+     * this function that does the wait() call. */
+    static struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     if (do_fork() == CHILD) {
-        assert(lockfile_lock("file", 0, &lockfile) == EAGAIN);
+        lockfile_unlock(lockfile);
+        CHECK(lockfile_lock("file", &lockfile), EAGAIN);
         exit(11);
     }
 }
@@ -114,10 +131,10 @@ run_lock_twice_blocks_other_process(void)
 {
     struct lockfile *lockfile, *dummy;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
-    assert(lockfile_lock("file", 0, &dummy) == EDEADLK);
+    CHECK(lockfile_lock("file", &lockfile), 0);
+    CHECK(lockfile_lock("file", &dummy), EDEADLK);
     if (do_fork() == CHILD) {
-        assert(lockfile_lock("file", 0, &dummy) == EAGAIN);
+        CHECK(lockfile_lock("file", &dummy), EAGAIN);
         exit(11);
     }
 }
@@ -127,87 +144,97 @@ run_lock_and_unlock_allows_other_process(void)
 {
     struct lockfile *lockfile;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("file", &lockfile), 0);
     lockfile_unlock(lockfile);
 
     if (do_fork() == CHILD) {
-        assert(lockfile_lock("file", 0, &lockfile) == 0);
+        CHECK(lockfile_lock("file", &lockfile), 0);
         exit(11);
     }
 }
 
 static void
-run_lock_timeout_gets_the_lock(void)
+run_lock_multiple(void)
 {
-    struct lockfile *lockfile;
+    struct lockfile *a, *b, *c, *dummy;
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lockfile_lock("b", &b), 0);
+    CHECK(lockfile_lock("c", &c), 0);
 
-    if (do_fork() == CHILD) {
-        assert(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;
+    lockfile_unlock(a);
+    CHECK(lockfile_lock("a", &a), 0);
+    CHECK(lockfile_lock("a", &dummy), EDEADLK);
+    lockfile_unlock(a);
 
-    assert(lockfile_lock("file", 0, &lockfile) == 0);
+    lockfile_unlock(b);
+    CHECK(lockfile_lock("a", &a), 0);
 
-    if (do_fork() == CHILD) {
-        assert(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);
-    }
+    lockfile_unlock(c);
+    lockfile_unlock(a);
 }
 
+/* Checks that locking a dangling symlink works OK.  (It used to hang.) */
 static void
-run_lock_multiple(void)
+run_lock_symlink(void)
 {
-    struct lockfile *a, *b, *c, *dummy;
-
-    assert(lockfile_lock("a", 0, &a) == 0);
-    assert(lockfile_lock("b", 0, &b) == 0);
-    assert(lockfile_lock("c", 0, &c) == 0);
-
-    lockfile_unlock(a);
-    assert(lockfile_lock("a", 0, &a) == 0);
-    assert(lockfile_lock("a", 0, &dummy) == EDEADLK);
+    struct lockfile *a, *b, *dummy;
+    struct stat s;
+
+    /* Create a symlink .a.~lock~ pointing to .b.~lock~. */
+    CHECK(symlink(".b.~lock~", ".a.~lock~"), 0);
+    CHECK(lstat(".a.~lock~", &s), 0);
+    CHECK(S_ISLNK(s.st_mode) != 0, 1);
+    CHECK(stat(".a.~lock~", &s), -1);
+    CHECK(errno, ENOENT);
+    CHECK(stat(".b.~lock~", &s), -1);
+    CHECK(errno, ENOENT);
+
+    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", &b), 0);
+    CHECK(lockfile_lock("b", &dummy), EDEADLK);
+    CHECK(lockfile_lock("a", &dummy), EDEADLK);
     lockfile_unlock(b);
-    assert(lockfile_lock("a", 0, &a) == 0);
 
-    lockfile_unlock(c);
-    lockfile_unlock(a);
+    CHECK(lstat(".a.~lock~", &s), 0);
+    CHECK(S_ISLNK(s.st_mode) != 0, 1);
+    CHECK(stat(".a.~lock~", &s), 0);
+    CHECK(S_ISREG(s.st_mode) != 0, 1);
+    CHECK(stat(".b.~lock~", &s), 0);
+    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_help(void)
+run_lock_symlink_to_dir(void)
 {
-    size_t i;
+    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);
 
-    printf("usage: %s TESTNAME\n"
-           "where TESTNAME is one of the following:\n",
-           program_name);
-    for (i = 0; tests[i].name; i++) {
-        fprintf(stderr, "\t%s\n", tests[i].name);
-    }
+    lockfile_unlock(a);
 }
 
 static const struct test tests[] = {
@@ -219,26 +246,39 @@ 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),
-    { 0, 0 }
+    { NULL, NULL }
 #undef TEST
 };
 
-int
-main(int argc, char *argv[])
+static void
+run_help(void)
+{
+    size_t i;
+
+    printf("usage: %s TESTNAME\n"
+           "where TESTNAME is one of the following:\n",
+           program_name);
+    for (i = 0; tests[i].name; i++) {
+        fprintf(stderr, "\t%s\n", tests[i].name);
+    }
+}
+
+static void
+test_lockfile_main(int argc, char *argv[])
 {
     size_t i;
 
     set_program_name(argv[0]);
-    time_init();
+    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",
                   program_name);
-        return 1;
     }
 
     for (i = 0; tests[i].name; i++) {
@@ -270,3 +310,4 @@ main(int argc, char *argv[])
               argv[1], program_name);
 }
 
+OVSTEST_REGISTER("test-lockfile", test_lockfile_main);