/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* used for LOG_LOCAL0. */
BUILD_ASSERT_DECL(LOG_LOCAL0 == (16 << 3));
-/* The log modules. */
-struct ovs_list vlog_modules = OVS_LIST_INITIALIZER(&vlog_modules);
-
/* Protects the 'pattern' in all "struct destination"s, so that a race between
* changing and reading the pattern does not cause an access to freed
* memory. */
*
* All of the following is protected by 'log_file_mutex', which nests inside
* pattern_rwlock. */
-static struct ovs_mutex log_file_mutex = OVS_MUTEX_INITIALIZER;
+static struct ovs_mutex log_file_mutex OVS_ACQ_AFTER(pattern_rwlock)
+ = OVS_MUTEX_INITIALIZER;
static char *log_file_name OVS_GUARDED_BY(log_file_mutex) = NULL;
static int log_fd OVS_GUARDED_BY(log_file_mutex) = -1;
static struct async_append *log_writer OVS_GUARDED_BY(log_file_mutex);
static bool log_async OVS_GUARDED_BY(log_file_mutex);
static struct syslogger *syslogger = NULL;
+/* The log modules. */
+static struct ovs_list vlog_modules OVS_GUARDED_BY(log_file_mutex)
+ = OVS_LIST_INITIALIZER(&vlog_modules);
+
/* Syslog export configuration. */
static int syslog_fd OVS_GUARDED_BY(pattern_rwlock) = -1;
return i;
}
-void vlog_insert_module(struct ovs_list *vlog)
+void
+vlog_insert_module(struct ovs_list *vlog)
{
+ ovs_mutex_lock(&log_file_mutex);
list_insert(&vlog_modules, vlog);
+ ovs_mutex_unlock(&log_file_mutex);
}
/* Returns the name for logging module 'module'. */
{
struct vlog_module *mp;
+ ovs_mutex_lock(&log_file_mutex);
LIST_FOR_EACH (mp, list, &vlog_modules) {
if (!strcasecmp(name, mp->name)) {
+ ovs_mutex_unlock(&log_file_mutex);
return mp;
}
}
+ ovs_mutex_unlock(&log_file_mutex);
return NULL;
}
void
vlog_change_owner_unix(uid_t user, gid_t group)
{
- ovs_mutex_lock(&log_file_mutex);
- int error = log_file_name ? chown(log_file_name, user, group) : 0;
+ struct ds err = DS_EMPTY_INITIALIZER;
+ int error;
+ ovs_mutex_lock(&log_file_mutex);
+ error = log_file_name ? chown(log_file_name, user, group) : 0;
if (error) {
- VLOG_FATAL("Failed to change %s ownership: %s.",
- log_file_name, ovs_strerror(errno));
+ /* Build the error message. We can not call VLOG_FATAL directly
+ * here because VLOG_FATAL() will try again to to acquire
+ * 'log_file_mutex' lock, causing deadlock.
+ */
+ ds_put_format(&err, "Failed to change %s ownership: %s.",
+ log_file_name, ovs_strerror(errno));
}
-
ovs_mutex_unlock(&log_file_mutex);
+
+ if (error) {
+ VLOG_FATAL("%s", ds_steal_cstr(&err));
+ }
}
#endif
}
}
+static void
+vlog_unixctl_close(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED)
+{
+ ovs_mutex_lock(&log_file_mutex);
+ if (log_fd >= 0) {
+ close(log_fd);
+ log_fd = -1;
+
+ async_append_destroy(log_writer);
+ log_writer = NULL;
+
+ struct vlog_module *mp;
+ LIST_FOR_EACH (mp, list, &vlog_modules) {
+ update_min_level(mp);
+ }
+ }
+ ovs_mutex_unlock(&log_file_mutex);
+
+ unixctl_command_reply(conn, NULL);
+}
+
static void
set_all_rate_limits(bool enable)
{
struct vlog_module *mp;
+ ovs_mutex_lock(&log_file_mutex);
LIST_FOR_EACH (mp, list, &vlog_modules) {
mp->honor_rate_limits = enable;
}
+ ovs_mutex_unlock(&log_file_mutex);
}
static void
0, INT_MAX, vlog_disable_rate_limit, NULL);
unixctl_command_register("vlog/reopen", "", 0, 0,
vlog_unixctl_reopen, NULL);
+ unixctl_command_register("vlog/close", "", 0, 0,
+ vlog_unixctl_close, NULL);
ovs_rwlock_rdlock(&pattern_rwlock);
print_syslog_target_deprecation = syslog_fd >= 0;
ds_put_format(&s, " console syslog file\n");
ds_put_format(&s, " ------- ------ ------\n");
+ ovs_mutex_lock(&log_file_mutex);
LIST_FOR_EACH (mp, list, &vlog_modules) {
struct ds line;
svec_add_nocopy(&lines, ds_steal_cstr(&line));
}
+ ovs_mutex_unlock(&log_file_mutex);
svec_sort(&lines);
SVEC_FOR_EACH (i, line, &lines) {