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
Simplify the mmalloc library further
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mvalloc.c
diff --git
a/src/xbt/mmalloc/mvalloc.c
b/src/xbt/mmalloc/mvalloc.c
index
95c1924
..
c940ee9
100644
(file)
--- a/
src/xbt/mmalloc/mvalloc.c
+++ b/
src/xbt/mmalloc/mvalloc.c
@@
-1,20
+1,12
@@
/* Allocate memory on a page boundary.
/* Allocate memory on a page boundary.
- Copyright (C) 1991 Free Software Foundation, Inc.
+ Copyright (C) 1991 Free Software Foundation, Inc.
*/
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved. */
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
+/* 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. */
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
#include "mmprivate.h"
#include <unistd.h>
#include "mmprivate.h"
#include <unistd.h>
@@
-26,27
+18,15
@@
Boston, MA 02111-1307, USA. */
static size_t cache_pagesize;
#if NEED_DECLARATION_GETPAGESIZE
static size_t cache_pagesize;
#if NEED_DECLARATION_GETPAGESIZE
-extern int getpagesize PARAMS
((void));
+extern int getpagesize PARAMS((void));
#endif
#endif
-PTR
-mvalloc (md, size)
- PTR md;
- size_t size;
+void *mvalloc(xbt_mheap_t mdp, size_t size)
{
{
- if (cache_pagesize == 0)
- {
- cache_pagesize = getpagesize ();
- }
+ if (cache_pagesize == 0) {
+ cache_pagesize = getpagesize();
+ }
- return (mmemalign
(md
, cache_pagesize, size));
+ return (mmemalign
(mdp
, cache_pagesize, size));
}
}
-/* Useless prototype to make gcc happy */
-PTR valloc (size_t size);
-
-PTR
-valloc (size_t size)
-{
- return mvalloc ((PTR) NULL, size);
-}