Commit 0e5589b8 authored by Felix Brüning's avatar Felix Brüning
Browse files

[WORKING] Erste lauffähige Version für morgen.

	-> Deadlocks werden erst sehr spät erkannt
parent 8af541eb
......@@ -83,7 +83,8 @@ int will_deadlock_other_dir(int route_id) {
for_each(conflict, conflicts) {
if (!ret && get_route(INT_CAST conflict->data)->direction != route->direction) {
for_each(req, requested) {
if (INT_CAST req->data == INT_CAST conflict->data && get_route_status(INT_CAST conflict->data) == RS_MARKED) {
if (INT_CAST req->data == INT_CAST conflict->data
&& get_route_status(INT_CAST conflict->data) == RS_MARKED) {
set_causing_deadlock(INT_CAST req->data, TRUE);
ret = TRUE;
break;
......
......@@ -98,10 +98,10 @@ ID;SRC;DST;PATH;POINTS;LENGTH;MAX SPEED;CONFLICTS;DIRECTION
96;103;200;107,218,200;20:m,17:p,16:p;100;50;15,16,17,18,19,20,21,22,84,88,89,90,91,92,94,97,98,99,100,102;1
97;103;201;107,219,201;20:m,17:p,16:m,15:m;100;50;13,14,17,18,19,20,21,22,23,24,84,88,89,90,91,92,93,94,95,96,98,99,100,101,102,103;1
98;104;200;108,218,200;20:p,17:p,16:p;100;50;15,16,17,18,19,20,21,22,85,88,89,90,91,92,94,96,97,99,100,102;1
99;104;201;107,219,201;20:p,17:p,16:m,15:m;100;50;13,14,17,18,19,20,21,22,23,24,84,88,89,90,91,92,93,94,95,96,97,98,100,101,102,103;1
99;104;201;108,219,201;20:p,17:p,16:m,15:m;100;50;13,14,17,18,19,20,21,22,23,24,84,88,89,90,91,92,93,94,95,96,97,98,100,101,102,103;1
100;105;200;109,218,200;19:p,18:m,17:m,16:p;100;50;15,16,17,18,19,20,21,22,23,24,86,88,89,90,91,92,93,94,95,96,97,98,99,101,102,103;1
101;105;201;109,219,201;19:p,18:p,15:p;100;50;13,14,19,20,21,22,23,24,86,89,91,92,93,94,95,97,99,100,102,103;1
102;106;200;109,218,200;19:m,18:m,17:m,16:p;100;50;15,16,17,18,19,20,21,22,23,24,86,88,89,90,91,92,93,94,95,96,97,98,99,100,101,103;1
102;106;200;110,218,200;19:m,18:m,17:m,16:p;100;50;15,16,17,18,19,20,21,22,23,24,86,88,89,90,91,92,93,94,95,96,97,98,99,100,101,103;1
103;106;201;110,219,201;19:m,18:p,15:p;100;50;13,14,19,20,21,22,23,24,87,89,91,92,93,94,95,97,99,100,101,102;1
104;107;213;103,215,213;21:m,24:p;100;50;17,21,25,26,27,29,33,35,54,57,58,59,60,63,64,65,84,85,105,106,108;0
105;108;213;104,215,213;21:p,24:p;100;50;18,22,25,26,27,29,33,35,54,57,58,59,60,63,64,65,84,85,104,106,108;0
......
#ifndef ADDRESSES_H
#define ADDRESSES_H
#define PORT 15000
#define MAERKLIN_SEND_PORT 15731
#define MAERKLIN_RECV_PORT 15730
#define MAERKLIN_ADDR "192.168.0.104"
#define IXL_ADDR "192.168.0.102"
#define POS_ADDR_1 "192.168.0.151"
#define POS_ADDR_2 "192.168.0.153"
#define POS_ADDR_3 "192.168.0.152"
#define POS_ADDR_4 "192.168.0.150"
#define TCC_ADDR_BLACK "192.168.0.122"
#define TCC_ADDR_GREEN "192.168.0.103"
#define TCC_ADDR_RED "192.168.0.138"
#define TCC_ADDR_BLUE "192.168.0.107"
#define INPUT_TERMINAL "192.168.0.103"
#define QT_ADDR "192.168.0.255"
#define RECV_ADDR "0.0.0.0"
#define BROADCAST_ADDR "192.168.0.255"
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment