1 files changed, 26 insertions, 48 deletions

diff --git a/erts/emulator/beam/erl_instrument.c b/erts/emulator/beam/erl_instrument.c
index f84c63e7a4..4d4defd8b5 100644
--- a/erts/emulator/beam/erl_instrument.c
+++ b/erts/emulator/beam/erl_instrument.c
@@ -539,7 +539,7 @@ map_stat_free(ErtsAlcType_t n, void *extra, void *ptr)
 
 }
 
-static void dump_memory_map_to_stream(FILE *fp)
+static void dump_memory_map_to_stream(fmtfn_t to, void* to_arg)
 {
     ErtsAlcType_t n;
     MapStatBlock_t *bp;
@@ -551,7 +551,7 @@ static void dump_memory_map_to_stream(FILE *fp)
 
     /* Write header */
 
-    fprintf(fp,
+    erts_cbprintf(to, to_arg,
 	    "{instr_hdr,\n"
 	    " %lu,\n"
 	    " %lu,\n"
@@ -574,7 +574,7 @@ static void dump_memory_map_to_stream(FILE *fp)
 	else
 	    astr = ERTS_ALC_A2AD(ERTS_ALC_A_SYSTEM);
 
-	fprintf(fp,
+	erts_cbprintf(to, to_arg,
 		"%s{%s,%s,%s}%s",
 		(n == ERTS_ALC_N_MIN) ? "" : "  ",
 		ERTS_ALC_N2TD(n),
@@ -583,12 +583,12 @@ static void dump_memory_map_to_stream(FILE *fp)
 		(n == ERTS_ALC_N_MAX) ? "" : ",\n");
     }
 
-    fprintf(fp, "}}.\n");
+    erts_cbprintf(to, to_arg, "}}.\n");
 
     /* Write memory data */
     for (bp = mem_anchor; bp; bp = bp->next) {
 	if (is_internal_pid(bp->pid))
-	    fprintf(fp,
+	    erts_cbprintf(to, to_arg,
 		    "{%lu, %lu, %lu, {%lu,%lu,%lu}}.\n",
 		    (UWord) bp->type_no,
 		    (UWord) bp->mem,
@@ -597,7 +597,7 @@ static void dump_memory_map_to_stream(FILE *fp)
 		    (UWord) pid_number(bp->pid),
 		    (UWord) pid_serial(bp->pid));
 	else
-	    fprintf(fp,
+	    erts_cbprintf(to, to_arg,
 		    "{%lu, %lu, %lu, undefined}.\n",
 		    (UWord) bp->type_no,
 		    (UWord) bp->mem,
@@ -608,40 +608,29 @@ static void dump_memory_map_to_stream(FILE *fp)
 	erts_mtx_unlock(&instr_mutex);
 }
 
-int erts_instr_dump_memory_map_to_fd(int fd)
+int erts_instr_dump_memory_map_to(fmtfn_t to, void* to_arg)
 {
-    char buf[BUFSIZ];
-    FILE *f;
-
     if (!erts_instr_memory_map)
 	return 0;
 
-    f = fdopen(fd, "w");
-    if (f == NULL)
-	return 0;
-
-    /* Avoid allocating memory; we may have run out of it at this point. */
-    setbuf(f, buf);
-
-    dump_memory_map_to_stream(f);
-    fflush(f);
+    dump_memory_map_to_stream(to, to_arg);
     return 1;
 }
 
 int erts_instr_dump_memory_map(const char *name)
 {
-    FILE *f;
+    int fd;
 
     if (!erts_instr_memory_map)
 	return 0;
 
-    f = fopen(name, "w");
-    if (f == NULL)
+    fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0640);
+    if (fd < 0)
 	return 0;
 
-    dump_memory_map_to_stream(f);
+    dump_memory_map_to_stream(erts_write_fd, (void*)&fd);
 
-    fclose(f);
+    close(fd);
     return 1;
 }
 
@@ -998,19 +987,19 @@ erts_instr_get_stat(Process *proc, Eterm what, int begin_max_period)
 }
 
 static void
-dump_stat_to_stream(FILE *fp, int begin_max_period)
+dump_stat_to_stream(fmtfn_t to, void* to_arg, int begin_max_period)
 {
     ErtsAlcType_t i, a_max, a_min;
 
     erts_mtx_lock(&instr_mutex);
 
-    fprintf(fp,
+    erts_cbprintf(to, to_arg,
 	    "{instr_vsn,%lu}.\n",
 	    (unsigned long) ERTS_INSTR_VSN);
     
     update_max_ever_values(&stats->tot, 0, 0);
 
-    fprintf(fp,
+    erts_cbprintf(to, to_arg,
 	    "{total,[{total,[{sizes,%lu,%lu,%lu},{blocks,%lu,%lu,%lu}]}]}.\n",
 	    (UWord) stats->tot.size,
 	    (UWord) stats->tot.max_size,
@@ -1038,7 +1027,7 @@ dump_stat_to_stream(FILE *fp, int begin_max_period)
 
     for (i = ERTS_ALC_A_MIN; i <= ERTS_ALC_A_MAX; i++) {
 	if (erts_allctrs_info[i].enabled) {
-	    fprintf(fp,
+	    erts_cbprintf(to, to_arg,
 		    "%s{%s,[{sizes,%lu,%lu,%lu},{blocks,%lu,%lu,%lu}]}%s",
 		    i == a_min ? "{allocators,\n [" : "  ",
 		    ERTS_ALC_A2AD(i),
@@ -1055,7 +1044,7 @@ dump_stat_to_stream(FILE *fp, int begin_max_period)
     update_max_ever_values(stats->c, ERTS_ALC_C_MIN, ERTS_ALC_C_MAX);
 
     for (i = ERTS_ALC_C_MIN; i <= ERTS_ALC_C_MAX; i++) {
-	fprintf(fp,
+	erts_cbprintf(to, to_arg,
 		"%s{%s,[{sizes,%lu,%lu,%lu},{blocks,%lu,%lu,%lu}]}%s",
 		i == ERTS_ALC_C_MIN ? "{classes,\n [" : "  ",
 		ERTS_ALC_C2CD(i),
@@ -1071,7 +1060,7 @@ dump_stat_to_stream(FILE *fp, int begin_max_period)
     update_max_ever_values(stats->n, ERTS_ALC_N_MIN, ERTS_ALC_N_MAX);
 
     for (i = ERTS_ALC_N_MIN; i <= ERTS_ALC_N_MAX; i++) {
-	fprintf(fp,
+	erts_cbprintf(to, to_arg,
 		"%s{%s,[{sizes,%lu,%lu,%lu},{blocks,%lu,%lu,%lu}]}%s",
 		i == ERTS_ALC_N_MIN ? "{types,\n [" : "  ",
 		ERTS_ALC_N2TD(i),
@@ -1095,40 +1084,29 @@ dump_stat_to_stream(FILE *fp, int begin_max_period)
 
 }
 
-int erts_instr_dump_stat_to_fd(int fd, int begin_max_period)
+int erts_instr_dump_stat_to(fmtfn_t to, void* to_arg, int begin_max_period)
 {
-    char buf[BUFSIZ];
-    FILE *fp;
-
     if (!erts_instr_stat)
 	return 0;
 
-    fp = fdopen(fd, "w");
-    if (fp == NULL)
-	return 0;
-
-    /* Avoid allocating memory; we may have run out of it at this point. */
-    setbuf(fp, buf);
-
-    dump_stat_to_stream(fp, begin_max_period);
-    fflush(fp);
+    dump_stat_to_stream(to, to_arg, begin_max_period);
     return 1;
 }
 
 int erts_instr_dump_stat(const char *name, int begin_max_period)
 {
-    FILE *file;
+    int fd;
 
     if (!erts_instr_stat)
 	return 0;
 
-    file = fopen(name, "w");
-    if (file == NULL)
+    fd = open(name, O_WRONLY | O_CREAT | O_TRUNC,0640);
+    if (fd < 0)
 	return 0;
 
-    dump_stat_to_stream(file, begin_max_period);
+    dump_stat_to_stream(erts_write_fd, (void*)&fd, begin_max_period);
 
-    fclose(file);
+    close(fd);
     return 1;
 }