diff --git a/module/mysql/database.cpp b/module/mysql/database.cpp index 7f20fc501..d8b2061f8 100644 --- a/module/mysql/database.cpp +++ b/module/mysql/database.cpp @@ -379,16 +379,16 @@ char *database::get_sqldata(char *buffer, size_t size, gld_property &prop, gld_u default: return NULL; } - char tmp[65536]; - if ( prop.to_string(tmp,sizeof(tmp)) < (int)size ) - { - snprintf(buffer,size,"'%s'",tmp); - } - else - { - snprintf(buffer,size,"NULL"); - } - return buffer; + // char tmp[65536]; + // if ( prop.to_string(tmp,sizeof(tmp)) < (int)size ) + // { + // snprintf(buffer,size,"'%s'",tmp); + // } + // else + // { + // snprintf(buffer,size,"NULL"); + // } + // return buffer; } void database::start_transaction(void) { diff --git a/source/globals.cpp b/source/globals.cpp index 5e591f9d5..f1095fdaf 100644 --- a/source/globals.cpp +++ b/source/globals.cpp @@ -529,6 +529,7 @@ DEPRECATED static struct s_varmap { {"organization",PT_char32, &global_organization,PA_PUBLIC,"organization name"}, {"profile_output_format",PT_set,&global_profile_output_format,PA_PUBLIC,"profiler output data format"}, {"maximum_runtime",PT_int64,&global_maximum_runtime,PA_PUBLIC,"maximum wall clock runtime allowed"}, + {"flush_output",PT_int32,&global_flush_output,PA_PUBLIC,"flush output buffers continuously"}, /* add new global variables here */ }; diff --git a/source/globals.h b/source/globals.h index 2b5e62a13..7b7e2bb48 100644 --- a/source/globals.h +++ b/source/globals.h @@ -856,8 +856,12 @@ GLOBAL int64 global_rusage_rate INIT(0); /* Variable: global_rusage_file */ GLOBAL char1024 global_rusage_file INIT("gridlabd-rusage.csv"); +/* Variable: global_rusage_data */ GLOBAL char1024 global_rusage_data INIT("{}"); +/* Variable: global_flush_output */ +GLOBAL int32 global_flush_output INIT(0); + /* Type: PROFILEOUTPUTFORMAT */ typedef enum { diff --git a/source/output.cpp b/source/output.cpp index 12ac1f21e..3e3a86704 100644 --- a/source/output.cpp +++ b/source/output.cpp @@ -38,7 +38,7 @@ static LOCKVAR output_lock = 0; static char buffer[65536]; #define CHECK 0xcdcd int overflow=CHECK; -int flush = 0; +int &flush = global_flush_output; bool output_enable_flush(bool enable) { diff --git a/subcommands/gridlabd-version b/subcommands/gridlabd-version index b1af8829f..3aef50207 100755 --- a/subcommands/gridlabd-version +++ b/subcommands/gridlabd-version @@ -68,7 +68,7 @@ function version-check() # Using curl command to check the version version_check_response=$(curl -sL "https://version.gridlabd.us/?v=${submitversion}&b=${branch}") if [[ $version_check_response != '"ok"' ]]; then - warning "Your version is behind. The latest version information is: $version_check_response" + warning "Your version is outdated. The latest version information is: $version_check_response" exit 0 fi