Overview
| Comment: | condition_amiga.m: Fix reacquiring mutex |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
7a8e76514086bfb612d8dbb62ec394d3 |
| User & Date: | js on 2019-08-06 22:13:45 |
| Other Links: | manifest | tags |
Context
|
2019-08-09
| ||
| 23:44 | Support sockets on AmigaOS 3 check-in: 3dec8ecf2e user: js tags: trunk | |
|
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 | |
Changes
Modified src/condition_amiga.m from [82ad3299ce] to [1151a26880].
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
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;
}
| > > > < < | > | > | | 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 |
bool
of_condition_wait(of_condition_t *condition, of_mutex_t *mutex)
{
struct of_condition_waiting_task waitingTask = {
.task = FindTask(NULL),
.sigBit = AllocSignal(-1)
};
bool ret;
if (waitingTask.sigBit == -1)
return false;
Forbid();
if (!of_mutex_unlock(mutex)) {
FreeSignal(waitingTask.sigBit);
return false;
}
waitingTask.next = condition->waitingTasks;
condition->waitingTasks = &waitingTask;
Wait(1 << waitingTask.sigBit);
FreeSignal(waitingTask.sigBit);
ret = of_mutex_lock(mutex);
Permit();
return ret;
}
bool
of_condition_timed_wait(of_condition_t *condition, of_mutex_t *mutex,
of_time_interval_t timeout)
{
struct of_condition_waiting_task waitingTask = {
|
| ︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
.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;
| > > > | > | < > | | 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 |
.tr_time = {
.tv_sec = (ULONG)timeout,
.tv_micro = (timeout - request.tr_time.tv_sec) * 1000000
#endif
}
};
ULONG mask;
bool ret;
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;
Forbid();
if (!of_mutex_unlock(mutex)) {
Permit();
goto fail;
}
waitingTask.next = condition->waitingTasks;
condition->waitingTasks = &waitingTask;
SendIO((struct IORequest *)&request);
mask = Wait((1 << waitingTask.sigBit) | (1 << port.mp_SigBit));
ret = of_mutex_lock(mutex);
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 ret;
fail:
if (waitingTask.sigBit != -1)
FreeSignal(waitingTask.sigBit);
if (port.mp_SigBit != -1)
FreeSignal(port.mp_SigBit);
|
| ︙ | ︙ |