Changeset 26676

Timestamp:

07/29/08 08:03:41 (4 months ago)

Author:

axeld

Message:

First patch by Salvatore to implement XSI semaphores with a few changes
by myself:
* renamed xsi_do_undo() to xsi_sem_undo() (there is more to XSI than sems).
* Fixed coding style issues in sys/sem.h and xsi_sem.cpp.
* Added _kern_*() syscall prototypes to syscalls.h.
* Added a TODO in xsi_sem.cpp and xsi_semaphore.h about moving union semun to

a shared header.

* Made the team::xsi_sem_undo_requests int32 - due to padding, it would have

needed 4 bytes anyway; please always use specific types over int/short/long.

* xsi_sem_undo() now checks if it needs to do anything - the calls in team.cpp

no longer needs to do this.

Location:

haiku/trunk

Files:

• headers/posix/sys/ipc.h (modified) (3 diffs)
• headers/posix/sys/sem.h (added)
• headers/private/kernel/posix/xsi_semaphore.h (added)
• headers/private/kernel/thread_types.h (modified) (1 diff)
• headers/private/system/syscalls.h (modified) (4 diffs)
• src/system/kernel/main.cpp (modified) (2 diffs)
• src/system/kernel/posix/Jamfile (modified) (1 diff)
• src/system/kernel/posix/xsi_semaphore.cpp (added)
• src/system/kernel/syscalls.cpp (modified) (1 diff)
• src/system/kernel/team.cpp (modified) (4 diffs)
• src/system/libroot/posix/sys/Jamfile (modified) (2 diffs)
• src/system/libroot/posix/sys/ftok.c (added)
• src/system/libroot/posix/sys/xsi_sem.cpp (added)

haiku/trunk/headers/posix/sys/ipc.h

@@ -7 +7 @@
 
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
-#error functionality has not yet been implemented
 
 
@@ -18 +18 @@
 /* Control commands for msgctl(), semctl(), and shmctl() */
 #define IPC_RMID        0               /* remove identifier */
-#define IPC_SET         1
-#define IPC_STAT        2
+#define IPC_SET         1               /* set options */
+#define IPC_STAT        2               /* get options */
 
 /* Private key */
-#define IPC_PRIVATE     0
+#define IPC_PRIVATE             (key_t)0
 
 
 struct ipc_perm {
-        key_t   key;
+        key_t   key;                    /* IPC identifier */
         uid_t   uid;                    /* owner's user ID */
         gid_t   gid;                    /* owner's group ID */
@@ -35 +35 @@
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+__BEGIN_DECLS
 
 key_t ftok(const char *path, int id);
 
-#ifdef __cplusplus
-}
-#endif
+__END_DECLS
 
 #endif  /* _SYS_IPC_H */

haiku/trunk/headers/private/kernel/thread_types.h

@@ -183 +183 @@
         void                    *io_context;
         struct realtime_sem_context     *realtime_sem_context;
+        int32                   xsi_sem_undo_requests;
         sem_id                  death_sem;              // semaphore to wait on for dying threads
         struct list             dead_threads;

haiku/trunk/headers/private/system/syscalls.h

@@ -31 +31 @@
 struct stat;
 struct _sem_t;
+struct sembuf;
+union semun;
 
 struct disk_device_job_progress_info;
@@ -56 +58 @@
 
 extern status_t         _kern_shutdown(bool reboot);
-extern status_t         _kern_get_safemode_option(const char *parameter, char *buffer, size_t *_bufferSize);
+extern status_t         _kern_get_safemode_option(const char *parameter,
+                                                char *buffer, size_t *_bufferSize);
 
 extern ssize_t          _kern_wait_for_objects(object_wait_info* infos, int numInfos,
                                                 uint32 flags, bigtime_t timeout);
-
 
 /* sem functions */
@@ -66 +68 @@
 extern status_t         _kern_delete_sem(sem_id id);
 extern status_t         _kern_switch_sem(sem_id releaseSem, sem_id id);
-extern status_t         _kern_switch_sem_etc(sem_id releaseSem, sem_id id, uint32 count,
-                                                uint32 flags, bigtime_t timeout);
+extern status_t         _kern_switch_sem_etc(sem_id releaseSem, sem_id id,
+                                                uint32 count, uint32 flags, bigtime_t timeout);
 extern status_t         _kern_acquire_sem(sem_id id);
-extern status_t         _kern_acquire_sem_etc(sem_id id, uint32 count, uint32 flags, bigtime_t timeout);
+extern status_t         _kern_acquire_sem_etc(sem_id id, uint32 count, uint32 flags,
+                                                bigtime_t timeout);
 extern status_t         _kern_release_sem(sem_id id);
 extern status_t         _kern_release_sem_etc(sem_id id, uint32 count, uint32 flags);
 extern status_t         _kern_get_sem_count(sem_id id, int32* thread_count);
-extern status_t         _kern_get_sem_info(sem_id semaphore, struct sem_info *info, size_t size);
+extern status_t         _kern_get_sem_info(sem_id semaphore, struct sem_info *info,
+                                                size_t size);
 extern status_t         _kern_get_next_sem_info(team_id team, int32 *cookie,
                                                 struct sem_info *info, size_t size);
@@ -90 +94 @@
 extern status_t         _kern_realtime_sem_wait(sem_id semID, bigtime_t timeout);
 
+/* POSIX XSI semaphore syscalls */
+extern int                      _kern_xsi_semget(key_t key, int numSems, int flags);
+extern int                      _kern_xsi_semctl(int semID, int semNumber, int command,
+                                                union semun* args);
+extern status_t         _kern_xsi_semop(int semID, struct sembuf *semOps,
+                                                size_t numSemOps);
+
 /* team & thread syscalls */
-
 extern thread_id        _kern_load_image(const char* const* flatArgs,
                                                 size_t flatArgsSize, int32 argCount, int32 envCount,

haiku/trunk/src/system/kernel/main.cpp

@@ -38 +38 @@
 #include <port.h>
 #include <posix/realtime_sem.h>
+#include <posix/xsi_semaphore.h>
 #include <real_time_clock.h>
 #include <sem.h>
@@ -175 +176 @@
                 kernel_daemon_init();
                 arch_platform_init_post_thread(&sKernelArgs);
+                TRACE("init posix semaphores\n");
                 realtime_sem_init();
+                xsi_ipc_init();
 
                 TRACE("init VM threads\n");

haiku/trunk/src/system/kernel/posix/Jamfile

@@ -5 +5 @@
 KernelMergeObject kernel_posix.o : 
         realtime_sem.cpp
+        xsi_semaphore.cpp
 
         : $(TARGET_KERNEL_PIC_CCFLAGS)

haiku/trunk/src/system/kernel/syscalls.cpp

@@ -18 +18 @@
 #include <thread.h>
 #include <posix/realtime_sem.h>
+#include <posix/xsi_semaphore.h>
 #include <sem.h>
 #include <port.h>

haiku/trunk/src/system/kernel/team.cpp

@@ -32 +32 @@
 #include <port.h>
 #include <posix/realtime_sem.h>
+#include <posix/xsi_semaphore.h>
 #include <sem.h>
 #include <syscall_process_info.h>
@@ -700 +701 @@
         team->address_space = NULL;
         team->realtime_sem_context = NULL;
+        team->xsi_sem_undo_requests = 0;
         team->thread_list = NULL;
         team->main_thread = NULL;
@@ -1323 +1325 @@
         delete_team_user_data(team);
         vm_delete_areas(team->address_space);
+        xsi_sem_undo(team->id, team->xsi_sem_undo_requests);
         delete_owned_ports(team->id);
         sem_delete_owned_sems(team->id);
@@ -2339 +2342 @@
         vfs_free_io_context(team->io_context);
         delete_realtime_sem_context(team->realtime_sem_context);
+        xsi_sem_undo(team->id, team->xsi_sem_undo_requests);
         delete_owned_ports(teamID);
         sem_delete_owned_sems(teamID);

haiku/trunk/src/system/libroot/posix/sys/Jamfile

@@ -8 +8 @@
         flock.c
         ftime.c
+        ftok.c
         getrusage.c
         gettimeofday.c
@@ -24 +25 @@
         utimes.c
         wait.c
+        xsi_sem.cpp
 ;