#define _XOPEN_SOURCE 500
#include <unistd.h>
+#include "lock-tracking.h"
static ssize_t pwrite_check(int fd, const void *buf, size_t count, off_t offset);
static ssize_t write_check(int fd, const void *buf, size_t count);
-static int fcntl_check(int fd, int cmd, ... /* arg */ );
static int ftruncate_check(int fd, off_t length);
#define pwrite pwrite_check
#define write write_check
-#define fcntl fcntl_check
+#define fcntl fcntl_with_lockcheck
#define ftruncate ftruncate_check
#include <ccan/tdb/tdb.h>
static bool suppress_logging;
static int target, current;
static jmp_buf jmpbuf;
-#define TEST_DBNAME "/tmp/test7.tdb"
-
-/* We save the locks so we can reaquire them. */
-struct lock {
- struct lock *next;
- off_t off;
- unsigned int len;
- int type;
-};
-static struct lock *locks;
+#define TEST_DBNAME "run-die-during-transaction.tdb"
static void taplog(struct tdb_context *tdb,
enum tdb_debug_level level,
diag("%s", line);
}
-static void check_file_contents(int fd)
+static void maybe_die(int fd)
{
- if (current++ == target) {
+ if (in_transaction && current++ == target) {
longjmp(jmpbuf, 1);
}
}
{
ssize_t ret;
- if (in_transaction)
- check_file_contents(fd);
+ maybe_die(fd);
ret = pwrite(fd, buf, count, offset);
if (ret != count)
return ret;
- if (in_transaction)
- check_file_contents(fd);
+ maybe_die(fd);
return ret;
}
{
ssize_t ret;
- if (in_transaction)
- check_file_contents(fd);
+ maybe_die(fd);
ret = write(fd, buf, count);
if (ret != count)
return ret;
- if (in_transaction)
- check_file_contents(fd);
- return ret;
-}
-
-extern int fcntl(int fd, int cmd, ... /* arg */ );
-
-static int fcntl_check(int fd, int cmd, ... /* arg */ )
-{
- va_list ap;
- int ret, arg3;
- struct flock *fl;
-
- if (cmd != F_SETLK && cmd != F_SETLKW) {
- /* This may be totally bogus, but we don't know in general. */
- va_start(ap, cmd);
- arg3 = va_arg(ap, int);
- va_end(ap);
-
- return fcntl(fd, cmd, arg3);
- }
-
- va_start(ap, cmd);
- fl = va_arg(ap, struct flock *);
- va_end(ap);
-
- ret = fcntl(fd, cmd, fl);
- if (ret == 0) {
- if (fl->l_type == F_UNLCK) {
- struct lock **l;
- struct lock *old = NULL;
-
- for (l = &locks; *l; l = &(*l)->next) {
- if ((*l)->off == fl->l_start
- && (*l)->len == fl->l_len) {
- old = *l;
- *l = (*l)->next;
- free(old);
- break;
- }
- }
- if (!old)
- errx(1, "Unknown lock");
- } else {
- struct lock *new = malloc(sizeof *new);
- new->off = fl->l_start;
- new->len = fl->l_len;
- new->type = fl->l_type;
- new->next = locks;
- locks = new;
- }
- }
-
- if (in_transaction && fl->l_type == F_UNLCK)
- check_file_contents(fd);
+ maybe_die(fd);
return ret;
}
{
int ret;
- if (in_transaction)
- check_file_contents(fd);
+ maybe_die(fd);
ret = ftruncate(fd, length);
- if (in_transaction)
- check_file_contents(fd);
+ maybe_die(fd);
return ret;
}
static bool test_death(enum operation op, struct agent *agent)
{
- struct tdb_context *tdb;
+ struct tdb_context *tdb = NULL;
TDB_DATA key, data;
struct tdb_logging_context logctx = { taplog, NULL };
int needed_recovery = 0;
if (setjmp(jmpbuf) != 0) {
/* We're partway through. Simulate our death. */
close(tdb->fd);
+ forget_locking();
in_transaction = false;
if (external_agent_operation(agent, NEEDS_RECOVERY_KEEP_OPENED,
if (external_agent_operation(agent, CHECK_KEEP_OPENED, "")
!= 1) {
diag("Step %u check failed", current);
+#if 0
return false;
+#endif
}
external_agent_operation(agent, CLOSE, "");
/* Suppress logging as this tries to use closed fd. */
suppress_logging = true;
+ suppress_lockcheck = true;
tdb_close(tdb);
suppress_logging = false;
+ suppress_lockcheck = false;
target++;
current = 0;
goto reset;
external_agent_operation(agent, CLOSE, "");
ok1(needed_recovery);
+ ok1(locking_errors == 0);
+ ok1(forget_locking() == 0);
+ locking_errors = 0;
return true;
}
struct agent *agent;
int i;
- plan_tests(6);
+ plan_tests(12);
+ unlock_callback = maybe_die;
+
agent = prepare_external_agent();
if (!agent)
err(1, "preparing agent");