Changeset 3446 in kBuild

Timestamp:

Sep 10, 2020 8:48:14 PM (5 years ago)

Author:

bird

Message:

kash: mutex fix.

Location:

trunk/src/kash

Files:

• shinstance.c (modified) (1 diff)
• shthread.h (modified) (2 diffs)

trunk/src/kash/shinstance.c

@@ -108 +108 @@
 
 
-
-/** Magic mutex value (final u64).
- * This is used to detect whether the mutex has been initialized or not,
- * allowing shmtx_delete to be called more than once without doing harm.
- * @internal */
-#define SHMTX_MAGIC        KU64_C(0x8888000019641018) /**< Charles Stross */
-/** Index into shmtx::au64 of the SHMTX_MAGIC value.
- * @internal */
-#define SHMTX_MAGIC_IDX    (sizeof(shmtx) / sizeof(KU64) - 1)
 
 int shmtx_init(shmtx *pmtx)

trunk/src/kash/shthread.h

@@ -30 +30 @@
 #include "shtypes.h"
 
-typedef struct shmtx
+typedef union shmtx
 {
     char b[64];
@@ -36 +36 @@
     void *aptrs[64/sizeof(void *)];
 } shmtx;
+
+/** Magic mutex value (final u64).
+ * This is used to detect whether the mutex has been initialized or not,
+ * allowing shmtx_delete to be called more than once without doing harm.
+ * @internal */
+#define SHMTX_MAGIC        KU64_C(0x8888000019641018) /**< Charles Stross */
+/** Index into shmtx::au64 of the SHMTX_MAGIC value.
+ * @internal */
+#define SHMTX_MAGIC_IDX    (sizeof(shmtx) / sizeof(KU64) - 1)
 
 typedef struct shmtxtmp { int i; } shmtxtmp;