Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flush_output global variable #149

Merged
merged 17 commits into from
Nov 14, 2023
Merged

Add flush_output global variable #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
35870b4
Patch mysql and distutils (#123)
Thistleman Oct 13, 2023
dc0aa13
Fix mdb2glm converter autotest intermittent failures (#132)
MitchellAV Oct 13, 2023
fa098e5
Fix install m1 (#134)
Thistleman Oct 14, 2023
19950ce
Fix mysql build warnings (#136)
Oct 16, 2023
ca63e1c
Mysql bugfix (#137)
Thistleman Oct 16, 2023
f0bd83e
Update gridlabd-contributors (#141)
Oct 17, 2023
cf68e5a
Fix inconsistency with cyme xy coordinate autotest (#139)
MitchellAV Oct 17, 2023
fab4c1c
Update convert.cpp (#144)
Oct 31, 2023
4a37476
Update convert.cpp (#147)
Nov 13, 2023
1d1bc9e
Update cmdarg.cpp (#148)
Nov 14, 2023
3e8b8b4
Add global flush output
dchassin Nov 14, 2023
089b321
Update database.cpp
dchassin Nov 14, 2023
5248bfe
Update gridlabd-version
dchassin Nov 14, 2023
e455ca8
Update convert.cpp (#147)
Nov 13, 2023
ddbb2a2
Update convert.cpp (#147)
Nov 13, 2023
a9bea40
Update convert.cpp (#147)
Nov 13, 2023
6bf21be
Merge branch 'develop' into develop-add-flush-global
Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions module/mysql/database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 1 addition & 0 deletions source/globals.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};

Expand Down
4 changes: 4 additions & 0 deletions source/globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion source/output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion subcommands/gridlabd-version
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down