From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Thu, 6 Jun 2013 21:33:40 +0000 (+0200)
Subject: Merge branch 'hypervisor' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid... 
X-Git-Tag: v3_11_beta~297^2^2~28^2~5
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4233134b16caf9ccba18a6b08e79d24d443ece75?hp=-c

Merge branch 'hypervisor' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into hypervisor
---

4233134b16caf9ccba18a6b08e79d24d443ece75
diff --combined include/msg/msg.h
index 16ca784fb3,079b8c4239..154fc39cc3
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@@ -73,9 -73,7 +73,9 @@@ XBT_PUBLIC(unsigned long int) MSG_get_s
  XBT_PUBLIC(msg_as_t) MSG_environment_get_routing_root(void);
  XBT_PUBLIC(const char *) MSG_environment_as_get_name(msg_as_t as);
  XBT_PUBLIC(xbt_dict_t) MSG_environment_as_get_routing_sons(msg_as_t as);
 -XBT_PUBLIC(const char *)MSG_environment_as_get_property_value(msg_as_t as, const char *name);
 +XBT_PUBLIC(const char *) MSG_environment_as_get_property_value(msg_as_t as, const char *name);
 +XBT_PUBLIC(const char *) MSG_environment_as_get_model(msg_as_t as);
 +XBT_PUBLIC(xbt_dynar_t) MSG_environment_as_get_hosts(msg_as_t as);
  
  /************************** File handling ***********************************/
  XBT_PUBLIC(double) MSG_file_read(void* ptr, size_t size, size_t nmemb, msg_file_t stream);
@@@ -365,6 -363,19 +365,19 @@@ XBT_PUBLIC(msg_error_t) MSG_set_channel
  XBT_PUBLIC(int) MSG_get_channel_number(void);
  #endif
  
+ /** @brief Opaque type representing a semaphore
+  *  @ingroup msg_synchro
+  *  @hideinitializer
+  */
+ typedef struct s_smx_sem *msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be declared here
+ XBT_PUBLIC(msg_sem_t) MSG_sem_init(int initial_value);
+ XBT_PUBLIC(void) MSG_sem_acquire(msg_sem_t sem);
+ XBT_PUBLIC(msg_error_t) MSG_sem_acquire_timeout(msg_sem_t sem, double timeout);
+ XBT_PUBLIC(void) MSG_sem_release(msg_sem_t sem);
+ XBT_PUBLIC(void) MSG_sem_get_capacity(msg_sem_t sem);
+ XBT_PUBLIC(void) MSG_sem_destroy(msg_sem_t sem);
+ XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem);
+ 
  /** @brief Opaque type describing a Virtual Machine.
   *  @ingroup msg_VMs
   *