Module loading (and unloading) is identical for control and data modules so use common funtions to avoid code duplication.
Signed-off-by: Jan Glauber <jan.glau...@gmail.com> --- src/bin/lttng-sessiond/modprobe.c | 109 ++++++++++++------------------------- 1 file changed, 34 insertions(+), 75 deletions(-) diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c index 92563b0..b84c07e 100644 --- a/src/bin/lttng-sessiond/modprobe.c +++ b/src/bin/lttng-sessiond/modprobe.c @@ -82,18 +82,16 @@ const struct kern_modules_param kern_modules_list[] = { { "lttng-probe-writeback", 0 }, }; -/* - * Remove control kernel module(s) in reverse load order. - */ -void modprobe_remove_lttng_control(void) +void modprobe_remove_lttng(const struct kern_modules_param *modules, + int entries) { int ret = 0, i; char modprobe[256]; - for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) { + for (i = entries - 1; i >= 0; i--) { ret = snprintf(modprobe, sizeof(modprobe), "/sbin/modprobe -r -q %s", - kern_modules_control[i].name); + modules[i].name); if (ret < 0) { PERROR("snprintf modprobe -r"); goto error; @@ -115,6 +113,16 @@ void modprobe_remove_lttng_control(void) error: return; + +} + +/* + * Remove control kernel module(s) in reverse load order. + */ +void modprobe_remove_lttng_control(void) +{ + return modprobe_remove_lttng(kern_modules_control, + ARRAY_SIZE(kern_modules_control)); } /* @@ -122,34 +130,8 @@ error: */ void modprobe_remove_lttng_data(void) { - int ret = 0, i; - char modprobe[256]; - - for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) { - ret = snprintf(modprobe, sizeof(modprobe), - "/sbin/modprobe -r -q %s", - kern_modules_list[i].name); - if (ret < 0) { - PERROR("snprintf modprobe -r"); - goto error; - } - modprobe[sizeof(modprobe) - 1] = '\0'; - ret = system(modprobe); - if (ret == -1) { - ERR("Unable to launch modprobe -r for module %s", - kern_modules_list[i].name); - } else if (kern_modules_list[i].required - && WEXITSTATUS(ret) != 0) { - ERR("Unable to remove module %s", - kern_modules_list[i].name); - } else { - DBG("Modprobe removal successful %s", - kern_modules_list[i].name); - } - } - -error: - return; + return modprobe_remove_lttng(kern_modules_list, + ARRAY_SIZE(kern_modules_list)); } /* @@ -161,19 +143,16 @@ void modprobe_remove_lttng_all(void) modprobe_remove_lttng_control(); } -/* - * Load control kernel module(s). - */ -int modprobe_lttng_control(void) +static int modprobe_lttng(const struct kern_modules_param *modules, int entries) { int ret = 0, i; char modprobe[256]; - for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) { + for (i = 0; i < entries; i++) { ret = snprintf(modprobe, sizeof(modprobe), "/sbin/modprobe %s%s", - kern_modules_control[i].required ? "" : "-q ", - kern_modules_control[i].name); + modules[i].required ? "" : "-q ", + modules[i].name); if (ret < 0) { PERROR("snprintf modprobe"); goto error; @@ -182,14 +161,13 @@ int modprobe_lttng_control(void) ret = system(modprobe); if (ret == -1) { ERR("Unable to launch modprobe for module %s", - kern_modules_control[i].name); - } else if (kern_modules_control[i].required - && WEXITSTATUS(ret) != 0) { + modules[i].name); + } else if (modules[i].required && WEXITSTATUS(ret) != 0) { ERR("Unable to load module %s", - kern_modules_control[i].name); + modules[i].name); } else { DBG("Modprobe successfully %s", - kern_modules_control[i].name); + modules[i].name); } } @@ -198,37 +176,18 @@ error: } /* + * Load control kernel module(s). + */ +int modprobe_lttng_control(void) +{ + return modprobe_lttng(kern_modules_control, + ARRAY_SIZE(kern_modules_control)); +} +/* * Load data kernel module(s). */ int modprobe_lttng_data(void) { - int ret = 0, i; - char modprobe[256]; - - for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) { - ret = snprintf(modprobe, sizeof(modprobe), - "/sbin/modprobe %s%s", - kern_modules_list[i].required ? "" : "-q ", - kern_modules_list[i].name); - if (ret < 0) { - PERROR("snprintf modprobe"); - goto error; - } - modprobe[sizeof(modprobe) - 1] = '\0'; - ret = system(modprobe); - if (ret == -1) { - ERR("Unable to launch modprobe for module %s", - kern_modules_list[i].name); - } else if (kern_modules_list[i].required - && WEXITSTATUS(ret) != 0) { - ERR("Unable to load module %s", - kern_modules_list[i].name); - } else { - DBG("Modprobe successfully %s", - kern_modules_list[i].name); - } - } - -error: - return ret; + return modprobe_lttng(kern_modules_list, + ARRAY_SIZE(kern_modules_list)); } -- 1.7.9.5 _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev