Revision f86427e8
| src/urt_core.c | ||
|---|---|---|
| 119 | 119 |
|
| 120 | 120 |
urt_node_t* urtCoreGetNodes(void) |
| 121 | 121 |
{
|
| 122 |
return &core._nodes;
|
|
| 122 |
return core._nodes; |
|
| 123 | 123 |
} |
| 124 | 124 |
|
| 125 | 125 |
/** |
| src/urt_node.c | ||
|---|---|---|
| 67 | 67 |
|
| 68 | 68 |
if (urtCoreGetStatus() == URT_STATUS_OK) |
| 69 | 69 |
{
|
| 70 |
urtCoreSynchronizeNodes(&localNode);
|
|
| 70 |
urtCoreSynchronizeNodes(localNode); |
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 | 73 |
if (!urtThreadShouldTerminate()) |
| ... | ... | |
| 100 | 100 |
if(threadToTerminate->sibling != NULL) |
| 101 | 101 |
urtThreadTerminate(threadToTerminate->sibling, URT_THREAD_TERMINATE_REQUEST); |
| 102 | 102 |
} |
| 103 |
urtThreadTerminate(&threadToTerminate, URT_THREAD_TERMINATE_REQUEST);
|
|
| 103 |
urtThreadTerminate(threadToTerminate, URT_THREAD_TERMINATE_REQUEST); |
|
| 104 | 104 |
|
| 105 | 105 |
urt_osThread_t* threadToJoin = localNode->thread; |
| 106 | 106 |
while (threadToJoin->children != NULL || threadToJoin->sibling != NULL) |
| ... | ... | |
| 110 | 110 |
if(threadToJoin->sibling != NULL) |
| 111 | 111 |
urtThreadJoin(threadToJoin->sibling); |
| 112 | 112 |
} |
| 113 |
urtThreadJoin(&threadToJoin);
|
|
| 113 |
urtThreadJoin(threadToJoin); |
|
| 114 | 114 |
|
| 115 | 115 |
return; |
| 116 | 116 |
} |
| ... | ... | |
| 164 | 164 |
urtMutexLock(mutexTemp); |
| 165 | 165 |
node->next = urtCoreGetNodes(); |
| 166 | 166 |
urt_node_t* nodeCore = urtCoreGetNodes(); |
| 167 |
nodeCore = node; |
|
| 167 |
nodeCore->next = node;
|
|
| 168 | 168 |
urtMutexUnlock(mutexTemp); |
| 169 | 169 |
return; |
| 170 | 170 |
} |
Also available in: Unified diff