X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-lockfile.c;h=808ed1e351ddd06da5c5dcff2bfe0d8e77d48560;hb=fee0c9631470e8eb10df25544f6661d0beb43a7a;hp=0feb27057d294d39829aee81124fb8e2b7683fc0;hpb=480ce8abca4ae262a4148fe757aebe3e0ddba6f6;p=openvswitch diff --git a/tests/test-lockfile.c b/tests/test-lockfile.c index 0feb2705..808ed1e3 100644 --- a/tests/test-lockfile.c +++ b/tests/test-lockfile.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 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,6 +20,7 @@ #include #include +#include #include #include @@ -28,9 +29,6 @@ #include "util.h" #include "vlog.h" -#undef NDEBUG -#include - struct test { const char *name; void (*function)(void); @@ -38,12 +36,25 @@ struct test { static const struct test tests[]; +#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", 0, &lockfile), 0); lockfile_unlock(lockfile); } @@ -52,10 +63,10 @@ run_lock_and_unlock_twice(void) { struct lockfile *lockfile; - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); lockfile_unlock(lockfile); - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); lockfile_unlock(lockfile); } @@ -64,8 +75,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", 0, &lockfile), 0); + CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK); lockfile_unlock(lockfile); } @@ -74,9 +85,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", 0, &lockfile), 0); + CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK); + CHECK(lockfile_lock("file", 0, &lockfile), EDEADLK); lockfile_unlock(lockfile); } @@ -107,10 +118,10 @@ run_lock_blocks_other_process(void) * this function that does the wait() call. */ static struct lockfile *lockfile; - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); if (do_fork() == CHILD) { lockfile_unlock(lockfile); - assert(lockfile_lock("file", 0, &lockfile) == EAGAIN); + CHECK(lockfile_lock("file", 0, &lockfile), EAGAIN); exit(11); } } @@ -120,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", 0, &lockfile), 0); + CHECK(lockfile_lock("file", 0, &dummy), EDEADLK); if (do_fork() == CHILD) { - assert(lockfile_lock("file", 0, &dummy) == EAGAIN); + CHECK(lockfile_lock("file", 0, &dummy), EAGAIN); exit(11); } } @@ -133,11 +144,11 @@ run_lock_and_unlock_allows_other_process(void) { struct lockfile *lockfile; - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); lockfile_unlock(lockfile); if (do_fork() == CHILD) { - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); exit(11); } } @@ -147,12 +158,11 @@ run_lock_timeout_gets_the_lock(void) { struct lockfile *lockfile; - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); if (do_fork() == CHILD) { lockfile_unlock(lockfile); - assert(lockfile_lock("file", TIME_UPDATE_INTERVAL * 3, - &lockfile) == 0); + CHECK(lockfile_lock("file", TIME_UPDATE_INTERVAL * 3, &lockfile), 0); exit(11); } else { long long int now = time_msec(); @@ -168,12 +178,12 @@ run_lock_timeout_runs_out(void) { struct lockfile *lockfile; - assert(lockfile_lock("file", 0, &lockfile) == 0); + CHECK(lockfile_lock("file", 0, &lockfile), 0); if (do_fork() == CHILD) { lockfile_unlock(lockfile); - assert(lockfile_lock("file", TIME_UPDATE_INTERVAL, - &lockfile) == ETIMEDOUT); + CHECK(lockfile_lock("file", TIME_UPDATE_INTERVAL, &lockfile), + ETIMEDOUT); exit(11); } else { long long int now = time_msec(); @@ -189,22 +199,56 @@ run_lock_multiple(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); + CHECK(lockfile_lock("a", 0, &a), 0); + CHECK(lockfile_lock("b", 0, &b), 0); + CHECK(lockfile_lock("c", 0, &c), 0); lockfile_unlock(a); - assert(lockfile_lock("a", 0, &a) == 0); - assert(lockfile_lock("a", 0, &dummy) == EDEADLK); + CHECK(lockfile_lock("a", 0, &a), 0); + CHECK(lockfile_lock("a", 0, &dummy), EDEADLK); lockfile_unlock(a); lockfile_unlock(b); - assert(lockfile_lock("a", 0, &a) == 0); + CHECK(lockfile_lock("a", 0, &a), 0); lockfile_unlock(c); lockfile_unlock(a); } +/* Checks that locking a dangling symlink works OK. (It used to hang.) */ +static void +run_lock_symlink(void) +{ + 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", 0, &a), 0); + CHECK(lockfile_lock("a", 0, &dummy), EDEADLK); + CHECK(lockfile_lock("b", 0, &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); + lockfile_unlock(b); + + 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); +} + static void run_help(void) { @@ -230,8 +274,9 @@ static const struct test tests[] = { TEST(lock_timeout_gets_the_lock), TEST(lock_timeout_runs_out), TEST(lock_multiple), + TEST(lock_symlink), TEST(help), - { 0, 0 } + { NULL, NULL } #undef TEST };