/* file_appender - a dumb log appender which simply prints to a file */
-/* Copyright (c) 2007-2020. The SimGrid Team.
+/* Copyright (c) 2007-2022. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <cerrno>
#include <cstdio>
#include <cstring>
+#include <string>
static void append_file(const s_xbt_log_appender_t* this_, const char* str)
{
xbt_log_appender_t xbt_log_appender_stream(FILE* f)
{
- xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
- res->do_append = &append_file;
- res->free_ = nullptr;
- res->data = static_cast<void*>(f);
+ auto* res = xbt_new0(s_xbt_log_appender_t, 1);
+ res->do_append = &append_file;
+ res->free_ = nullptr;
+ res->data = static_cast<void*>(f);
return res;
}
{
if (arg == nullptr)
return xbt_log_appender_stream(stderr);
- xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
- res->do_append = &append_file;
- res->free_ = &free_;
- res->data = static_cast<void*>(fopen(arg, "w"));
- if (res->data == nullptr)
- xbt_die("Cannot open file: %s: %s", arg, strerror(errno));
+ auto* res = xbt_new0(s_xbt_log_appender_t, 1);
+ res->do_append = &append_file;
+ res->free_ = &free_;
+ res->data = static_cast<void*>(fopen(arg, "w"));
+ xbt_assert(res->data != nullptr, "Cannot open file: %s: %s", arg, strerror(errno));
return res;
}
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 ";
static void open_append2_file(xbt_log_append2_file_t data){
if(data->count<0) {
//Roll
- if (!data->file) {
+ if (not data->file) {
data->file= fopen(data->filename, "w");
- if (data->file == nullptr)
- xbt_die("Cannot open file: %s: %s", data->filename, strerror(errno));
+ xbt_assert(data->file != nullptr, "Cannot open file: %s: %s", data->filename, strerror(errno));
} else {
fputs(APPEND2_END_TOKEN_CLEAR,data->file);
fseek(data->file,0,SEEK_SET);
//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);
+ std::string newname = data->filename;
+ size_t sep = std::min(newname.find_first_of('%'), newname.size());
+ newname.replace(sep, 1, std::to_string(data->count));
data->count++;
- data->file= fopen(newname, "w");
- if (data->file == nullptr)
- xbt_die("Cannot open file: %s: %s", newname, strerror(errno));
- xbt_free(pre);
+ data->file = fopen(newname.c_str(), "w");
+ xbt_assert(data->file != nullptr, "Cannot open file: %s: %s", newname.c_str(), strerror(errno));
}
}
static void append2_file(const s_xbt_log_appender_t* this_, const char* str)
{
- xbt_log_append2_file_t d = (xbt_log_append2_file_t)this_->data;
+ 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);
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);
//For split, replace % in the file by the current count
xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int roll)
{
- xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
- res->do_append = &append2_file;
- res->free_ = &free_append2_;
- xbt_log_append2_file_t data = xbt_new0(struct xbt_log_append2_file_s, 1);
+ auto* res = xbt_new0(s_xbt_log_appender_t, 1);
+ res->do_append = &append2_file;
+ res->free_ = &free_append2_;
+ auto* data = xbt_new0(struct xbt_log_append2_file_s, 1);
xbt_assert(arg);
char* buf=xbt_strdup(arg);
char* sep=strchr(buf,':');