Changeset 1068f6a in mainline for generic/include

Timestamp:

2006-05-20T19:32:06Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c1982e45

Parents:

9ea6cc5

Message:

Turn address space lock, address space area lock and
page_ht_lock into mutexes.

Location:

generic/include

Files:

• mm/as.h (modified) (4 diffs)
• synch/mutex.h (modified) (1 diff)
• typedefs.h (modified) (1 diff)

generic/include/mm/as.h

@@ -45 +45 @@
 #include <typedefs.h>
 #include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <adt/list.h>
 #include <adt/btree.h>
@@ -67 +68 @@
 #define AS_AREA_ATTR_PARTIAL    1       /* Not fully initialized area. */
 
-#define AS_PF_FAULT             0       /**< The page fault was not resolved by asp_page_fault(). */
+#define AS_PF_FAULT             0       /**< The page fault was not resolved by as_page_fault(). */
 #define AS_PF_OK                1       /**< The page fault was resolved by as_page_fault(). */
-#define AS_PF_DEFER             2       /**< The page fault was caused by memcpy_from_uspace(). */
+#define AS_PF_DEFER             2       /**< The page fault was caused by memcpy_from_uspace()
+                                             or memcpy_to_uspace(). */
 
 /** Address space area structure.
@@ -77 +79 @@
  */
 struct as_area {
-        SPINLOCK_DECLARE(lock);
+        mutex_t lock;
         int flags;              /**< Flags related to the memory represented by the address space area. */
         int attributes;         /**< Attributes related to the address space area itself. */
@@ -92 +94 @@
  */
 struct as {
-        /** Protected by asidlock. Must be acquired before as->lock. */
+        /** Protected by asidlock. */
         link_t inactive_as_with_asid_link;
 
-        SPINLOCK_DECLARE(lock);
+        mutex_t lock;
 
         /** Number of processors on wich is this address space active. */

generic/include/synch/mutex.h

@@ -45 +45 @@
 #define mutex_lock_timeout(mtx,usec) \
         _mutex_lock_timeout((mtx),(usec),SYNCH_NON_BLOCKING)
-        
+#define mutex_lock_active(mtx) \
+        while (mutex_trylock((mtx)) != ESYNCH_OK_ATOMIC)
+
 extern void mutex_initialize(mutex_t *mtx);
 extern int _mutex_lock_timeout(mutex_t *mtx, __u32 usec, int trylock);

generic/include/typedefs.h

@@ -64 +64 @@
 typedef struct futex futex_t;
 
-typedef struct chunk chunk_t;
-
 typedef struct buddy_system buddy_system_t;
 typedef struct buddy_system_operations buddy_system_operations_t;
 
-typedef enum as_area_type as_area_type_t;
 typedef struct as_area as_area_t;
 typedef struct as as_t;
 
 typedef struct link link_t;
-
-typedef char *char_ptr;
 
 typedef struct the the_t;