Overview
Comment: | Add conditions for AmigaOS |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
dd5a900e3b5698c51988b838a86d0056 |
User & Date: | js on 2019-08-06 00:48:50 |
Other Links: | manifest | tags |
Context
2019-08-06
| ||
22:13 | condition_amiga.m: Fix reacquiring mutex check-in: 7a8e765140 user: js tags: trunk | |
00:48 | Add conditions for AmigaOS check-in: dd5a900e3b user: js tags: trunk | |
2019-08-04
| ||
20:03 | Amiga library: Provide an empty __init_eh() check-in: 7342a6e98b user: js tags: trunk | |
Changes
Modified src/condition.h from [586159d8cd] to [e69c1f857d].
︙ | ︙ | |||
16 17 18 19 20 21 22 | */ #include "objfw-defs.h" #include "platform.h" #if !defined(OF_HAVE_THREADS) || \ | | | > > > > > > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | */ #include "objfw-defs.h" #include "platform.h" #if !defined(OF_HAVE_THREADS) || \ (!defined(OF_HAVE_PTHREADS) && !defined(OF_WINDOWS) && !defined(OF_AMIGAOS)) # error No conditions available! #endif /* For of_time_interval_t */ #import "OFObject.h" #import "mutex.h" #if defined(OF_HAVE_PTHREADS) # include <pthread.h> typedef pthread_cond_t of_condition_t; #elif defined(OF_WINDOWS) # include <windows.h> typedef struct { HANDLE event; volatile int count; } of_condition_t; #elif defined(OF_AMIGAOS) # include <exec/tasks.h> typedef struct { struct of_condition_waiting_task { struct Task *task; uint8_t sigBit; struct of_condition_waiting_task *next; } *waitingTasks; } of_condition_t; #endif #ifdef __cplusplus extern "C" { #endif extern bool of_condition_new(of_condition_t *condition); |
︙ | ︙ |
Modified src/condition.m from [2ae0545ef5] to [9908411a42].
︙ | ︙ | |||
19 20 21 22 23 24 25 26 | #import "condition.h" #if defined(OF_HAVE_PTHREADS) # include "condition_pthread.m" #elif defined(OF_WINDOWS) # include "condition_winapi.m" #endif | > > | 19 20 21 22 23 24 25 26 27 28 | #import "condition.h" #if defined(OF_HAVE_PTHREADS) # include "condition_pthread.m" #elif defined(OF_WINDOWS) # include "condition_winapi.m" #elif defined(OF_AMIGAOS) # include "condition_amiga.m" #endif |
Added src/condition_amiga.m version [82ad3299ce].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, * 2018, 2019 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #ifdef OF_AMIGAOS4 # define __USE_INLINE__ # define __NOLIBBASE__ # define __NOGLOBALIFACE__ #endif #include <proto/exec.h> #include <devices/timer.h> #ifndef OF_AMIGAOS4 # include <clib/alib_protos.h> #endif #ifdef OF_AMIGAOS4 extern struct ExecIFace *IExec; #endif bool of_condition_new(of_condition_t *condition) { condition->waitingTasks = NULL; return true; } bool of_condition_signal(of_condition_t *condition) { Forbid(); @try { if (condition->waitingTasks == NULL) return true; Signal(condition->waitingTasks->task, 1 << condition->waitingTasks->sigBit); condition->waitingTasks = condition->waitingTasks->next; } @finally { Permit(); } return true; } bool of_condition_broadcast(of_condition_t *condition) { Forbid(); @try { if (condition->waitingTasks == NULL) return true; while (condition->waitingTasks != NULL) { Signal(condition->waitingTasks->task, 1 << condition->waitingTasks->sigBit); condition->waitingTasks = condition->waitingTasks->next; } } @finally { Permit(); } return true; } bool of_condition_wait(of_condition_t *condition, of_mutex_t *mutex) { struct of_condition_waiting_task waitingTask = { .task = FindTask(NULL), .sigBit = AllocSignal(-1) }; if (waitingTask.sigBit == -1) return false; if (!of_mutex_unlock(mutex)) { FreeSignal(waitingTask.sigBit); return false; } Forbid(); waitingTask.next = condition->waitingTasks; condition->waitingTasks = &waitingTask; Wait(1 << waitingTask.sigBit); Permit(); FreeSignal(waitingTask.sigBit); return true; } bool of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex, of_time_interval_t timeout) { struct of_condition_waiting_task waitingTask = { .task = FindTask(NULL), .sigBit = AllocSignal(-1) }; struct MsgPort port = { .mp_Node = { .ln_Type = NT_MSGPORT }, .mp_Flags = PA_SIGNAL, .mp_SigTask = waitingTask.task, .mp_SigBit = AllocSignal(-1) }; #ifdef OF_AMIGAOS4 struct TimeRequest request = { .Request = { #else struct timerequest request = { .tr_node = { #endif .io_Message = { .mn_Node = { .ln_Type = NT_MESSAGE }, .mn_ReplyPort = &port, .mn_Length = sizeof(request) }, .io_Command = TR_ADDREQUEST }, #ifdef OF_AMIGAOS4 .Time = { .Seconds = (ULONG)timeout, .Microseconds = (timeout - request.Time.Seconds) * 1000000 #else .tr_time = { .tv_sec = (ULONG)timeout, .tv_micro = (timeout - request.tr_time.tv_sec) * 1000000 #endif } }; ULONG mask; NewList(&port.mp_MsgList); if (waitingTask.sigBit == -1 || port.mp_SigBit == -1) goto fail; if (OpenDevice("timer.device", UNIT_MICROHZ, (struct IORequest *)&request, 0) != 0) goto fail; if (!of_mutex_unlock(mutex)) goto fail; Forbid(); waitingTask.next = condition->waitingTasks; condition->waitingTasks = &waitingTask; SendIO((struct IORequest *)&request); mask = Wait((1 << waitingTask.sigBit) | (1 << port.mp_SigBit)); condition->waitingTasks = waitingTask.next; if (!CheckIO((struct IORequest *)&request)) { AbortIO((struct IORequest *)&request); WaitIO((struct IORequest *)&request); } CloseDevice((struct IORequest *)&request); Permit(); if (!(mask & (1 << waitingTask.sigBit))) goto fail; FreeSignal(waitingTask.sigBit); FreeSignal(port.mp_SigBit); return true; fail: if (waitingTask.sigBit != -1) FreeSignal(waitingTask.sigBit); if (port.mp_SigBit != -1) FreeSignal(port.mp_SigBit); return false; } bool of_condition_free(of_condition_t *condition) { Forbid(); @try { if (condition->waitingTasks != NULL) return false; } @finally { Permit(); } return true; } |
Modified src/condition_winapi.m from [984c51a6f0] to [ed44bca861].
︙ | ︙ | |||
11 12 13 14 15 16 17 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ bool of_condition_new(of_condition_t *condition) { condition->count = 0; if ((condition->event = CreateEvent(NULL, FALSE, 0, NULL)) == NULL) return false; |
︙ | ︙ |
Modified src/thread_amiga.m from [a7fd919f6d] to [92fe55ab19].
︙ | ︙ | |||
145 146 147 148 149 150 151 | * -1 should be -128 (lowest possible priority) while * +1 should be +127 (highest possible priority). */ ADD_TAG(NP_Priority, (attr->priority > 0 ? attr->priority * 127 : attr->priority * 128)) } | | | > > | | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | * -1 should be -128 (lowest possible priority) while * +1 should be +127 (highest possible priority). */ ADD_TAG(NP_Priority, (attr->priority > 0 ? attr->priority * 127 : attr->priority * 128)) } if (attr != NULL && attr->stackSize != 0) ADD_TAG(NP_StackSize, attr->stackSize) else ADD_TAG(NP_StackSize, ((struct Process *)FindTask(NULL))->pr_StackSize) ADD_TAG(TAG_DONE, 0) #undef ADD_TAG (*thread)->task = (struct Task *)CreateNewProc(tags.items); if ((*thread)->task == NULL) { free(*thread); |
︙ | ︙ |