-/* Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+/* Copyright (c) 2009, 2010, 2011, 2012, 2013 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 "log.h"
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include "socket-util.h"
#include "transaction.h"
#include "util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(ovsdb_log);
enum ovsdb_log_mode {
OVSDB_LOG_READ,
struct lockfile *lockfile;
FILE *stream;
struct ovsdb_error *read_error;
- struct ovsdb_error *write_error;
+ bool write_error;
enum ovsdb_log_mode mode;
};
*filep = NULL;
- assert(locking == -1 || locking == false || locking == true);
+ ovs_assert(locking == -1 || locking == false || locking == true);
if (locking < 0) {
locking = open_mode != OVSDB_LOG_READ_ONLY;
}
} else if (open_mode == OVSDB_LOG_READ_WRITE) {
flags = O_RDWR;
} else if (open_mode == OVSDB_LOG_CREATE) {
+#ifndef _WIN32
if (stat(name, &s) == -1 && errno == ENOENT
&& lstat(name, &s) == 0 && S_ISLNK(s.st_mode)) {
/* 'name' is a dangling symlink. We want to create the file that
} else {
flags = O_RDWR | O_CREAT | O_EXCL;
}
+#else
+ flags = O_RDWR | O_CREAT | O_EXCL;
+#endif
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
fd = open(name, flags, 0666);
if (fd < 0) {
file->prev_offset = 0;
file->offset = 0;
file->read_error = NULL;
- file->write_error = NULL;
+ file->write_error = false;
file->mode = OVSDB_LOG_READ;
*filep = file;
return NULL;
fclose(file->stream);
lockfile_unlock(file->lockfile);
ovsdb_error_destroy(file->read_error);
- ovsdb_error_destroy(file->write_error);
free(file);
}
}
void
ovsdb_log_unread(struct ovsdb_log *file)
{
- assert(file->mode == OVSDB_LOG_READ);
+ ovs_assert(file->mode == OVSDB_LOG_READ);
file->offset = file->prev_offset;
}
json_string = NULL;
- if (file->write_error) {
- return ovsdb_error_clone(file->write_error);
- } else if (file->mode == OVSDB_LOG_READ) {
+ if (file->mode == OVSDB_LOG_READ || file->write_error) {
file->mode = OVSDB_LOG_WRITE;
+ file->write_error = false;
if (fseeko(file->stream, file->offset, SEEK_SET)) {
error = ovsdb_io_error(errno, "%s: cannot seek to offset %lld",
file->name, (long long int) file->offset);
/* Compose header. */
sha1_bytes(json_string, length, sha1);
- snprintf(header, sizeof header, "%s%zu "SHA1_FMT"\n",
+ snprintf(header, sizeof header, "%s%"PRIuSIZE" "SHA1_FMT"\n",
magic, length, SHA1_ARGS(sha1));
/* Write. */
return NULL;
error:
- file->write_error = ovsdb_error_clone(error);
+ file->write_error = true;
free(json_string);
return error;
}