Changeset e503d3a9 in mainline for uspace/lib/c/include

Timestamp:

2010-10-25T21:33:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e7f6389

Parents:

b14b71e (diff), 84b7384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/deadlock-detection.

Location:

uspace/lib/c/include

Files:

• fibril.h (modified) (2 diffs)
• fibril_synch.h (modified) (4 diffs)

uspace/lib/c/include/fibril.h

@@ -48 +48 @@
 #define FIBRIL_WRITER      2
 
+struct fibril;
+
+typedef struct {
+        struct fibril *owned_by;
+} fibril_owner_info_t;
+
 typedef enum {
         FIBRIL_PREEMPT,
@@ -68 +74 @@
         int retval;
         int flags;
+
+        fibril_owner_info_t *waits_for;
 } fibril_t;
 

uspace/lib/c/include/fibril_synch.h

@@ -43 +43 @@
 
 typedef struct {
+        fibril_owner_info_t oi;         /* Keep this the first thing. */
         int counter;
         link_t waiters;
@@ -49 +50 @@
 #define FIBRIL_MUTEX_INITIALIZER(name) \
         { \
+                .oi = { \
+                        .owned_by = NULL \
+                }, \
                 .counter = 1, \
                 .waiters = { \
@@ -60 +64 @@
 
 typedef struct {
+        fibril_owner_info_t oi; /* Keep this the first thing. */
         unsigned writers;
         unsigned readers;
@@ -67 +72 @@
 #define FIBRIL_RWLOCK_INITIALIZER(name) \
         { \
+                .oi = { \
+                        .owned_by = NULL \
+                }, \
                 .readers = 0, \
                 .writers = 0, \