A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Fix get_object_info
[simgrid.git]
/
src
/
mc
/
memory_map.c
diff --git
a/src/mc/memory_map.c
b/src/mc/memory_map.c
index
f3c410a
..
d893439
100644
(file)
--- a/
src/mc/memory_map.c
+++ b/
src/mc/memory_map.c
@@
-1,21
+1,21
@@
-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2013. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#define _GNU_SOURCE
#include "mc_private.h"
#include <stdlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory_map, mc,
"Logging specific to algorithms for memory_map");
#include "mc_private.h"
#include <stdlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory_map, mc,
"Logging specific to algorithms for memory_map");
-memory_map_t get_memory_map(void)
+memory_map_t
MC_
get_memory_map(void)
{
FILE *fp; /* File pointer to process's proc maps file */
char *line = NULL; /* Temporal storage for each line that is readed */
ssize_t read; /* Number of bytes readed */
{
FILE *fp; /* File pointer to process's proc maps file */
char *line = NULL; /* Temporal storage for each line that is readed */
ssize_t read; /* Number of bytes readed */
- size_t n = 0; /* Amount of bytes to read by getline */
+ size_t n = 0; /* Amount of bytes to read by
xbt_
getline */
memory_map_t ret = NULL; /* The memory map to return */
/* The following variables are used during the parsing of the file "maps" */
memory_map_t ret = NULL; /* The memory map to return */
/* The following variables are used during the parsing of the file "maps" */
@@
-33,10
+33,12
@@
memory_map_t get_memory_map(void)
xbt_assert(fp,
"Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug.");
xbt_assert(fp,
"Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug.");
+ setbuf(fp, NULL);
+
ret = xbt_new0(s_memory_map_t, 1);
/* Read one line at the time, parse it and add it to the memory map to be returned */
ret = xbt_new0(s_memory_map_t, 1);
/* Read one line at the time, parse it and add it to the memory map to be returned */
- while ((read = getline(&line, &n, fp)) != -1) {
+ while ((read =
xbt_
getline(&line, &n, fp)) != -1) {
//fprintf(stderr,"%s", line);
//fprintf(stderr,"%s", line);
@@
-153,3
+155,13
@@
memory_map_t get_memory_map(void)
return ret;
}
return ret;
}
+
+void MC_free_memory_map(memory_map_t map){
+
+ int i;
+ for(i=0; i< map->mapsize; i++){
+ xbt_free(map->regions[i].pathname);
+ }
+ xbt_free(map->regions);
+ xbt_free(map);
+}