osd/OSDMap.cc \
mds/MDSMap.cc \
common/common_init.cc \
+ common/ceph_argparse.cc \
common/buffer.cc \
common/signal.cc \
common/Thread.cc \
#include "config.h"
#include "common/ConfUtils.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "auth/Crypto.h"
#include "auth/Auth.h"
#include "mon/AuthMonitor.h"
#include "common/ConfUtils.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#include "config.h"
#include "include/str_list.h"
static int list_sections(const char *s)
{
- ConfFile *cf = conf_get_conf_file();
- if (!cf)
+ if (!g_conf.cf)
return 2;
for (std::list<ConfSection*>::const_iterator p =
- cf->get_section_list().begin();
- p != cf->get_section_list().end(); ++p)
+ g_conf.cf->get_section_list().begin();
+ p != g_conf.cf->get_section_list().end(); ++p)
{
if (strncmp(s, (*p)->get_name().c_str(), strlen(s)) == 0)
cout << (*p)->get_name() << std::endl;
bool resolve_search)
{
char *val = NULL;
- ConfFile *cf = conf_get_conf_file();
- if (!cf)
+ if (!g_conf.cf)
return 2;
conf_read_key(NULL, key, OPT_STR, (char **)&val, NULL);
if (val) {
}
for (unsigned int i=0; i<sections.size(); i++) {
- cf->read(sections[i], key, (char **)&val, NULL);
+ g_conf.cf->read(sections[i], key, (char **)&val, NULL);
if (val) {
print_val(val, resolve_search);
free(val);
{
// TODO: document exactly what we are doing here?
std::vector<const char *> empty_args;
+ bool force_fg_logging = false;
parse_startup_config_options(empty_args, type,
- STARTUP_FLAG_FORCE_FG_LOGGING);
+ STARTUP_FLAG_FORCE_FG_LOGGING, &force_fg_logging);
char buf[1024];
memset(buf, 0, sizeof(buf));
if (ceph_def_conf_by_name(key, buf, sizeof(buf))) {
#include "mon/MonClient.h"
#include "common/Timer.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/errno.h"
#include "common/safe_io.h"
#include "common/Timer.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#include "mon/MonClient.h"
#include "include/CompatSet.h"
+#include "common/ceph_argparse.h"
#include "common/Timer.h"
#include "common/common_init.h"
--- /dev/null
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ *
+ */
+
+#include "auth/Auth.h"
+#include "common/ceph_argparse.h"
+#include "common/common_init.h"
+#include "common/ConfUtils.h"
+#include "common/version.h"
+#include "config.h"
+#include "include/intarith.h"
+#include "include/str_list.h"
+#include "msg/msg_types.h"
+
+#include <deque>
+#include <stdlib.h>
+#include <string>
+#include <string.h>
+#include <vector>
+
+/*
+ * Ceph argument parsing library
+ *
+ * We probably should eventually replace this with something standard like popt.
+ * Until we do that, though, this file is the place for argv parsing
+ * stuff to live.
+ */
+
+#undef dout
+#undef pdout
+#undef derr
+#undef generic_dout
+#undef dendl
+
+static void env_override(char **ceph_var, const char * const env_var)
+{
+ char *e = getenv(env_var);
+ if (!e)
+ return;
+ if (*ceph_var)
+ free(*ceph_var);
+ *ceph_var = strdup(e);
+}
+
+void env_to_vec(std::vector<const char*>& args)
+{
+ char *p = getenv("CEPH_ARGS");
+ if (!p) return;
+
+ static char buf[1000];
+ int len = MIN(strlen(p), sizeof(buf)-1); // bleh.
+ memcpy(buf, p, len);
+ buf[len] = 0;
+ //cout << "CEPH_ARGS='" << p << ";" << endl;
+
+ p = buf;
+ while (*p && p < buf + len) {
+ char *e = p;
+ while (*e && *e != ' ')
+ e++;
+ *e = 0;
+ args.push_back(p);
+ //cout << "arg " << p << std::endl;
+ p = e+1;
+ }
+}
+
+void env_to_deq(std::deque<const char*>& args)
+{
+ char *p = getenv("CEPH_ARGS");
+ if (!p) return;
+
+ static char buf[1000];
+ int len = MIN(strlen(p), sizeof(buf)-1); // bleh.
+ memcpy(buf, p, len);
+ buf[len] = 0;
+
+ p = buf;
+ while (*p && p < buf + len) {
+ char *e = p;
+ while (*e && *e != ' ')
+ e++;
+ *e = 0;
+ args.push_back(p);
+ p = e+1;
+ }
+}
+
+void argv_to_vec(int argc, const char **argv,
+ std::vector<const char*>& args)
+{
+ for (int i=1; i<argc; i++)
+ args.push_back(argv[i]);
+}
+
+void argv_to_deq(int argc, const char **argv,
+ std::deque<const char*>& args)
+{
+ for (int i=1; i<argc; i++)
+ args.push_back(argv[i]);
+}
+
+void vec_to_argv(std::vector<const char*>& args,
+ int& argc, const char **&argv)
+{
+ const char *myname = "asdf";
+ if (argc && argv)
+ myname = argv[0];
+ argv = (const char**)malloc(sizeof(char*) * argc);
+ argc = 1;
+ argv[0] = myname;
+
+ for (unsigned i=0; i<args.size(); i++)
+ argv[argc++] = args[i];
+}
+
+bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec)
+{
+ const char *p = s;
+ const char *end = p + strlen(p);
+ while (p < end) {
+ entity_addr_t a;
+ //cout << " parse at '" << p << "'" << std::endl;
+ if (!a.parse(p, &p)) {
+ //dout(0) << " failed to parse address '" << p << "'" << dendl;
+ return false;
+ }
+ //cout << " got " << a << ", rest is '" << p << "'" << std::endl;
+ vec.push_back(a);
+ while (*p == ',' || *p == ' ')
+ p++;
+ }
+ return true;
+}
+
+void parse_config_option_string(std::string& s)
+{
+ char b[s.length()+1];
+ strcpy(b, s.c_str());
+ std::vector<const char*> nargs;
+ char *p = b;
+ while (*p) {
+ nargs.push_back(p);
+ while (*p && *p != ' ') p++;
+ if (!*p)
+ break;
+ *p++ = 0;
+ while (*p && *p == ' ') p++;
+ }
+ parse_config_options(nargs);
+}
+
+void parse_startup_config_options(std::vector<const char*>& args,
+ const char *module_type, int flags,
+ bool *force_fg_logging)
+{
+ bool show_config = false;
+ DEFINE_CONF_VARS(NULL);
+ std::vector<const char *> nargs;
+ bool conf_specified = false;
+ *force_fg_logging = ((flags & STARTUP_FLAG_FORCE_FG_LOGGING) != 0);
+
+ if (!g_conf.type)
+ g_conf.type = (char *)"";
+
+ bool isdaemon = g_conf.daemonize;
+
+ FOR_EACH_ARG(args) {
+ if (CONF_ARG_EQ("version", 'v')) {
+ cout << ceph_version_to_string() << std::endl;
+ _exit(0);
+ } else if (CONF_ARG_EQ("conf", 'c')) {
+ CONF_SAFE_SET_ARG_VAL(&g_conf.conf, OPT_STR);
+ conf_specified = true;
+ } else if (CONF_ARG_EQ("monmap", 'M')) {
+ CONF_SAFE_SET_ARG_VAL(&g_conf.monmap, OPT_STR);
+ } else if (CONF_ARG_EQ("show_conf", 'S')) {
+ show_config = true;
+ } else if (isdaemon && CONF_ARG_EQ("bind", 0)) {
+ g_conf.public_addr.parse(args[++i]);
+ } else if (CONF_ARG_EQ("nodaemon", 'D')) {
+ g_conf.daemonize = false;
+ *force_fg_logging = true;
+ } else if (CONF_ARG_EQ("foreground", 'f')) {
+ g_conf.daemonize = false;
+ *force_fg_logging = false;
+ } else if (isdaemon && (CONF_ARG_EQ("id", 'i') || CONF_ARG_EQ("name", 'n'))) {
+ free(g_conf.id);
+ CONF_SAFE_SET_ARG_VAL(&g_conf.id, OPT_STR);
+ } else if (!isdaemon && (CONF_ARG_EQ("id", 'I') || CONF_ARG_EQ("name", 'n'))) {
+ free(g_conf.id);
+ CONF_SAFE_SET_ARG_VAL(&g_conf.id, OPT_STR);
+ } else {
+ nargs.push_back(args[i]);
+ }
+ }
+ args.swap(nargs);
+ nargs.clear();
+
+ if (module_type) {
+ g_conf.type = strdup(module_type);
+ // is it "type.name"?
+ const char *dot = strchr(g_conf.id, '.');
+ if (dot) {
+ int tlen = dot - g_conf.id;
+ g_conf.type = (char *)malloc(tlen + 1);
+ memcpy(g_conf.type, g_conf.id, tlen);
+ g_conf.type[tlen] = 0;
+ char *new_g_conf_id = strdup(dot + 1);
+ free(g_conf.id);
+ g_conf.id = new_g_conf_id;
+ }
+
+ int len = strlen(g_conf.type) + strlen(g_conf.id) + 2;
+ g_conf.name = (char *)malloc(len);
+ snprintf(g_conf.name, len, "%s.%s", g_conf.type, g_conf.id);
+ g_conf.alt_name = (char *)malloc(len - 1);
+ snprintf(g_conf.alt_name, len - 1, "%s%s", module_type, g_conf.id);
+ }
+
+ g_conf.entity_name = new EntityName;
+ assert(g_conf.entity_name);
+
+ g_conf.entity_name->from_type_id(g_conf.type, g_conf.id);
+
+ if (g_conf.cf) {
+ delete g_conf.cf;
+ g_conf.cf = NULL;
+ }
+
+ // do post_process substitutions
+ int len = num_config_options;
+ for (int i = 0; i<len; i++) {
+ config_option *opt = &config_optionsp[i];
+ if (opt->type == OPT_STR && opt->val_ptr) {
+ if (*(char**)opt->val_ptr) {
+ *(char **)opt->val_ptr = conf_post_process_val(*(char **)opt->val_ptr);
+ }
+ }
+ }
+
+ if (!conf_specified)
+ env_override(&g_conf.conf, "CEPH_CONF");
+
+ // open new conf
+ string fn = g_conf.conf;
+ list<string> ls;
+ get_str_list(fn, ls);
+ bool read_conf = false;
+ for (list<string>::iterator p = ls.begin(); p != ls.end(); p++) {
+ g_conf.cf = new ConfFile(p->c_str());
+ read_conf = parse_config_file(g_conf.cf, true);
+ if (read_conf)
+ break;
+ delete g_conf.cf;
+ g_conf.cf = NULL;
+ }
+
+ if (conf_specified && !read_conf) {
+ cerr << "error reading config file(s) " << g_conf.conf << std::endl;
+ exit(1);
+ }
+
+ if (show_config) {
+ if (g_conf.cf)
+ g_conf.cf->dump();
+ exit(0);
+ }
+}
+
+void parse_config_options(std::vector<const char*>& args)
+{
+ int opt_len = num_config_options;
+ DEFINE_CONF_VARS(NULL);
+
+ std::vector<const char*> nargs;
+ FOR_EACH_ARG(args) {
+ int optn;
+
+ for (optn = 0; optn < opt_len; optn++) {
+ if (CONF_ARG_EQ("lockdep", '\0')) {
+ CONF_SAFE_SET_ARG_VAL(&g_lockdep, OPT_INT);
+ } else if (CONF_ARG_EQ(config_optionsp[optn].name,
+ config_optionsp[optn].char_option)) {
+ if (__isarg || val_pos || config_optionsp[optn].type == OPT_BOOL)
+ CONF_SAFE_SET_ARG_VAL(config_optionsp[optn].val_ptr, config_optionsp[optn].type);
+ else
+ continue;
+ } else {
+ continue;
+ }
+ break;
+ }
+
+ if (optn == opt_len)
+ nargs.push_back(args[i]);
+ }
+
+ env_override(&g_conf.keyring, "CEPH_KEYRING");
+ args = nargs;
+}
+
+static void generic_usage(bool is_server)
+{
+ cout << " -c ceph.conf or --conf=ceph.conf\n";
+ cout << " get options from given conf file\n";
+ cout << " -D run in foreground.\n";
+ cout << " -f run in foreground. Show all log messages on stdout.\n";
+ if (is_server) {
+ cout << " --debug_ms N\n";
+ cout << " set message debug level (e.g. 1)\n";
+ }
+}
+
+void generic_server_usage()
+{
+ generic_usage(true);
+ exit(1);
+}
+void generic_client_usage()
+{
+ generic_usage(false);
+ exit(1);
+}
--- /dev/null
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2008-2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ *
+ */
+
+#ifndef CEPH_ARGPARSE_H
+#define CEPH_ARGPARSE_H
+
+/*
+ * Ceph argument parsing library
+ *
+ * We probably should eventually replace this with something standard like popt.
+ * Until we do that, though, this file is the place for argv parsing
+ * stuff to live.
+ */
+
+#include <deque>
+#include <string>
+#include <vector>
+
+#include "msg/msg_types.h"
+
+/////////////////////// Macros ///////////////////////
+#define FOR_EACH_ARG(args) \
+ __isarg = 1 < args.size(); \
+ for (unsigned i=0; i<args.size(); i++, __isarg = i+1 < args.size())
+
+#define ARGS_USAGE() args_usage();
+
+#define DEFINE_CONF_VARS(usage_func) \
+ unsigned int val_pos __attribute__((unused)); \
+ void (*args_usage)() __attribute__((unused)) = usage_func; \
+ bool __isarg __attribute__((unused))
+
+/////////////////////// Functions ///////////////////////
+extern void env_to_vec(std::vector<const char*>& args);
+extern void env_to_deq(std::deque<const char*>& args);
+extern void argv_to_vec(int argc, const char **argv,
+ std::vector<const char*>& args);
+extern void argv_to_deq(int argc, const char **argv,
+ std::deque<const char*>& args);
+extern void vec_to_argv(std::vector<const char*>& args,
+ int& argc, const char **&argv);
+
+extern bool parse_ip_port_vec(const char *s, std::vector<entity_addr_t>& vec);
+extern void parse_config_option_string(std::string& s);
+extern void parse_startup_config_options(std::vector<const char*>& args,
+ const char *module_type, int flags,
+ bool *force_fg_logging);
+extern void parse_config_options(std::vector<const char*>& args);
+
+extern void generic_server_usage();
+extern void generic_client_usage();
+
+#endif
#include "auth/AuthSupported.h"
#include "auth/KeyRing.h"
+#include "common/ceph_argparse.h"
#include "common/safe_io.h"
+#include "common/signal.h"
+#include "common/version.h"
#include "config.h"
#include "common/common_init.h"
#include "common/errno.h"
-#include "common/signal.h"
#include "include/color.h"
+#include <syslog.h>
+
/* Set foreground logging
*
* Forces the process to log only to stderr, overriding whatever was in the ceph.conf.
void common_init(std::vector<const char*>& args, const char *module_type, int flags)
{
- parse_startup_config_options(args, module_type, flags);
+ bool force_fg_logging = false;
+ parse_startup_config_options(args, module_type, flags, &force_fg_logging);
+
+ if (g_conf.log_to_syslog || g_conf.clog_to_syslog) {
+ closelog();
+ // It's ok if g_conf.name is NULL here.
+ openlog(g_conf.name, LOG_ODELAY | LOG_PID, LOG_USER);
+ }
+
+ if (force_fg_logging)
+ set_foreground_logging();
+
+ {
+ // In the long term, it would be best to ensure that we read ceph.conf
+ // before initializing dout(). For now, just force a reopen here with the
+ // configuration we have just read.
+ DoutLocker _dout_locker;
+ _dout_open_log();
+ }
+
+ if (!force_fg_logging) {
+ dout_output_ceph_version();
+ }
+
parse_config_options(args);
install_standard_sighandlers();
/* The Ceph configuration. */
md_config_t g_conf __attribute__((init_priority(103)));
-/* These should be moved into md_config_t eventually, grrr */
-static ConfFile *cf = NULL;
-
// file layouts
struct ceph_file_layout g_default_file_layout = {
fl_stripe_unit: init_le32(1<<22),
fl_pg_pool : init_le32(-1),
};
-static void env_override(char **ceph_var, const char * const env_var)
-{
- char *e = getenv(env_var);
- if (!e)
- return;
- if (*ceph_var)
- free(*ceph_var);
- *ceph_var = strdup(e);
-}
-
-void env_to_vec(std::vector<const char*>& args)
-{
- char *p = getenv("CEPH_ARGS");
- if (!p) return;
-
- static char buf[1000];
- int len = MIN(strlen(p), sizeof(buf)-1); // bleh.
- memcpy(buf, p, len);
- buf[len] = 0;
- //cout << "CEPH_ARGS='" << p << ";" << endl;
-
- p = buf;
- while (*p && p < buf + len) {
- char *e = p;
- while (*e && *e != ' ')
- e++;
- *e = 0;
- args.push_back(p);
- //cout << "arg " << p << std::endl;
- p = e+1;
- }
-}
-
-void env_to_deq(std::deque<const char*>& args)
-{
- char *p = getenv("CEPH_ARGS");
- if (!p) return;
-
- static char buf[1000];
- int len = MIN(strlen(p), sizeof(buf)-1); // bleh.
- memcpy(buf, p, len);
- buf[len] = 0;
-
- p = buf;
- while (*p && p < buf + len) {
- char *e = p;
- while (*e && *e != ' ')
- e++;
- *e = 0;
- args.push_back(p);
- p = e+1;
- }
-}
-
-void argv_to_vec(int argc, const char **argv,
- std::vector<const char*>& args)
-{
- for (int i=1; i<argc; i++)
- args.push_back(argv[i]);
-}
-
-void argv_to_deq(int argc, const char **argv,
- std::deque<const char*>& args)
-{
- for (int i=1; i<argc; i++)
- args.push_back(argv[i]);
-}
-
-void vec_to_argv(std::vector<const char*>& args,
- int& argc, const char **&argv)
-{
- const char *myname = "asdf";
- if (argc && argv)
- myname = argv[0];
- argv = (const char**)malloc(sizeof(char*) * argc);
- argc = 1;
- argv[0] = myname;
-
- for (unsigned i=0; i<args.size(); i++)
- argv[argc++] = args[i];
-}
-
-bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec)
-{
- const char *p = s;
- const char *end = p + strlen(p);
- while (p < end) {
- entity_addr_t a;
- //cout << " parse at '" << p << "'" << std::endl;
- if (!a.parse(p, &p)) {
- //dout(0) << " failed to parse address '" << p << "'" << dendl;
- return false;
- }
- //cout << " got " << a << ", rest is '" << p << "'" << std::endl;
- vec.push_back(a);
- while (*p == ',' || *p == ' ')
- p++;
- }
- return true;
-}
-
-void parse_config_option_string(string& s)
-{
- char b[s.length()+1];
- strcpy(b, s.c_str());
- vector<const char*> nargs;
- char *p = b;
- while (*p) {
- nargs.push_back(p);
- while (*p && *p != ' ') p++;
- if (!*p)
- break;
- *p++ = 0;
- while (*p && *p == ' ') p++;
- }
- parse_config_options(nargs);
-}
-
#define _STR(x) #x
#define STRINGIFY(x) _STR(x)
-struct config_option {
- const char *section;
- const char *conf_name;
- const char *name;
- void *val_ptr;
-
- const char *def_str;
- long long def_longlong;
- double def_double;
-
- opt_type_t type;
- char char_option; // if any
-};
#define OPTION_OPT_STR(section, name, schar, type, def_val) \
{ STRINGIFY(section), NULL, STRINGIFY(name), \
{ STRINGIFY(section), NULL, STRINGIFY(conf_name), \
&g_conf.name, STRINGIFY(def_val), type, schar }
-static struct config_option config_optionsp[] = {
+struct config_option config_optionsp[] = {
OPTION(host, 0, OPT_STR, "localhost"),
OPTION(public_addr, 0, OPT_ADDR, ""),
OPTION(cluster_addr, 0, OPT_ADDR, ""),
OPTION(bdev_fake_max_mb, 0, OPT_INT, 0),
};
+const int num_config_options = sizeof(config_optionsp) / sizeof(config_option);
+
bool conf_set_conf_val(void *field, opt_type_t type, const char *val)
{
switch (type) {
#define OPT_READ_TYPE(ret, section, var, type, out, def) \
do { \
if (def) \
- ret = cf->read(section, var, (type *)out, *(type *)def); \
+ ret = g_conf.cf->read(section, var, (type *)out, *(type *)def); \
else \
- ret = cf->read(section, var, (type *)out, 0); \
+ ret = g_conf.cf->read(section, var, (type *)out, 0); \
} while (0)
int conf_read_key_ext(const char *conf_name, const char *conf_alt_name, const char *conf_type,
OPT_READ_TYPE(ret, section, key, double, out, def);
break;
case OPT_ADDR:
- ret = cf->read(section, key, &tmp, (char *)def);
+ ret = g_conf.cf->read(section, key, &tmp, (char *)def);
if (*tmp == *((char *)def)) {
ret = 0;
}
return ((strcasecmp(param, "true")==0) || (strcasecmp(param, "false")==0));
}
-void parse_startup_config_options(std::vector<const char*>& args,
- const char *module_type, int flags)
-{
- bool show_config = false;
- DEFINE_CONF_VARS(NULL);
- std::vector<const char *> nargs;
- bool conf_specified = false;
- bool force_fg_logging = !!(flags & STARTUP_FLAG_FORCE_FG_LOGGING);
-
- if (!g_conf.type)
- g_conf.type = (char *)"";
-
- bool isdaemon = g_conf.daemonize;
-
- FOR_EACH_ARG(args) {
- if (CONF_ARG_EQ("version", 'v')) {
- cout << "ceph version " << VERSION << " (commit:" << STRINGIFY(CEPH_GIT_VER) << ")" << std::endl;
- _exit(0);
- } else if (CONF_ARG_EQ("conf", 'c')) {
- CONF_SAFE_SET_ARG_VAL(&g_conf.conf, OPT_STR);
- conf_specified = true;
- } else if (CONF_ARG_EQ("monmap", 'M')) {
- CONF_SAFE_SET_ARG_VAL(&g_conf.monmap, OPT_STR);
- } else if (CONF_ARG_EQ("show_conf", 'S')) {
- show_config = true;
- } else if (isdaemon && CONF_ARG_EQ("bind", 0)) {
- g_conf.public_addr.parse(args[++i]);
- } else if (CONF_ARG_EQ("nodaemon", 'D')) {
- g_conf.daemonize = false;
- force_fg_logging = true;
- } else if (CONF_ARG_EQ("foreground", 'f')) {
- g_conf.daemonize = false;
- force_fg_logging = false;
- } else if (isdaemon && (CONF_ARG_EQ("id", 'i') || CONF_ARG_EQ("name", 'n'))) {
- free(g_conf.id);
- CONF_SAFE_SET_ARG_VAL(&g_conf.id, OPT_STR);
- } else if (!isdaemon && (CONF_ARG_EQ("id", 'I') || CONF_ARG_EQ("name", 'n'))) {
- free(g_conf.id);
- CONF_SAFE_SET_ARG_VAL(&g_conf.id, OPT_STR);
- } else {
- nargs.push_back(args[i]);
- }
- }
- args.swap(nargs);
- nargs.clear();
-
- if (module_type) {
- g_conf.type = strdup(module_type);
- // is it "type.name"?
- const char *dot = strchr(g_conf.id, '.');
- if (dot) {
- int tlen = dot - g_conf.id;
- g_conf.type = (char *)malloc(tlen + 1);
- memcpy(g_conf.type, g_conf.id, tlen);
- g_conf.type[tlen] = 0;
- char *new_g_conf_id = strdup(dot + 1);
- free(g_conf.id);
- g_conf.id = new_g_conf_id;
- }
-
- int len = strlen(g_conf.type) + strlen(g_conf.id) + 2;
- g_conf.name = (char *)malloc(len);
- snprintf(g_conf.name, len, "%s.%s", g_conf.type, g_conf.id);
- g_conf.alt_name = (char *)malloc(len - 1);
- snprintf(g_conf.alt_name, len - 1, "%s%s", module_type, g_conf.id);
- }
-
- g_conf.entity_name = new EntityName;
- assert(g_conf.entity_name);
-
- g_conf.entity_name->from_type_id(g_conf.type, g_conf.id);
-
- if (cf) {
- delete cf;
- cf = NULL;
- }
-
- // do post_process substitutions
- int len = sizeof(config_optionsp)/sizeof(config_option);
- for (int i = 0; i<len; i++) {
- config_option *opt = &config_optionsp[i];
- if (opt->type == OPT_STR && opt->val_ptr) {
- if (*(char**)opt->val_ptr) {
- *(char **)opt->val_ptr = conf_post_process_val(*(char **)opt->val_ptr);
- }
- }
- }
-
- if (!conf_specified)
- env_override(&g_conf.conf, "CEPH_CONF");
-
- // open new conf
- string fn = g_conf.conf;
- list<string> ls;
- get_str_list(fn, ls);
- bool read_conf = false;
- for (list<string>::iterator p = ls.begin(); p != ls.end(); p++) {
- cf = new ConfFile(p->c_str());
- read_conf = parse_config_file(cf, true);
- if (read_conf)
- break;
- delete cf;
- cf = NULL;
- }
-
- if (conf_specified && !read_conf) {
- cerr << "error reading config file(s) " << g_conf.conf << std::endl;
- exit(1);
- }
-
- if (g_conf.log_to_syslog || g_conf.clog_to_syslog) {
- closelog();
- // It's ok if g_conf.name is NULL here.
- openlog(g_conf.name, LOG_ODELAY | LOG_PID, LOG_USER);
- }
-
- if (force_fg_logging)
- set_foreground_logging();
-
- {
- // In the long term, it would be best to ensure that we read ceph.conf
- // before initializing dout(). For now, just force a reopen here with the
- // configuration we have just read.
- DoutLocker _dout_locker;
- _dout_open_log();
- }
-
- if (!force_fg_logging) {
- dout_output_ceph_version();
- }
-
- if (!cf)
- return;
-
- if (show_config) {
- cf->dump();
- exit(0);
- }
-}
-
-void generic_usage(bool is_server)
-{
- cout << " -c ceph.conf or --conf=ceph.conf\n";
- cout << " get options from given conf file\n";
- cout << " -D run in foreground.\n";
- cout << " -f run in foreground. Show all log messages on stdout.\n";
- if (is_server) {
- cout << " --debug_ms N\n";
- cout << " set message debug level (e.g. 1)\n";
- }
-}
-
-void generic_server_usage()
-{
- generic_usage(true);
- exit(1);
-}
-void generic_client_usage()
-{
- generic_usage(false);
- exit(1);
-}
-
-ConfFile *conf_get_conf_file()
-{
- return cf;
-}
-
-void parse_config_options(std::vector<const char*>& args)
-{
- int opt_len = sizeof(config_optionsp)/sizeof(config_option);
- DEFINE_CONF_VARS(NULL);
-
- std::vector<const char*> nargs;
- FOR_EACH_ARG(args) {
- int optn;
-
- for (optn = 0; optn < opt_len; optn++) {
- if (CONF_ARG_EQ("lockdep", '\0')) {
- CONF_SAFE_SET_ARG_VAL(&g_lockdep, OPT_INT);
- } else if (CONF_ARG_EQ(config_optionsp[optn].name,
- config_optionsp[optn].char_option)) {
- if (__isarg || val_pos || config_optionsp[optn].type == OPT_BOOL)
- CONF_SAFE_SET_ARG_VAL(config_optionsp[optn].val_ptr, config_optionsp[optn].type);
- else
- continue;
- } else {
- continue;
- }
- break;
- }
-
- if (optn == opt_len)
- nargs.push_back(args[i]);
- }
-
- env_override(&g_conf.keyring, "CEPH_KEYRING");
- args = nargs;
-}
-
-bool ceph_resolve_file_search(string& filename_list, string& result)
+bool ceph_resolve_file_search(std::string& filename_list, std::string& result)
{
list<string> ls;
get_str_list(filename_list, ls);
}
md_config_t::md_config_t()
+ : cf(NULL)
{
//
// Note: because our md_config_t structure is a global, the memory used to
LOG_TO_STDERR_ALL = 2,
};
+struct ConfFile;
+
struct md_config_t {
md_config_t();
~md_config_t();
+ ConfFile *cf;
+
char *type;
char *id;
char *name;
OPT_ADDR, OPT_U32
} opt_type_t;
-/**
- * command line / environment argument parsing
- */
-void env_to_vec(std::vector<const char*>& args);
-void argv_to_vec(int argc, const char **argv,
- std::vector<const char*>& args);
-void vec_to_argv(std::vector<const char*>& args,
- int& argc, const char **&argv);
-void env_to_deq(std::deque<const char*>& args);
-void argv_to_deq(int argc, const char **argv,
- std::deque<const char*>& args);
-
-void parse_startup_config_options(std::vector<const char*>& args,
- const char *module_type, int flags);
-void parse_config_options(std::vector<const char*>& args);
-void parse_config_option_string(string& s);
-
-extern bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec);
-
-void generic_server_usage();
-void generic_client_usage();
-void generic_usage();
-
-class ConfFile;
-ConfFile *conf_get_conf_file();
-
char *conf_post_process_val(const char *val);
int conf_read_key(const char *alt_section, const char *key, opt_type_t type, void *out, void *def, bool free_old_val = false);
bool conf_set_conf_val(void *field, opt_type_t type, const char *val);
#define CONF_ARG_EQ(str_cmd, char_cmd) \
conf_cmd_equals(args[i], str_cmd, char_cmd, &val_pos)
-#define DEFINE_CONF_VARS(usage_func) \
- unsigned int val_pos __attribute__((unused)); \
- void (*args_usage)() __attribute__((unused)) = usage_func; \
- bool __isarg __attribute__((unused))
+struct config_option {
+ const char *section;
+ const char *conf_name;
+ const char *name;
+ void *val_ptr;
+ const char *def_str;
+ long long def_longlong;
+ double def_double;
+
+ opt_type_t type;
+ char char_option; // if any
+};
-#define FOR_EACH_ARG(args) \
- __isarg = 1 < args.size(); \
- for (unsigned i=0; i<args.size(); i++, __isarg = i+1 < args.size())
+extern struct config_option config_optionsp[];
+extern const int num_config_options;
-#define ARGS_USAGE() args_usage();
+extern bool parse_config_file(ConfFile *cf, bool auto_update);
#include "common/debug.h"
#include "common/Timer.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#include "include/color.h"
#include "common/errno.h"
#include "config.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "crush/CrushWrapper.h"
#include "crush/grammar.h"
#include "common/Timer.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#ifndef DARWIN
#include <envz.h>
#include "common/Timer.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#ifndef DARWIN
#include <envz.h>
#include <iostream>
//#include "ebofs/Ebofs.h"
#include "os/FileStore.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include <ext/hash_map>
#include <fcntl.h>
#include <iostream>
+#include "common/ceph_argparse.h"
#include "common/Mutex.h"
#include "messages/MMonMap.h"
#include "common/common_init.h"
#define __STDC_FORMAT_MACROS
#include "config.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "include/rados/librados.h"
#include "msg/SimpleMessenger.h"
+#include "common/ceph_argparse.h"
#include "common/Timer.h"
#include "common/common_init.h"
#include "config.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#include "common/Cond.h"
#include "include/rbd/librbd.hpp"
#include "include/byteorder.h"
#include "include/types.h"
#include "common/Clock.h"
#include "common/signal.h"
+#include "common/ceph_argparse.h"
#include "msg/Messenger.h"
#include "mon/MonClient.h"
#include "messages/MMonSubscribe.h"
#include "messages/MMonSubscribeAck.h"
#include "common/ConfUtils.h"
+#include "common/ceph_argparse.h"
#include "MonClient.h"
#include "MonMap.h"
#include "messages/MAuthReply.h"
+#include "common/ceph_argparse.h"
#include "common/Timer.h"
#include "common/Clock.h"
#include "include/color.h"
using namespace std;
#include "config.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "mon/MonMap.h"
#include "OSDMap.h"
#include "Watch.h"
+#include "common/ceph_argparse.h"
#include "os/FileStore.h"
#ifdef USE_OSBDB
#include "common/errno.h"
#include "osd/OSDMap.h"
#include "mon/MonMap.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
void usage()
#include "osdc/rados_bencher.h"
#include "config.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/Cond.h"
#include "mds/inode_backtrace.h"
#include "config.h"
#include "common/errno.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "include/rbd/librbd.hpp"
#include "include/byteorder.h"
#include "config.h"
#include <cryptopp/osrng.h>
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/armor.h"
//#include "ebofs/Ebofs.h"
#include "os/FileStore.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#undef dout_prefix
#define dout_prefix *_dout
* Check your syslog to see what it did.
*/
#include "common/DoutStreambuf.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "config.h"
* Test the Ceph signal handlers
*/
#include "common/DoutStreambuf.h"
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/errno.h"
#include "config.h"
+#include "common/ceph_argparse.h"
#include "common/Mutex.h"
#include "common/Timer.h"
#include "common/common_init.h"
#include <iostream>
//#include "ebofs/Ebofs.h"
+#include "common/ceph_argparse.h"
#include "os/FileStore.h"
#include "common/common_init.h"
#include "common/Timer.h"
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#ifndef DARWIN
#include <envz.h>
*
*/
+#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/errno.h"
#include "common/safe_io.h"
*/
#include "common/common_init.h"
+#include "common/ceph_argparse.h"
#include "config.h"
#include "tools/common.h"
projects / ceph.git / commitdiff