Revision 520
fixed another unlock bug, assign robot id bug
| trunk/code/projects/colonet/server/Command.cpp | ||
|---|---|---|
| 226 | 226 |
break; |
| 227 | 227 |
|
| 228 | 228 |
case CLIENT_ASSIGN_ROBOT_ID: |
| 229 |
colonet_server->getPositionMonitor()->assignRealId(atoi(tokens[1]), atoi(tokens[2]));
|
|
| 229 |
colonet_server->getPositionMonitor()->assignRealId(atoi(tokens[2]), atoi(tokens[3]));
|
|
| 230 | 230 |
break; |
| 231 | 231 |
|
| 232 | 232 |
default: |
| trunk/code/projects/colonet/server/PositionMonitor.cpp | ||
|---|---|---|
| 103 | 103 |
|
| 104 | 104 |
if (iter == positionMap.end()) {
|
| 105 | 105 |
fprintf(stderr, "assignRealId: old_id not found\n"); |
| 106 |
pthread_mutex_unlock(&position_map_lock); |
|
| 106 | 107 |
return -1; |
| 107 | 108 |
} |
| 108 | 109 |
|
Also available in: Unified diff