colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: refactor logging for sysctl functions

Browse Source 
Use the standard _LOG*() macros and make the static cache
@sysctl_get_prev_values per instance.
This commit is contained in:
Thomas Haller
2015-08-30 15:51:20 +02:00
parent 4e461dab48
commit ffb931ca5c
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/platform/nm-linux-platform.c
View File

@@ -735,6 +735,8 @@ struct _NMLinuxPlatformPrivate {
GIOChannel *event_channel; GIOChannel *event_channel;
guint event_id; guint event_id;
GHashTable *sysctl_get_prev_values;
GUdevClient *udev_client; GUdevClient *udev_client;
struct { struct {
@@ -2394,32 +2396,32 @@ event_notification (struct nl_msg *msg, gpointer user_data)
/******************************************************************/ /******************************************************************/
static void static void
_log_dbg_sysctl_set_impl (const char *path, const char *value) _log_dbg_sysctl_set_impl (NMPlatform *platform, const char *path, const char *value)
{ {
GError *error = NULL; GError *error = NULL;
char *contents, *contents_escaped; char *contents, *contents_escaped;
char *value_escaped = g_strescape (value, NULL); char *value_escaped = g_strescape (value, NULL);
if (!g_file_get_contents (path, &contents, NULL, &error)) { if (!g_file_get_contents (path, &contents, NULL, &error)) {
debug ("sysctl: setting '%s' to '%s' (current value cannot be read: %s)", path, value_escaped, error->message); _LOGD ("sysctl: setting '%s' to '%s' (current value cannot be read: %s)", path, value_escaped, error->message);
g_clear_error (&error); g_clear_error (&error);
} else { } else {
g_strstrip (contents); g_strstrip (contents);
contents_escaped = g_strescape (contents, NULL); contents_escaped = g_strescape (contents, NULL);
if (strcmp (contents, value) == 0) if (strcmp (contents, value) == 0)
debug ("sysctl: setting '%s' to '%s' (current value is identical)", path, value_escaped); _LOGD ("sysctl: setting '%s' to '%s' (current value is identical)", path, value_escaped);
else else
debug ("sysctl: setting '%s' to '%s' (current value is '%s')", path, value_escaped, contents_escaped); _LOGD ("sysctl: setting '%s' to '%s' (current value is '%s')", path, value_escaped, contents_escaped);
g_free (contents); g_free (contents);
g_free (contents_escaped); g_free (contents_escaped);
} }
g_free (value_escaped); g_free (value_escaped);
} }
#define _log_dbg_sysctl_set(path, value) \ #define _log_dbg_sysctl_set(platform, path, value) \
G_STMT_START { \ G_STMT_START { \
if (nm_logging_enabled (LOGL_DEBUG, LOGD_PLATFORM)) { \ if (_LOGD_ENABLED ()) { \
_log_dbg_sysctl_set_impl (path, value); \ _log_dbg_sysctl_set_impl (platform, path, value); \
} \ } \
} G_STMT_END } G_STMT_END
@@ -2441,16 +2443,16 @@ sysctl_set (NMPlatform *platform, const char *path, const char *value)
fd = open (path, O_WRONLY | O_TRUNC); fd = open (path, O_WRONLY | O_TRUNC);
if (fd == -1) { if (fd == -1) {
if (errno == ENOENT) { if (errno == ENOENT) {
debug ("sysctl: failed to open '%s': (%d) %s", _LOGD ("sysctl: failed to open '%s': (%d) %s",
path, errno, strerror (errno)); path, errno, strerror (errno));
} else { } else {
error ("sysctl: failed to open '%s': (%d) %s", _LOGE ("sysctl: failed to open '%s': (%d) %s",
path, errno, strerror (errno)); path, errno, strerror (errno));
} }
return FALSE; return FALSE;
} }
_log_dbg_sysctl_set (path, value); _log_dbg_sysctl_set (platform, path, value);
/* Most sysfs and sysctl options don't care about a trailing LF, while some /* Most sysfs and sysctl options don't care about a trailing LF, while some
* (like infiniband) do. So always add the LF. Also, neither sysfs nor * (like infiniband) do. So always add the LF. Also, neither sysfs nor
@@ -2465,17 +2467,17 @@ sysctl_set (NMPlatform *platform, const char *path, const char *value)
nwrote = write (fd, actual, len); nwrote = write (fd, actual, len);
if (nwrote == -1) { if (nwrote == -1) {
if (errno == EINTR) { if (errno == EINTR) {
debug ("sysctl: interrupted, will try again"); _LOGD ("sysctl: interrupted, will try again");
continue; continue;
} }
break; break;
} }
} }
if (nwrote == -1 && errno != EEXIST) { if (nwrote == -1 && errno != EEXIST) {
error ("sysctl: failed to set '%s' to '%s': (%d) %s", _LOGE ("sysctl: failed to set '%s' to '%s': (%d) %s",
path, value, errno, strerror (errno)); path, value, errno, strerror (errno));
} else if (nwrote < len) { } else if (nwrote < len) {
error ("sysctl: failed to set '%s' to '%s' after three attempts", _LOGE ("sysctl: failed to set '%s' to '%s' after three attempts",
path, value); path, value);
} }
@@ -2484,44 +2486,47 @@ sysctl_set (NMPlatform *platform, const char *path, const char *value)
return (nwrote == len); return (nwrote == len);
} }
static GHashTable *sysctl_get_prev_values;
static void static void
_log_dbg_sysctl_get_impl (const char *path, const char *contents) _log_dbg_sysctl_get_impl (NMPlatform *platform, const char *path, const char *contents)
{ {
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
const char *prev_value = NULL; const char *prev_value = NULL;
if (!sysctl_get_prev_values) if (!priv->sysctl_get_prev_values)
sysctl_get_prev_values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); priv->sysctl_get_prev_values = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
else else
prev_value = g_hash_table_lookup (sysctl_get_prev_values, path); prev_value = g_hash_table_lookup (priv->sysctl_get_prev_values, path);
if (prev_value) { if (prev_value) {
if (strcmp (prev_value, contents) != 0) { if (strcmp (prev_value, contents) != 0) {
char *contents_escaped = g_strescape (contents, NULL); char *contents_escaped = g_strescape (contents, NULL);
char *prev_value_escaped = g_strescape (prev_value, NULL); char *prev_value_escaped = g_strescape (prev_value, NULL);
debug ("sysctl: reading '%s': '%s' (changed from '%s' on last read)", path, contents_escaped, prev_value_escaped); _LOGD ("sysctl: reading '%s': '%s' (changed from '%s' on last read)", path, contents_escaped, prev_value_escaped);
g_free (contents_escaped); g_free (contents_escaped);
g_free (prev_value_escaped); g_free (prev_value_escaped);
g_hash_table_insert (sysctl_get_prev_values, g_strdup (path), g_strdup (contents)); g_hash_table_insert (priv->sysctl_get_prev_values, g_strdup (path), g_strdup (contents));
} }
} else { } else {
char *contents_escaped = g_strescape (contents, NULL); char *contents_escaped = g_strescape (contents, NULL);
debug ("sysctl: reading '%s': '%s'", path, contents_escaped); _LOGD ("sysctl: reading '%s': '%s'", path, contents_escaped);
g_free (contents_escaped); g_free (contents_escaped);
g_hash_table_insert (sysctl_get_prev_values, g_strdup (path), g_strdup (contents)); g_hash_table_insert (priv->sysctl_get_prev_values, g_strdup (path), g_strdup (contents));
} }
} }
#define _log_dbg_sysctl_get(path, contents) \ #define _log_dbg_sysctl_get(platform, path, contents) \
G_STMT_START { \ G_STMT_START { \
if (nm_logging_enabled (LOGL_DEBUG, LOGD_PLATFORM)) { \ if (_LOGD_ENABLED ()) { \
_log_dbg_sysctl_get_impl (path, contents); \ _log_dbg_sysctl_get_impl (platform, path, contents); \
} else if (sysctl_get_prev_values) { \ } else { \
g_hash_table_destroy (sysctl_get_prev_values); \ NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); \
sysctl_get_prev_values = NULL; \ \
if (priv->sysctl_get_prev_values) { \
g_hash_table_destroy (priv->sysctl_get_prev_values); \
priv->sysctl_get_prev_values = NULL; \
} \
} \ } \
} G_STMT_END } G_STMT_END
@@ -2541,16 +2546,16 @@ sysctl_get (NMPlatform *platform, const char *path)
/* We assume FAILED means EOPNOTSUP */ /* We assume FAILED means EOPNOTSUP */
if ( g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT) if ( g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)
|| g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_FAILED)) || g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_FAILED))
debug ("error reading %s: %s", path, error->message); _LOGD ("error reading %s: %s", path, error->message);
else else
error ("error reading %s: %s", path, error->message); _LOGE ("error reading %s: %s", path, error->message);
g_clear_error (&error); g_clear_error (&error);
return NULL; return NULL;
} }
g_strstrip (contents); g_strstrip (contents);
_log_dbg_sysctl_get (path, contents); _log_dbg_sysctl_get (platform, path, contents);
return contents; return contents;
} }
@@ -4947,6 +4952,9 @@ nm_linux_platform_finalize (GObject *object)
g_object_unref (priv->udev_client); g_object_unref (priv->udev_client);
g_hash_table_unref (priv->wifi_data); g_hash_table_unref (priv->wifi_data);
if (priv->sysctl_get_prev_values)
g_hash_table_destroy (priv->sysctl_get_prev_values);
G_OBJECT_CLASS (nm_linux_platform_parent_class)->finalize (object); G_OBJECT_CLASS (nm_linux_platform_parent_class)->finalize (object);
} }