/* file_appender - a dumb log appender which simply prints to a file */
-/* Copyright (c) 2007-2019. The SimGrid Team.
+/* Copyright (c) 2007-2021. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <cstdio>
#include <cstring>
-static void append_file(xbt_log_appender_t this_, char *str) {
+static void append_file(const s_xbt_log_appender_t* this_, const char* str)
+{
fputs(str, (FILE *) this_->data);
}
-static void free_(xbt_log_appender_t this_)
+static void free_(const s_xbt_log_appender_t* this_)
{
fclose(static_cast<FILE*>(this_->data));
}
int count; //negative for roll
long int limit;
};
-typedef struct xbt_log_append2_file_s* xbt_log_append2_file_t;
+using xbt_log_append2_file_t = xbt_log_append2_file_s*;
static constexpr const char* APPEND2_END_TOKEN = "\n[End of log]\n";
static constexpr const char* APPEND2_END_TOKEN_CLEAR = "\n ";
//Split
if(data->file)
fclose(data->file);
- char newname[512];
char* pre=xbt_strdup(data->filename);
char* sep=strchr(pre,'%');
if(!sep)
sep=pre+strlen(pre);
- char* post=sep+1;
- *sep='\0';
- snprintf(newname,511,"%s%i%s",pre,data->count,post);
+ const char* post = sep + 1;
+ *sep = '\0';
+ std::string newname = pre + std::to_string(data->count) + post;
data->count++;
- data->file= fopen(newname, "w");
+ data->file = fopen(newname.c_str(), "w");
if (data->file == nullptr)
- xbt_die("Cannot open file: %s: %s", newname, strerror(errno));
+ xbt_die("Cannot open file: %s: %s", newname.c_str(), strerror(errno));
xbt_free(pre);
}
}
-static void append2_file(xbt_log_appender_t this_, char *str) {
- xbt_log_append2_file_t d=(xbt_log_append2_file_t) this_->data;
- xbt_assert(d->file);
- if(ftell(d->file)>=d->limit) {
- open_append2_file(d);
- }
- fputs(str, d->file);
- if(d->count<0){
- fputs(APPEND2_END_TOKEN,d->file);
- fseek(d->file,-((signed long)strlen(APPEND2_END_TOKEN)),SEEK_CUR);
- }
+static void append2_file(const s_xbt_log_appender_t* this_, const char* str)
+{
+ auto* d = static_cast<xbt_log_append2_file_t>(this_->data);
+ xbt_assert(d->file);
+ if (ftell(d->file) >= d->limit) {
+ open_append2_file(d);
+ }
+ fputs(str, d->file);
+ if (d->count < 0) {
+ fputs(APPEND2_END_TOKEN, d->file);
+ fseek(d->file, -((signed long)strlen(APPEND2_END_TOKEN)), SEEK_CUR);
+ }
}
-static void free_append2_(xbt_log_appender_t this_)
+static void free_append2_(const s_xbt_log_appender_t* this_)
{
- xbt_log_append2_file_t data = static_cast<xbt_log_append2_file_t>(this_->data);
+ auto* data = static_cast<xbt_log_append2_file_t>(this_->data);
if (data->file)
fclose(data->file);
xbt_free(data->filename);