Keep deprecated features one more release (target: 1 year).

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index ee53920..e0762c9 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1442,8 +1442,8 @@ PREDEFINED             = __cplusplus \
                         XBT_PRIVATE= \
                         XBT_ATTRIB_NORETURN= \
                         XBT_ATTRIB_UNUSED= \
-                         XBT_ATTRIB_DEPRECATED_v327(m)= \
-                         XBT_ATTRIB_DEPRECATED_v328(m)=
+                         XBT_ATTRIB_DEPRECATED_v328(m)= \
+                         XBT_ATTRIB_DEPRECATED_v329(m)=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
 # this tag can be used to specify a list of macro names that should be expanded.

diff --git a/docs/source/Doxyfile b/docs/source/Doxyfile
index 81e222e..95c020c 100644 (file)
--- a/docs/source/Doxyfile
+++ b/docs/source/Doxyfile
@@ -41,5 +41,5 @@ PREDEFINED             += \
     XBT_PRIVATE= \
     XBT_ATTRIB_NORETURN= \
     XBT_ATTRIB_UNUSED= \
-    XBT_ATTRIB_DEPRECATED_v327(m)= \
-    XBT_ATTRIB_DEPRECATED_v328(m)=
+    XBT_ATTRIB_DEPRECATED_v328(m)= \
+    XBT_ATTRIB_DEPRECATED_v329(m)=

diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp
index e0dc7b4..5ea1158 100644 (file)
--- a/include/simgrid/Exception.hpp
+++ b/include/simgrid/Exception.hpp
@@ -101,7 +101,7 @@ public:
   }
 };
 
-XBT_ATTRIB_DEPRECATED_v327("Please use simgrid::TimeoutException") typedef TimeoutException TimeoutError;
+XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") typedef TimeoutException TimeoutError;
 
 /** Exception raised when a host fails */
 class HostFailureException : public Exception {
@@ -197,6 +197,6 @@ private:
 
 } // namespace simgrid
 
-XBT_ATTRIB_DEPRECATED_v327("Please use simgrid::Exception") typedef simgrid::Exception xbt_ex;
+XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") typedef simgrid::Exception xbt_ex;
 
 #endif

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 5bf5f83..368531c 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -50,15 +50,15 @@ XBT_PUBLIC const char* sg_host_get_name(sg_host_t host);
  * This functions returns the user data associated to @a host if any.
  */
 XBT_PUBLIC void* sg_host_data(sg_host_t host);
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_host_data()") XBT_PUBLIC void* sg_host_user(sg_host_t host);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data()") XBT_PUBLIC void* sg_host_user(sg_host_t host);
 /** @brief Set the user data of a #sg_host_t.
  *
  * This functions attach @a data to @a host.
  */
 XBT_PUBLIC void sg_host_data_set(sg_host_t host, void* userdata);
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_host_data_set()") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data_set()") XBT_PUBLIC
     void sg_host_user_set(sg_host_t host, void* userdata);
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_host_data_set(h, NULL)") XBT_PUBLIC void sg_host_user_destroy(sg_host_t host);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_data_set(h, NULL)") XBT_PUBLIC void sg_host_user_destroy(sg_host_t host);
 
 // ========= storage related functions ============
 /** @brief Return the list of mount point names on an host.

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 2caec01..c6669c3 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -150,9 +150,9 @@ XBT_PUBLIC bool simcall_execution_test(const smx_activity_t& execution);
 /**************************** Process simcalls ********************************/
 SG_BEGIN_DECL()
 void simcall_process_set_data(smx_actor_t process, void* data);
-XBT_ATTRIB_DEPRECATED_v327("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process);
+XBT_ATTRIB_DEPRECATED_v328("Please use Actor::suspend()") XBT_PUBLIC void simcall_process_suspend(smx_actor_t process);
 
-XBT_ATTRIB_DEPRECATED_v327("Please use Actor::join()") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v328("Please use Actor::join()") XBT_PUBLIC
     void simcall_process_join(smx_actor_t process, double timeout);
 
 /* Sleep control */

diff --git a/include/xbt/base.h b/include/xbt/base.h
index e040779..74d1176 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -68,10 +68,10 @@
 #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg)))
 #endif
 
-#define XBT_ATTRIB_DEPRECATED_v327(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.27)") /* Will be dropped in v3.27 */
 #define XBT_ATTRIB_DEPRECATED_v328(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.28)") /* Will be dropped in v3.28 */
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.28)")
+#define XBT_ATTRIB_DEPRECATED_v329(mesg)                                                                               \
+  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped in v3.29)")
 
 #if !defined(__APPLE__)
 #  define XBT_ATTRIB_CONSTRUCTOR(prio) __attribute__((__constructor__(prio)))

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index c57b925..1be5b5f 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -34,10 +34,10 @@ typedef struct s_smx_mutex_* xbt_mutex_t;
 #endif
 
 /** @brief Creates a new mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_init") XBT_PUBLIC xbt_mutex_t xbt_mutex_init(void);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_init") XBT_PUBLIC xbt_mutex_t xbt_mutex_init(void);
 
 /** @brief Blocks onto the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_lock") XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_lock") XBT_PUBLIC void xbt_mutex_acquire(xbt_mutex_t mutex);
 
 /** @brief Tries to block onto the given mutex variable
  * Tries to lock a mutex, return 1 if the mutex is unlocked, else 0.
@@ -45,13 +45,13 @@ XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_lock") XBT_PUBLIC void xbt_mutex
  * @param mutex The mutex
  * @return 1 - mutex free, 0 - mutex used
  */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_try_lock") XBT_PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_try_lock") XBT_PUBLIC int xbt_mutex_try_acquire(xbt_mutex_t mutex);
 
 /** @brief Releases the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_unlock") XBT_PUBLIC void xbt_mutex_release(xbt_mutex_t mutex);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_unlock") XBT_PUBLIC void xbt_mutex_release(xbt_mutex_t mutex);
 
 /** @brief Destroyes the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_mutex_destroy") XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_destroy") XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
 
 /** @brief Thread condition data type (opaque object)
  *  @hideinitializer
@@ -63,20 +63,20 @@ typedef struct s_smx_cond_* xbt_cond_t;
 #endif
 
 /** @brief Creates a condition variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_init") XBT_PUBLIC xbt_cond_t xbt_cond_init(void);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_init") XBT_PUBLIC xbt_cond_t xbt_cond_init(void);
 
 /** @brief Blocks onto the given condition variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_wait") XBT_PUBLIC void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_wait") XBT_PUBLIC void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex);
 /** @brief Blocks onto the given condition variable, but only for the given amount of time.
  *  @return 0 on success, 1 on timeout */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_wait_for") XBT_PUBLIC
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_wait_for") XBT_PUBLIC
     int xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay);
 /** @brief Signals the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_notify_one") XBT_PUBLIC void xbt_cond_signal(xbt_cond_t cond);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_notify_one") XBT_PUBLIC void xbt_cond_signal(xbt_cond_t cond);
 /** @brief Broadcasts the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_notify_all") XBT_PUBLIC void xbt_cond_broadcast(xbt_cond_t cond);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_notify_all") XBT_PUBLIC void xbt_cond_broadcast(xbt_cond_t cond);
 /** @brief Destroys the given mutex variable */
-XBT_ATTRIB_DEPRECATED_v327("Please use sg_cond_destroy") XBT_PUBLIC void xbt_cond_destroy(xbt_cond_t cond);
+XBT_ATTRIB_DEPRECATED_v328("Please use sg_cond_destroy") XBT_PUBLIC void xbt_cond_destroy(xbt_cond_t cond);
 
 /** @} */
 

diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp
index 46c48c2..8853214 100644 (file)
--- a/src/plugins/host_energy.cpp
+++ b/src/plugins/host_energy.cpp
@@ -343,7 +343,7 @@ void HostEnergy::init_watts_range_list()
                "Invalid XML file. Found %zu energetic profiles for %d pstates", all_power_values.size(),
                host_->get_pstate_count());
 
-    // XBT_ATTRIB_DEPRECATED_v327: puting this macro name here so that we find it during the deprecation cleanups of v3.28
+    // XBT_ATTRIB_DEPRECATED_v328: putting this macro name here so that we find it during the deprecation cleanups
     std::string msg = std::string("DEPRECATION WARNING: Property 'watt_per_state' will only work until v3.28.\n");
     msg += std::string("The old syntax 'Idle:OneCore:AllCores' must be converted into 'Idle:Epsilon:AllCores' to "
                        "properly model the consumption of non-whole tasks on mono-core hosts. Here are the values to "