Fight for better integration of mmalloc, mc and xbt

[simgrid.git] / src / xbt / mmalloc / keys.c

diff --git a/src/xbt/mmalloc/keys.c b/src/xbt/mmalloc/keys.c
index 35f00d1..8f168b8 100644 (file)
--- a/src/xbt/mmalloc/keys.c
+++ b/src/xbt/mmalloc/keys.c
@@ -2,23 +2,16 @@
    Copyright 1992 Free Software Foundation, Inc.
 
    Contributed by Fred Fish at Cygnus Support.   fnf@cygnus.com
+   This file was then part of the GNU C Library. */
 
-This file is part of the GNU C Library.
+/* Copyright (c) 2010. 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. */
 
-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.
 
-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.
 
-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.  */
 
 /* This module provides access to some keys that the application can use to
    provide persistent access to locations in the mapped memory section.
@@ -34,29 +27,26 @@ Boston, MA 02111-1307, USA.  */
 #include "mmprivate.h"
 
 int
-mmalloc_setkey (md, keynum, key)
-  PTR md;     
-  int keynum;
-  PTR key;
+mmalloc_setkey (void *md, int keynum, void *key)
 {
   struct mdesc *mdp = (struct mdesc *) md;
   int result = 0;
 
+  LOCK(mdp);
   if ((mdp != NULL) && (keynum >= 0) && (keynum < MMALLOC_KEYS))
     {
       mdp -> keys [keynum] = key;
       result++;
     }
+  UNLOCK(mdp);
   return (result);
 }
 
-PTR
-mmalloc_getkey (md, keynum)
-  PTR md;     
-  int keynum;
+void*
+mmalloc_getkey (void *md, int keynum)
 {
   struct mdesc *mdp = (struct mdesc *) md;
-  PTR keyval = NULL;
+  void* keyval = NULL;
 
   if ((mdp != NULL) && (keynum >= 0) && (keynum < MMALLOC_KEYS))
     {