#include "src/internal_config.h"
#include "xbt/sysdep.h"
#include "src/xbt/log_private.h"
-#if HAVE_SMPI
-#include "src/smpi/private.h" // to access bench_begin/end. Not ultraclean, I confess
-#endif
#include <stdio.h>
static void append_file(xbt_log_appender_t this_, char *str) {
fclose(this_->data);
}
-#if HAVE_SMPI
-void __smpi_bench_dont (void); // Stupid prototype
-void __smpi_bench_dont (void) { /* I'm only a place-holder in case we link without SMPI */; }
-void smpi_bench_begin(void) __attribute__ ((weak, alias ("__smpi_bench_dont")));
-void smpi_bench_end(void) __attribute__ ((weak, alias ("__smpi_bench_dont")));
-#endif
-
XBT_LOG_EXTERNAL_CATEGORY(smpi); // To detect if SMPI is inited
xbt_log_appender_t xbt_log_appender_file_new(char *arg) {
xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
if (_XBT_LOGV(smpi).initialized) // HACK to detect if we run in SMPI mode. Relies on MAIN__ source disposition
- res->do_append = smpi_append_file;
+ res->do_append = &smpi_append_file;
else
- res->do_append = append_file;
- res->free_ = free_;
+ res->do_append = &append_file;
+ res->free_ = &free_;
if (arg)
res->data = (void *) fopen(arg, "w");
else
#define APPEND2_END_TOKEN_CLEAR "\n "
static void open_append2_file(xbt_log_append2_file_t data){
- if(data->count<0)
- {
+ if(data->count<0) {
//Roll
if(!data->file)
data->file= fopen(data->filename, "w");
fputs(APPEND2_END_TOKEN_CLEAR,data->file);
fseek(data->file,0,SEEK_SET);
}
- }
- else{
+ } else{
//printf("Splitting\n");
//Split
if(data->file)
data->count++;
data->file= fopen(newname, "w");
xbt_assert(data->file);
-
}
}
-
-
-
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)
- {
+ 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);
+ fputs(APPEND2_END_TOKEN,d->file);
+ fseek(d->file,-((signed long)strlen(APPEND2_END_TOKEN)),SEEK_CUR);
}
}
xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
if (_XBT_LOGV(smpi).initialized) // HACK to detect if we run in SMPI mode. Relies on MAIN__ source disposition
- res->do_append = smpi_append2_file;
+ res->do_append = &smpi_append2_file;
else
- res->do_append = append2_file;
- res->free_ = free_append2_;
+ res->do_append = &append2_file;
+ res->free_ = &free_append2_;
xbt_log_append2_file_t data = xbt_new0(struct xbt_log_append2_file_s, 1);
xbt_assert(arg);
char* buf=xbt_strdup(arg);
res->data = data;
return res;
}
-