Changeset d5409da in mainline

Timestamp:

2023-10-22T17:26:17Z (13 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e8c235b

Parents:

f0378c6

git-author:

Vojtech Horky <vojtech.horky@…> (2023-07-13 20:05:54)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-22 17:26:17)

Message:

C++: mutex::init should be constexpr

Location:

uspace/lib

Files:

• c/generic/thread/fibril_synch.c (modified) (1 diff)
• c/include/adt/list.h (modified) (1 diff)
• c/include/fibril_synch.h (modified) (1 diff)
• cpp/include/__bits/thread/threading.hpp (modified) (1 diff)

uspace/lib/c/generic/thread/fibril_synch.c

@@ -160 +160 @@
 {
         check_fibril_for_deadlock(oi, fibril_self());
-}
-
-void fibril_mutex_initialize(fibril_mutex_t *fm)
-{
-        fm->oi.owned_by = NULL;
-        fm->counter = 1;
-        list_initialize(&fm->waiters);
 }
 

uspace/lib/c/include/adt/list.h

@@ -183 +183 @@
  *
  */
-_NO_TRACE static inline void list_initialize(list_t *list)
+_NO_TRACE static inline __CONSTEXPR void list_initialize(list_t *list)
 {
         list->head.prev = &list->head;

uspace/lib/c/include/fibril_synch.h

@@ -153 +153 @@
 extern void __fibril_synch_fini(void);
 
-extern void fibril_mutex_initialize(fibril_mutex_t *);
+/** Initialize fibril mutex.
+ *
+ * Kept as in-line to allow constexpr marker for C++ library where this
+ * is used by C++ mutex type (list initialization are two assignments
+ * so it is actually reasonable to have this inlined).
+ */
+static inline __CONSTEXPR void fibril_mutex_initialize(fibril_mutex_t *fm)
+{
+        fm->oi.owned_by = NULL;
+        fm->counter = 1;
+        list_initialize(&fm->waiters);
+}
+
 extern void fibril_mutex_lock(fibril_mutex_t *);
 extern bool fibril_mutex_trylock(fibril_mutex_t *);

uspace/lib/cpp/include/__bits/thread/threading.hpp

@@ -87 +87 @@
         struct mutex
         {
-            static void init(mutex_type& mtx)
+            static constexpr void init(mutex_type& mtx)
             {
                 ::helenos::fibril_mutex_initialize(&mtx);