bin_PROGRAMS = lttng
-lttng_SOURCES = config.c commands/start.c commands/add_channel.c \
+lttng_SOURCES = conf.c commands/start.c commands/add_channel.c \
commands/list.c commands/create.c commands/destroy.c \
commands/stop.c commands/enable_events.c \
utils.c lttng.c
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "utils.h"
static char *opt_channel_name;
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
static char *opt_output_path;
static char *opt_session_name;
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "utils.h"
static char *opt_session_name;
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "utils.h"
static char *opt_event_list;
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "utils.h"
static char *opt_session_name;
#include <unistd.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "utils.h"
static char *opt_session_name;
--- /dev/null
+/*
+ * Copyright (c) 2011 David Goulet <david.goulet@polymtl.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#define _GNU_SOURCE
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "conf.h"
+#include "lttngerr.h"
+
+/*
+ * get_config_file_path
+ *
+ * Return the path with '/CONFIG_FILENAME' added to it.
+ */
+static char *get_config_file_path(char *path)
+{
+ int ret;
+ char *file_path;
+
+ ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
+ if (ret < 0) {
+ ERR("Fail allocating config file path");
+ }
+
+ return file_path;
+}
+
+/*
+ * open_config
+ *
+ * Return an open FILE pointer to the config file.
+ */
+static FILE *open_config(char *path, const char *mode)
+{
+ FILE *fp = NULL;
+ char *file_path;
+
+ file_path = get_config_file_path(path);
+ if (file_path == NULL) {
+ goto error;
+ }
+
+ fp = fopen(file_path, mode);
+ if (fp == NULL) {
+ perror("config file");
+ goto error;
+ }
+
+error:
+ if (file_path) {
+ free(file_path);
+ }
+ return fp;
+}
+
+/*
+ * create_config_file
+ *
+ * Create the empty config file a the path.
+ */
+static int create_config_file(char *path)
+{
+ int ret;
+ FILE *fp;
+
+ fp = open_config(path, "w+");
+ if (fp == NULL) {
+ ERR("Unable to create config file");
+ ret = -1;
+ goto error;
+ }
+
+ ret = fclose(fp);
+
+error:
+ return ret;
+}
+
+/*
+ * create_config_dir
+ *
+ * Create the empty config dir.
+ */
+static int create_config_dir(char *path)
+{
+ int ret;
+
+ /* Create session directory .lttng */
+ ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP);
+ if (ret < 0) {
+ if (errno == EEXIST) {
+ ERR("Session already exist at %s", path);
+ } else {
+ perror("mkdir config");
+ ERR("Couldn't init config directory at %s", path);
+ }
+ ret = -errno;
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * write_config
+ *
+ * Append data to the config file in file_path
+ */
+static void write_config(char *file_path, size_t size, char *data)
+{
+ FILE *fp;
+
+ fp = open_config(file_path, "a");
+ if (fp == NULL) {
+ goto error;
+ }
+
+ /* Write session name into config file */
+ fwrite(data, size, 1, fp);
+ fclose(fp);
+
+error:
+ return;
+}
+
+/*
+ * config_get_default_path
+ *
+ * Return the default path to config directory which is the current working
+ * directory. User must free() the returned allocated string.
+ */
+char *config_get_default_path(void)
+{
+ char *alloc_path;
+
+ alloc_path = getcwd(NULL, 0);
+ if (alloc_path == NULL) {
+ perror("getcwd");
+ }
+
+ return alloc_path;
+}
+
+/*
+ * config_destroy
+ *
+ * Destroy directory config and file config.
+ */
+void config_destroy(char *path)
+{
+ int ret;
+ char *config_path;
+
+ config_path = get_config_file_path(path);
+
+ ret = remove(config_path);
+ if (ret < 0) {
+ perror("remove config file");
+ }
+
+ ret = rmdir(path);
+ if (ret < 0) {
+ perror("rmdir config dir");
+ }
+
+ free(config_path);
+}
+
+/*
+ * config_read_session_name
+ *
+ * Return sesson name from the config file.
+ */
+char *config_read_session_name(char *path)
+{
+ int ret;
+ FILE *fp;
+ char var[NAME_MAX], *session_name;
+
+ fp = open_config(path, "r");
+ if (fp == NULL) {
+ ERR("Can't find valid lttng config in %s", path);
+ goto error;
+ }
+
+ session_name = malloc(NAME_MAX);
+ while (!feof(fp)) {
+ if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
+ if (ret == -1) {
+ ERR("Missing session=NAME in config file.");
+ goto error;
+ }
+ continue;
+ }
+
+ if (strcmp(var, "session") == 0) {
+ goto found;
+ }
+ }
+
+ fclose(fp);
+
+error:
+ return NULL;
+
+found:
+ fclose(fp);
+ return session_name;
+
+}
+
+/*
+ * config_add_session_name
+ *
+ * Write session name option to the config file.
+ */
+int config_add_session_name(char *path, char *name)
+{
+ int ret;
+ char session_name[NAME_MAX];
+
+ ret = snprintf(session_name, NAME_MAX, "session=%s\n", name);
+ if (ret < 0) {
+ goto error;
+ }
+
+ write_config(path, ret, session_name);
+ ret = 0;
+
+error:
+ return ret;
+}
+
+/*
+ * config_generate_dir_path
+ *
+ * Return allocated path string to path/CONFIG_DIRNAME.
+ */
+char *config_generate_dir_path(char *path)
+{
+ int ret;
+ char *new_path;
+
+ ret = asprintf(&new_path, "%s/%s", path, CONFIG_DIRNAME);
+ if (ret < 0) {
+ perror("config path problem");
+ goto error;
+ }
+
+error:
+ return new_path;
+}
+
+/*
+ * config_init
+ *
+ * Init configuration directory and file.
+ */
+int config_init(char *path)
+{
+ int ret;
+
+ /* Create config directory (.lttng) */
+ ret = create_config_dir(path);
+ if (ret < 0) {
+ goto error;
+ }
+
+ /* Create default config file */
+ ret = create_config_file(path);
+ if (ret < 0) {
+ goto error;
+ }
+
+ DBG("Init config session in %s", path);
+
+error:
+ return ret;
+}
--- /dev/null
+/*
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _LTTNG_CONFIG_H
+#define _LTTNG_CONFIG_H
+
+#define CONFIG_FILENAME "config"
+#define CONFIG_DIRNAME ".lttng"
+
+void config_destroy(char *path);
+int config_init(char *path);
+int config_add_session_name(char *path, char *name);
+
+/* Must free() the return pointer */
+char *config_generate_dir_path(char *path);
+char *config_read_session_name(char *path);
+char *config_get_default_path(void);
+
+#endif /* _LTTNG_CONFIG_H */
+++ /dev/null
-/*
- * Copyright (c) 2011 David Goulet <david.goulet@polymtl.ca>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#define _GNU_SOURCE
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "lttngerr.h"
-
-/*
- * get_config_file_path
- *
- * Return the path with '/CONFIG_FILENAME' added to it.
- */
-static char *get_config_file_path(char *path)
-{
- int ret;
- char *file_path;
-
- ret = asprintf(&file_path, "%s/%s", path, CONFIG_FILENAME);
- if (ret < 0) {
- ERR("Fail allocating config file path");
- }
-
- return file_path;
-}
-
-/*
- * open_config
- *
- * Return an open FILE pointer to the config file.
- */
-static FILE *open_config(char *path, const char *mode)
-{
- FILE *fp = NULL;
- char *file_path;
-
- file_path = get_config_file_path(path);
- if (file_path == NULL) {
- goto error;
- }
-
- fp = fopen(file_path, mode);
- if (fp == NULL) {
- perror("config file");
- goto error;
- }
-
-error:
- if (file_path) {
- free(file_path);
- }
- return fp;
-}
-
-/*
- * create_config_file
- *
- * Create the empty config file a the path.
- */
-static int create_config_file(char *path)
-{
- int ret;
- FILE *fp;
-
- fp = open_config(path, "w+");
- if (fp == NULL) {
- ERR("Unable to create config file");
- ret = -1;
- goto error;
- }
-
- ret = fclose(fp);
-
-error:
- return ret;
-}
-
-/*
- * create_config_dir
- *
- * Create the empty config dir.
- */
-static int create_config_dir(char *path)
-{
- int ret;
-
- /* Create session directory .lttng */
- ret = mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP);
- if (ret < 0) {
- if (errno == EEXIST) {
- ERR("Session already exist at %s", path);
- } else {
- perror("mkdir config");
- ERR("Couldn't init config directory at %s", path);
- }
- ret = -errno;
- goto error;
- }
-
-error:
- return ret;
-}
-
-/*
- * write_config
- *
- * Append data to the config file in file_path
- */
-static void write_config(char *file_path, size_t size, char *data)
-{
- FILE *fp;
-
- fp = open_config(file_path, "a");
- if (fp == NULL) {
- goto error;
- }
-
- /* Write session name into config file */
- fwrite(data, size, 1, fp);
- fclose(fp);
-
-error:
- return;
-}
-
-/*
- * config_get_default_path
- *
- * Return the default path to config directory which is the current working
- * directory. User must free() the returned allocated string.
- */
-char *config_get_default_path(void)
-{
- char *alloc_path;
-
- alloc_path = getcwd(NULL, 0);
- if (alloc_path == NULL) {
- perror("getcwd");
- }
-
- return alloc_path;
-}
-
-/*
- * config_destroy
- *
- * Destroy directory config and file config.
- */
-void config_destroy(char *path)
-{
- int ret;
- char *config_path;
-
- config_path = get_config_file_path(path);
-
- ret = remove(config_path);
- if (ret < 0) {
- perror("remove config file");
- }
-
- ret = rmdir(path);
- if (ret < 0) {
- perror("rmdir config dir");
- }
-
- free(config_path);
-}
-
-/*
- * config_read_session_name
- *
- * Return sesson name from the config file.
- */
-char *config_read_session_name(char *path)
-{
- int ret;
- FILE *fp;
- char var[NAME_MAX], *session_name;
-
- fp = open_config(path, "r");
- if (fp == NULL) {
- ERR("Can't find valid lttng config in %s", path);
- goto error;
- }
-
- session_name = malloc(NAME_MAX);
- while (!feof(fp)) {
- if ((ret = fscanf(fp, "%[^'=']=%s\n", var, session_name)) != 2) {
- if (ret == -1) {
- ERR("Missing session=NAME in config file.");
- goto error;
- }
- continue;
- }
-
- if (strcmp(var, "session") == 0) {
- goto found;
- }
- }
-
- fclose(fp);
-
-error:
- return NULL;
-
-found:
- fclose(fp);
- return session_name;
-
-}
-
-/*
- * config_add_session_name
- *
- * Write session name option to the config file.
- */
-int config_add_session_name(char *path, char *name)
-{
- int ret;
- char session_name[NAME_MAX];
-
- ret = snprintf(session_name, NAME_MAX, "session=%s\n", name);
- if (ret < 0) {
- goto error;
- }
-
- write_config(path, ret, session_name);
- ret = 0;
-
-error:
- return ret;
-}
-
-/*
- * config_generate_dir_path
- *
- * Return allocated path string to path/CONFIG_DIRNAME.
- */
-char *config_generate_dir_path(char *path)
-{
- int ret;
- char *new_path;
-
- ret = asprintf(&new_path, "%s/%s", path, CONFIG_DIRNAME);
- if (ret < 0) {
- perror("config path problem");
- goto error;
- }
-
-error:
- return new_path;
-}
-
-/*
- * config_init
- *
- * Init configuration directory and file.
- */
-int config_init(char *path)
-{
- int ret;
-
- /* Create config directory (.lttng) */
- ret = create_config_dir(path);
- if (ret < 0) {
- goto error;
- }
-
- /* Create default config file */
- ret = create_config_file(path);
- if (ret < 0) {
- goto error;
- }
-
- DBG("Init config session in %s", path);
-
-error:
- return ret;
-}
#include <lttng/lttng.h>
#include "cmd.h"
-#include "config.h"
+#include "conf.h"
#include "lttngerr.h"
/* Variables */
#include <lttng/lttng.h>
-#include "config.h"
+#include "conf.h"
/*
* get_config_file_path
projects / lttng-tools.git / commitdiff
