[ovs-dev] [PATCH 3/4] fatal-signal: New function fatal_signal_unlink_file_now().
Ben Pfaff
blp at nicira.com
Mon Sep 21 21:53:56 UTC 2009
This is a helper function that combines two actions that callers commonly
wanted. It will have an additional user in an upcoming commit.
---
lib/fatal-signal.c | 18 ++++++++++++++++++
lib/fatal-signal.h | 3 ++-
lib/unixctl.c | 6 ++----
lib/vlog-modules.def | 1 +
4 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index ff01136..d8862bb 100644
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -26,6 +26,9 @@
#include "shash.h"
#include "util.h"
+#define THIS_MODULE VLM_fatal_signal
+#include "vlog.h"
+
/* Signals to catch. */
static const int fatal_signals[] = { SIGTERM, SIGINT, SIGHUP, SIGALRM };
@@ -204,6 +207,21 @@ fatal_signal_remove_file_to_unlink(const char *file)
fatal_signal_unblock();
}
+/* Like fatal_signal_remove_file_to_unlink(), but also unlinks 'file'.
+ * Returns 0 if successful, otherwise a positive errno value. */
+int
+fatal_signal_unlink_file_now(const char *file)
+{
+ int error = unlink(file) ? errno : 0;
+ if (error) {
+ VLOG_WARN("could not unlink \"%s\" (%s)", file, strerror(error));
+ }
+
+ fatal_signal_remove_file_to_unlink(file);
+
+ return error;
+}
+
static void
unlink_files(void *aux UNUSED)
{
diff --git a/lib/fatal-signal.h b/lib/fatal-signal.h
index 0bce1e2..c96db86 100644
--- a/lib/fatal-signal.h
+++ b/lib/fatal-signal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ void fatal_signal_fork(void);
* exit(). */
void fatal_signal_add_file_to_unlink(const char *);
void fatal_signal_remove_file_to_unlink(const char *);
+int fatal_signal_unlink_file_now(const char *);
/* Interface for other code that catches one of our signals and needs to pass
* it through. */
diff --git a/lib/unixctl.c b/lib/unixctl.c
index 7d6fdd6..e774ffe 100644
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -438,8 +438,7 @@ unixctl_server_destroy(struct unixctl_server *server)
}
close(server->fd);
- unlink(server->path);
- fatal_signal_remove_file_to_unlink(server->path);
+ fatal_signal_unlink_file_now(server->path);
free(server->path);
free(server);
}
@@ -504,8 +503,7 @@ void
unixctl_client_destroy(struct unixctl_client *client)
{
if (client) {
- unlink(client->bind_path);
- fatal_signal_remove_file_to_unlink(client->bind_path);
+ fatal_signal_unlink_file_now(client->bind_path);
free(client->bind_path);
free(client->connect_path);
fclose(client->stream);
diff --git a/lib/vlog-modules.def b/lib/vlog-modules.def
index 849c867..ce298b5 100644
--- a/lib/vlog-modules.def
+++ b/lib/vlog-modules.def
@@ -36,6 +36,7 @@ VLOG_MODULE(dpctl)
VLOG_MODULE(executer)
VLOG_MODULE(ezio_term)
VLOG_MODULE(fail_open)
+VLOG_MODULE(fatal_signal)
VLOG_MODULE(fault)
VLOG_MODULE(flow)
VLOG_MODULE(in_band)
--
1.6.3.3
More information about the dev
mailing list