X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b47ba9d4ca3cdedcd61f4cda5bf031f8660d1c0e..9104957deccc59e0e804215d5db498fabfd40d29:/src/xbt/xbt_log_appender_file.cpp

diff --git a/src/xbt/xbt_log_appender_file.cpp b/src/xbt/xbt_log_appender_file.cpp
index 7d9313e5ab..344dab7e27 100644
--- a/src/xbt/xbt_log_appender_file.cpp
+++ b/src/xbt/xbt_log_appender_file.cpp
@@ -1,6 +1,6 @@
 /* file_appender - a dumb log appender which simply prints to a file        */
 
-/* Copyright (c) 2007-2019. The SimGrid Team.
+/* Copyright (c) 2007-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,31 +9,39 @@
 #include "src/internal_config.h"
 #include "src/xbt/log_private.hpp"
 #include "xbt/sysdep.h"
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
+#include <cerrno>
+#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_) {
-  if (this_->data != stderr)
-    fclose(static_cast<FILE*>(this_->data));
+static void free_(const s_xbt_log_appender_t* this_)
+{
+  fclose(static_cast<FILE*>(this_->data));
 }
 
-xbt_log_appender_t xbt_log_appender_file_new(char *arg) {
+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);
+  return res;
+}
 
+xbt_log_appender_t xbt_log_appender_file_new(const char* arg)
+{
+  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_;
-  if (arg) {
-    res->data = (void *) fopen(arg, "w");
-    if (res->data == NULL)
-      xbt_die("Cannot open file: %s: %s", arg, strerror(errno));
-  } else {
-    res->data = (void *) stderr;
-  }
+  res->data              = static_cast<void*>(fopen(arg, "w"));
+  if (res->data == nullptr)
+    xbt_die("Cannot open file: %s: %s", arg, strerror(errno));
   return res;
 }
 
@@ -45,15 +53,15 @@ struct xbt_log_append2_file_s {
 };
 typedef struct xbt_log_append2_file_s* xbt_log_append2_file_t;
 
-#define APPEND2_END_TOKEN             "\n[End of log]\n"
-#define APPEND2_END_TOKEN_CLEAR "\n                   "
+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) {
       data->file= fopen(data->filename, "w");
-      if (data->file == NULL)
+      if (data->file == nullptr)
         xbt_die("Cannot open file: %s: %s", data->filename, strerror(errno));
     } else {
       fputs(APPEND2_END_TOKEN_CLEAR,data->file);
@@ -73,26 +81,27 @@ static void open_append2_file(xbt_log_append2_file_t data){
     snprintf(newname,511,"%s%i%s",pre,data->count,post);
     data->count++;
     data->file= fopen(newname, "w");
-    if (data->file == NULL)
+    if (data->file == nullptr)
       xbt_die("Cannot open file: %s: %s", newname, 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)
+{
+  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 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);
   if (data->file)
@@ -105,8 +114,8 @@ static void free_append2_(xbt_log_appender_t this_)
 //syntax is  <maxsize>:<filename>
 //If roll is 0, use split files, otherwise, use roll file
 //For split, replace %  in the file by the current count
-xbt_log_appender_t xbt_log_appender2_file_new(char *arg,int roll) {
-
+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_;
@@ -114,7 +123,7 @@ xbt_log_appender_t xbt_log_appender2_file_new(char *arg,int roll) {
   xbt_assert(arg);
   char* buf=xbt_strdup(arg);
   char* sep=strchr(buf,':');
-  xbt_assert(sep != NULL);
+  xbt_assert(sep != nullptr);
   data->filename=xbt_strdup(sep+1);
   *sep='\0';
   char *endptr;