/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "process.h"
#include "timeval.h"
#include "util.h"
-
-#undef NDEBUG
-#include <assert.h>
+#include "vlog.h"
struct test {
const char *name;
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);
}
{
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);
}
{
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);
}
{
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);
}
* 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);
}
}
{
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);
}
}
{
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);
}
}
{
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();
{
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();
{
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);
TEST(lock_timeout_runs_out),
TEST(lock_multiple),
TEST(help),
- { 0, 0 }
+ { NULL, NULL }
#undef TEST
};
int
main(int argc, char *argv[])
{
+ extern struct vlog_module VLM_lockfile;
size_t i;
set_program_name(argv[0]);
- time_init();
+ vlog_set_levels(&VLM_lockfile, VLF_ANY_FACILITY, VLL_ERR);
if (argc != 2) {
ovs_fatal(0, "exactly one argument required; use \"%s help\" for help",