--- src/slon/misc.h.orig Sat Oct 28 05:10:57 2006 +++ src/slon/misc.h Wed Apr 4 10:28:47 2007 @@ -34,6 +34,13 @@ #undef send #endif +/* Adjustment windows */ +#ifdef WIN32 +#define sleep(x) Sleep(x*1000) +#define strtoll(x,y,z) (__int64) strtol(x,y,z) +#define strncasecmp(x,y,z) strnicmp(x,y,z) +#endif + /* * Local Variables: * tab-width: 4 --- src/slon/confoptions.h.orig Sat Oct 28 05:10:57 2006 +++ src/slon/confoptions.h Wed Apr 4 10:28:47 2007 @@ -97,13 +97,6 @@ const char *default_val; }; - - -static struct config_int ConfigureNamesInt[]; -static struct config_bool ConfigureNamesBool[]; -static struct config_real ConfigureNamesReal[]; -static struct config_string ConfigureNamesString[]; - #endif /* * Local Variables: --- src/slon/confoptions.c.orig Wed Jan 3 05:16:58 2007 +++ src/slon/confoptions.c Wed Apr 4 10:28:47 2007 @@ -21,122 +21,431 @@ double real_placeholder; char *string_placeholder; - - -void -build_conf_variables(void) +static struct config_int ConfigureNamesInt[] = { - int size_vars; - int num_vars = 0; - struct config_generic **conf_vars; - int i; - - for (i = 0; ConfigureNamesBool[i].gen.name; i++) { - struct config_bool *conf = &ConfigureNamesBool[i]; - - /* - * Rather than requiring vartype to be filled in by hand, do this: - */ - conf->gen.vartype = SLON_C_BOOL; - num_vars++; - } - - for (i = 0; ConfigureNamesInt[i].gen.name; i++) + { + (const char *)"vac_frequency", /* conf name */ + gettext_noop("Sets how many cleanup cycles to run before a vacuum is done"), /* short desc */ + gettext_noop("Sets how many cleanup cycles to run before a vacuum is done"), /* long desc */ + SLON_C_INT /* config type */ + }, + &vac_frequency, /* var name */ + 3, /* default val */ + 0, /* min val */ + 100 /* max val */ + }, { - struct config_int *conf = &ConfigureNamesInt[i]; - - conf->gen.vartype = SLON_C_INT; - num_vars++; - } - - for (i = 0; ConfigureNamesReal[i].gen.name; i++) + { + (const char *)"log_level", + gettext_noop("debug log level"), + gettext_noop("debug log level"), + SLON_C_INT + }, + &slon_log_level, + 2, + 0, + 4 + }, { - struct config_real *conf = &ConfigureNamesReal[i]; - - conf->gen.vartype = SLON_C_REAL; - num_vars++; - } - - for (i = 0; ConfigureNamesString[i].gen.name; i++) + { + (const char *)"sync_interval", + gettext_noop("sync event interval"), + gettext_noop("sync event interval in ms"), + SLON_C_INT + }, + &sync_interval, + 2000, + 10, + 60000 + }, { - struct config_string *conf = &ConfigureNamesString[i]; - - conf->gen.vartype = SLON_C_STRING; - num_vars++; - } - - size_vars = num_vars + num_vars / 4; - - conf_vars = (struct config_generic **) malloc(size_vars * sizeof(struct config_generic *)); - if (conf_vars == NULL) + { + (const char *)"sync_interval_timeout", + gettext_noop("sync interval time out"), + gettext_noop("sync interval time out"), + SLON_C_INT + }, + &sync_interval_timeout, + 10000, + 0, + 1200000 + }, { - slon_log(SLON_FATAL, "malloc failed"); - return; - } - num_vars = 0; - - for (i = 0; ConfigureNamesBool[i].gen.name; i++) + { + (const char *)"sync_group_maxsize", + gettext_noop("sync group"), + gettext_noop("sync group"), + SLON_C_INT + }, + &sync_group_maxsize, + 20, + 0, + 10000 + }, { - conf_vars[num_vars++] = &ConfigureNamesBool[i].gen; - } - for (i = 0; ConfigureNamesInt[i].gen.name; i++) + { + (const char *)"desired_sync_time", + gettext_noop("maximum time planned for grouped SYNCs"), + gettext_noop("If replication is behind, slon will try to increase numbers of " + "syncs done targetting that they should take this quantity of " + "time to process"), + SLON_C_INT + }, + &desired_sync_time, + 60000, + 0, + 6000000 + }, +#ifdef HAVE_SYSLOG { - conf_vars[num_vars++] = &ConfigureNamesInt[i].gen; - } - for (i = 0; ConfigureNamesReal[i].gen.name; i++) + { + (const char *)"syslog", + gettext_noop("Uses syslog for logging."), + gettext_noop("If this parameter is 1, messages go both to syslog " + "and the standard output. A value of 2 sends output only to syslog. " + "(Some messages will still go to the standard output/error.) The " + "default is 0, which means syslog is off."), + SLON_C_INT + }, + &Use_syslog, + 0, + 0, + 2 + }, +#endif { - conf_vars[num_vars++] = &ConfigureNamesReal[i].gen; - } - for (i = 0; ConfigureNamesString[i].gen.name; i++) + { + (const char *)"quit_sync_provider", + gettext_noop("Node to watch for a final SYNC"), + gettext_noop("We want to terminate slon when the worker thread reaches a certain SYNC number " + "against a certain provider. This is the provider... "), + SLON_C_INT + }, + &quit_sync_provider, + 0, + 0, + 2147483647 + }, { - conf_vars[num_vars++] = &ConfigureNamesString[i].gen; - } - - if (conf_variables) + { + (const char *)"quit_sync_finalsync", + gettext_noop("SYNC number at which slon should abort"), + gettext_noop("We want to terminate slon when the worker thread reaches a certain SYNC number " + "against a certain provider. This is the SYNC number... "), + SLON_C_INT + }, + &quit_sync_finalsync, + 0, + 0, + 2147483647 + }, { - free(conf_variables); - } - conf_variables = conf_vars; - num_conf_variables = num_vars; - size_conf_variables = size_vars; - qsort((void *)conf_variables, num_conf_variables, sizeof(struct config_generic *), conf_var_compare); -} - + { + (const char *)"sync_max_rowsize", /* conf name */ + gettext_noop("sl_log_? rows larger than that are read separately"), /* short desc */ + gettext_noop("sl_log_? rows larger than that are read separately"), /* long desc */ + SLON_C_INT /* config type */ + }, + &sync_max_rowsize, /* var name */ + 8192, /* default val */ + 1024, /* min val */ + 32768 /* max val */ + }, + { + { + (const char *)"sync_max_largemem", /* conf name */ + gettext_noop("How much memory to allow for sl_log_? rows exceeding sync_max_rowsize"), /* short desc */ + gettext_noop("How much memory to allow for sl_log_? rows exceeding sync_max_rowsize"), /* long desc */ + SLON_C_INT /* config type */ + }, + &sync_max_largemem, /* var name */ + 5242880, /* default val */ + 1048576, /* min val */ + 1073741824 /* max val */ + }, + {{0}} +}; -#ifdef NEED_ADD_CONF_VARIABLE -static bool -add_conf_variable(struct config_generic * var, int elevel) +static struct config_bool ConfigureNamesBool[] = { - if (num_conf_variables + 1 >= size_conf_variables) { - /* - * Increase the vector by 25% - */ - int size_vars = size_conf_variables + size_conf_variables / 4; - struct config_generic **conf_vars; - - if (size_vars == 0) { - size_vars = 100; - conf_vars = (struct config_generic **) - malloc(size_vars * sizeof(struct config_generic *)); - } - else + (const char *)"log_pid", /* conf name */ + gettext_noop("place holder"), /* short desc */ + gettext_noop("place holder"), /* long desc */ + SLON_C_BOOL /* config type */ + }, + &logpid, /* var_name */ + false /* default_value */ + }, + { { - conf_vars = (struct config_generic **) - realloc(conf_variables, size_vars * sizeof(struct config_generic *)); - } + (const char *)"log_timestamp", + gettext_noop("place holder"), + gettext_noop("place holder"), + SLON_C_BOOL + }, + &logtimestamp, + true + }, - if (conf_vars == NULL) + {{0}} +}; + +static struct config_real ConfigureNamesReal[] = +{ + { { - slon_log(elevel, "malloc failed"); - return false; /* out of memory */ - } - conf_variables = conf_vars; - size_conf_variables = size_vars; - } - conf_variables[num_conf_variables++] = var; + (const char *)"real_placeholder", /* conf name */ + gettext_noop("place holder"), /* short desc */ + gettext_noop("place holder"), /* long desc */ + SLON_C_REAL /* config type */ + }, + &real_placeholder, /* var_name */ + 0.0, /* default val */ + 0.0, /* min_value */ + 1.0 /* max value */ + }, + {{0}} +}; + +static struct config_string ConfigureNamesString[] = +{ + { + { + (const char *)"cluster_name", /* conf name */ + gettext_noop("Name of the replication cluster"), /* short desc */ + NULL, /* long desc */ + SLON_C_STRING /* config type */ + }, + &rtcfg_cluster_name, /* var_name */ + NULL /* default value */ + }, + { + { + (const char *)"conn_info", + gettext_noop("connection info string"), + NULL, + SLON_C_STRING + }, + &rtcfg_conninfo, + NULL + }, + { + { + (const char *)"pid_file", + gettext_noop("Where to write the pid file"), + NULL, + SLON_C_STRING + }, + &pid_file, + NULL + }, + { + { + (const char *)"log_timestamp_format", + gettext_noop("A strftime()-style log timestamp format string."), + NULL, + SLON_C_STRING + }, + &log_timestamp_format, + "%Y-%m-%d %H:%M:%S %Z" + }, + { + { + (const char *)"archive_dir", + gettext_noop("Where to drop the sync archive files"), + NULL, + SLON_C_STRING + }, + &archive_dir, + NULL + }, + { + { + (const char *)"sql_on_connection", + gettext_noop("SQL to send to each connected node upon " + "connection establishment, useful to enable " + "duration logging, or to adjust any other " + "connection settable GUC"), + NULL, + SLON_C_STRING + }, + &sql_on_connection, + NULL + }, + + + { + { + (const char *)"lag_interval", + gettext_noop("A PostgreSQL value compatible with ::interval " + "which indicates how far behind this node should " + "lag its providers."), + NULL, + SLON_C_STRING + }, + &lag_interval, + NULL + }, + + { + { + (const char *)"command_on_logarchive", + gettext_noop("Command to run (probably a shell script) " + "every time a log archive is committed. " + "This command will be passed one parameter: " + "The full pathname of the archive file" + ), + NULL, + SLON_C_STRING + }, + &command_on_logarchive, + NULL + }, + + +#ifdef HAVE_SYSLOG + { + { + (const char *)"syslog_facility", + gettext_noop("Sets the syslog \"facility\" to be used when syslog enabled."), + gettext_noop("Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, " + "LOCAL4, LOCAL5, LOCAL6, LOCAL7."), + SLON_C_STRING + }, + &Syslog_facility, + "LOCAL0" + }, + { + { + (const char *)"syslog_ident", + gettext_noop("Sets the program name used to identify slon messages in syslog."), + NULL, + SLON_C_STRING + }, + &Syslog_ident, + "slon" + }, +#endif + {{0}} +}; + +void +build_conf_variables(void) +{ + int size_vars; + int num_vars = 0; + struct config_generic **conf_vars; + int i; + + for (i = 0; ConfigureNamesBool[i].gen.name; i++) + { + struct config_bool *conf = &ConfigureNamesBool[i]; + + /* + * Rather than requiring vartype to be filled in by hand, do this: + */ + conf->gen.vartype = SLON_C_BOOL; + num_vars++; + } + + for (i = 0; ConfigureNamesInt[i].gen.name; i++) + { + struct config_int *conf = &ConfigureNamesInt[i]; + + conf->gen.vartype = SLON_C_INT; + num_vars++; + } + + for (i = 0; ConfigureNamesReal[i].gen.name; i++) + { + struct config_real *conf = &ConfigureNamesReal[i]; + + conf->gen.vartype = SLON_C_REAL; + num_vars++; + } + + for (i = 0; ConfigureNamesString[i].gen.name; i++) + { + struct config_string *conf = &ConfigureNamesString[i]; + + conf->gen.vartype = SLON_C_STRING; + num_vars++; + } + + size_vars = num_vars + num_vars / 4; + + conf_vars = (struct config_generic **) malloc(size_vars * sizeof(struct config_generic *)); + if (conf_vars == NULL) + { + slon_log(SLON_FATAL, "malloc failed"); + return; + } + num_vars = 0; + + for (i = 0; ConfigureNamesBool[i].gen.name; i++) + { + conf_vars[num_vars++] = &ConfigureNamesBool[i].gen; + } + for (i = 0; ConfigureNamesInt[i].gen.name; i++) + { + conf_vars[num_vars++] = &ConfigureNamesInt[i].gen; + } + for (i = 0; ConfigureNamesReal[i].gen.name; i++) + { + conf_vars[num_vars++] = &ConfigureNamesReal[i].gen; + } + for (i = 0; ConfigureNamesString[i].gen.name; i++) + { + conf_vars[num_vars++] = &ConfigureNamesString[i].gen; + } + + if (conf_variables) + { + free(conf_variables); + } + conf_variables = conf_vars; + num_conf_variables = num_vars; + size_conf_variables = size_vars; + qsort((void *)conf_variables, num_conf_variables, sizeof(struct config_generic *), conf_var_compare); +} + + +#ifdef NEED_ADD_CONF_VARIABLE +static bool +add_conf_variable(struct config_generic * var, int elevel) +{ + if (num_conf_variables + 1 >= size_conf_variables) + { + /* + * Increase the vector by 25% + */ + int size_vars = size_conf_variables + size_conf_variables / 4; + struct config_generic **conf_vars; + + if (size_vars == 0) + { + size_vars = 100; + conf_vars = (struct config_generic **) + malloc(size_vars * sizeof(struct config_generic *)); + } + else + { + conf_vars = (struct config_generic **) + realloc(conf_variables, size_vars * sizeof(struct config_generic *)); + } + + if (conf_vars == NULL) + { + slon_log(elevel, "malloc failed"); + return false; /* out of memory */ + } + conf_variables = conf_vars; + size_conf_variables = size_vars; + } + conf_variables[num_conf_variables++] = var; qsort((void *)conf_variables, num_conf_variables, sizeof(struct config_generic *), conf_var_compare); return true; @@ -533,317 +842,6 @@ } return true; } - -static struct config_int ConfigureNamesInt[] = -{ - { - { - (const char *)"vac_frequency", /* conf name */ - gettext_noop("Sets how many cleanup cycles to run before a vacuum is done"), /* short desc */ - gettext_noop("Sets how many cleanup cycles to run before a vacuum is done"), /* long desc */ - SLON_C_INT /* config type */ - }, - &vac_frequency, /* var name */ - 3, /* default val */ - 0, /* min val */ - 100 /* max val */ - }, - { - { - (const char *)"log_level", - gettext_noop("debug log level"), - gettext_noop("debug log level"), - SLON_C_INT - }, - &slon_log_level, - 2, - 0, - 4 - }, - { - { - (const char *)"sync_interval", - gettext_noop("sync event interval"), - gettext_noop("sync event interval in ms"), - SLON_C_INT - }, - &sync_interval, - 2000, - 10, - 60000 - }, - { - { - (const char *)"sync_interval_timeout", - gettext_noop("sync interval time out"), - gettext_noop("sync interval time out"), - SLON_C_INT - }, - &sync_interval_timeout, - 10000, - 0, - 1200000 - }, - { - { - (const char *)"sync_group_maxsize", - gettext_noop("sync group"), - gettext_noop("sync group"), - SLON_C_INT - }, - &sync_group_maxsize, - 20, - 0, - 10000 - }, - { - { - (const char *)"desired_sync_time", - gettext_noop("maximum time planned for grouped SYNCs"), - gettext_noop("If replication is behind, slon will try to increase numbers of " - "syncs done targetting that they should take this quantity of " - "time to process"), - SLON_C_INT - }, - &desired_sync_time, - 60000, - 0, - 6000000 - }, -#ifdef HAVE_SYSLOG - { - { - (const char *)"syslog", - gettext_noop("Uses syslog for logging."), - gettext_noop("If this parameter is 1, messages go both to syslog " - "and the standard output. A value of 2 sends output only to syslog. " - "(Some messages will still go to the standard output/error.) The " - "default is 0, which means syslog is off."), - SLON_C_INT - }, - &Use_syslog, - 0, - 0, - 2 - }, -#endif - { - { - (const char *)"quit_sync_provider", - gettext_noop("Node to watch for a final SYNC"), - gettext_noop("We want to terminate slon when the worker thread reaches a certain SYNC number " - "against a certain provider. This is the provider... "), - SLON_C_INT - }, - &quit_sync_provider, - 0, - 0, - 2147483647 - }, - { - { - (const char *)"quit_sync_finalsync", - gettext_noop("SYNC number at which slon should abort"), - gettext_noop("We want to terminate slon when the worker thread reaches a certain SYNC number " - "against a certain provider. This is the SYNC number... "), - SLON_C_INT - }, - &quit_sync_finalsync, - 0, - 0, - 2147483647 - }, - { - { - (const char *)"sync_max_rowsize", /* conf name */ - gettext_noop("sl_log_? rows larger than that are read separately"), /* short desc */ - gettext_noop("sl_log_? rows larger than that are read separately"), /* long desc */ - SLON_C_INT /* config type */ - }, - &sync_max_rowsize, /* var name */ - 8192, /* default val */ - 1024, /* min val */ - 32768 /* max val */ - }, - { - { - (const char *)"sync_max_largemem", /* conf name */ - gettext_noop("How much memory to allow for sl_log_? rows exceeding sync_max_rowsize"), /* short desc */ - gettext_noop("How much memory to allow for sl_log_? rows exceeding sync_max_rowsize"), /* long desc */ - SLON_C_INT /* config type */ - }, - &sync_max_largemem, /* var name */ - 5242880, /* default val */ - 1048576, /* min val */ - 1073741824 /* max val */ - }, - {{0}} -}; - -static struct config_bool ConfigureNamesBool[] = -{ - { - { - (const char *)"log_pid", /* conf name */ - gettext_noop("place holder"), /* short desc */ - gettext_noop("place holder"), /* long desc */ - SLON_C_BOOL /* config type */ - }, - &logpid, /* var_name */ - false /* default_value */ - }, - { - { - (const char *)"log_timestamp", - gettext_noop("place holder"), - gettext_noop("place holder"), - SLON_C_BOOL - }, - &logtimestamp, - true - }, - - {{0}} -}; - -static struct config_real ConfigureNamesReal[] = -{ - { - { - (const char *)"real_placeholder", /* conf name */ - gettext_noop("place holder"), /* short desc */ - gettext_noop("place holder"), /* long desc */ - SLON_C_REAL /* config type */ - }, - &real_placeholder, /* var_name */ - 0.0, /* default val */ - 0.0, /* min_value */ - 1.0 /* max value */ - }, - {{0}} -}; - -static struct config_string ConfigureNamesString[] = -{ - { - { - (const char *)"cluster_name", /* conf name */ - gettext_noop("Name of the replication cluster"), /* short desc */ - NULL, /* long desc */ - SLON_C_STRING /* config type */ - }, - &rtcfg_cluster_name, /* var_name */ - NULL /* default value */ - }, - { - { - (const char *)"conn_info", - gettext_noop("connection info string"), - NULL, - SLON_C_STRING - }, - &rtcfg_conninfo, - NULL - }, - { - { - (const char *)"pid_file", - gettext_noop("Where to write the pid file"), - NULL, - SLON_C_STRING - }, - &pid_file, - NULL - }, - { - { - (const char *)"log_timestamp_format", - gettext_noop("A strftime()-style log timestamp format string."), - NULL, - SLON_C_STRING - }, - &log_timestamp_format, - "%Y-%m-%d %H:%M:%S %Z" - }, - { - { - (const char *)"archive_dir", - gettext_noop("Where to drop the sync archive files"), - NULL, - SLON_C_STRING - }, - &archive_dir, - NULL - }, - { - { - (const char *)"sql_on_connection", - gettext_noop("SQL to send to each connected node upon " - "connection establishment, useful to enable " - "duration logging, or to adjust any other " - "connection settable GUC"), - NULL, - SLON_C_STRING - }, - &sql_on_connection, - NULL - }, - - - { - { - (const char *)"lag_interval", - gettext_noop("A PostgreSQL value compatible with ::interval " - "which indicates how far behind this node should " - "lag its providers."), - NULL, - SLON_C_STRING - }, - &lag_interval, - NULL - }, - - { - { - (const char *)"command_on_logarchive", - gettext_noop("Command to run (probably a shell script) " - "every time a log archive is committed. " - "This command will be passed one parameter: " - "The full pathname of the archive file" - ), - NULL, - SLON_C_STRING - }, - &command_on_logarchive, - NULL - }, - - -#ifdef HAVE_SYSLOG - { - { - (const char *)"syslog_facility", - gettext_noop("Sets the syslog \"facility\" to be used when syslog enabled."), - gettext_noop("Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, " - "LOCAL4, LOCAL5, LOCAL6, LOCAL7."), - SLON_C_STRING - }, - &Syslog_facility, - "LOCAL0" - }, - { - { - (const char *)"syslog_ident", - gettext_noop("Sets the program name used to identify slon messages in syslog."), - NULL, - SLON_C_STRING - }, - &Syslog_ident, - "slon" - }, -#endif - {{0}} -}; /* * Local Variables: