… | |
… | |
8 | use Storable; |
8 | use Storable; |
9 | use Opcode; |
9 | use Opcode; |
10 | use Safe; |
10 | use Safe; |
11 | use Safe::Hole; |
11 | use Safe::Hole; |
12 | |
12 | |
13 | use Coro 3.3; |
13 | use Coro 3.3 (); |
14 | use Coro::Event; |
14 | use Coro::Event; |
15 | use Coro::Timer; |
15 | use Coro::Timer; |
16 | use Coro::Signal; |
16 | use Coro::Signal; |
17 | use Coro::Semaphore; |
17 | use Coro::Semaphore; |
18 | use Coro::AIO; |
18 | use Coro::AIO; |
… | |
… | |
49 | our $UPTIME; $UPTIME ||= time; |
49 | our $UPTIME; $UPTIME ||= time; |
50 | our $RUNTIME; |
50 | our $RUNTIME; |
51 | |
51 | |
52 | our %MAP; # all maps |
52 | our %MAP; # all maps |
53 | our $LINK_MAP; # the special {link} map |
53 | our $LINK_MAP; # the special {link} map |
54 | our $FREEZE; |
|
|
55 | our $RANDOM_MAPS = cf::localdir . "/random"; |
54 | our $RANDOM_MAPS = cf::localdir . "/random"; |
56 | our %EXT_CORO; |
55 | our %EXT_CORO; |
57 | |
56 | |
58 | binmode STDOUT; |
57 | binmode STDOUT; |
59 | binmode STDERR; |
58 | binmode STDERR; |
… | |
… | |
71 | mkdir cf::localdir . "/" . cf::uniquedir; |
70 | mkdir cf::localdir . "/" . cf::uniquedir; |
72 | mkdir $RANDOM_MAPS; |
71 | mkdir $RANDOM_MAPS; |
73 | |
72 | |
74 | # a special map that is always available |
73 | # a special map that is always available |
75 | our $LINK_MAP; |
74 | our $LINK_MAP; |
76 | |
75 | our $EMERGENCY_POSITION; |
77 | our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
|
|
78 | |
76 | |
79 | ############################################################################# |
77 | ############################################################################# |
80 | |
78 | |
81 | =head2 GLOBAL VARIABLES |
79 | =head2 GLOBAL VARIABLES |
82 | |
80 | |
… | |
… | |
181 | sub to_json($) { |
179 | sub to_json($) { |
182 | $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs |
180 | $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs |
183 | JSON::Syck::Dump $_[0] |
181 | JSON::Syck::Dump $_[0] |
184 | } |
182 | } |
185 | |
183 | |
186 | =item my $guard = cf::guard { BLOCK } |
|
|
187 | |
|
|
188 | Run the given callback when the guard object gets destroyed (useful for |
|
|
189 | coroutine cancellations). |
|
|
190 | |
|
|
191 | You can call C<< ->cancel >> on the guard object to stop the block from |
|
|
192 | being executed. |
|
|
193 | |
|
|
194 | =cut |
|
|
195 | |
|
|
196 | sub guard(&) { |
|
|
197 | bless \(my $cb = $_[0]), cf::guard::; |
|
|
198 | } |
|
|
199 | |
|
|
200 | sub cf::guard::cancel { |
|
|
201 | ${$_[0]} = sub { }; |
|
|
202 | } |
|
|
203 | |
|
|
204 | sub cf::guard::DESTROY { |
|
|
205 | ${$_[0]}->(); |
|
|
206 | } |
|
|
207 | |
|
|
208 | =item cf::lock_wait $string |
184 | =item cf::lock_wait $string |
209 | |
185 | |
210 | Wait until the given lock is available. See cf::lock_acquire. |
186 | Wait until the given lock is available. See cf::lock_acquire. |
211 | |
187 | |
212 | =item my $lock = cf::lock_acquire $string |
188 | =item my $lock = cf::lock_acquire $string |
213 | |
189 | |
214 | Wait until the given lock is available and then acquires it and returns |
190 | Wait until the given lock is available and then acquires it and returns |
215 | a guard object. If the guard object gets destroyed (goes out of scope, |
191 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
216 | for example when the coroutine gets canceled), the lock is automatically |
192 | for example when the coroutine gets canceled), the lock is automatically |
217 | returned. |
193 | returned. |
218 | |
194 | |
219 | Lock names should begin with a unique identifier (for example, find_map |
195 | Lock names should begin with a unique identifier (for example, cf::map::find |
220 | uses map_find and load_map uses map_load). |
196 | uses map_find and cf::map::load uses map_load). |
221 | |
197 | |
222 | =cut |
198 | =cut |
223 | |
199 | |
224 | our %LOCK; |
200 | our %LOCK; |
225 | |
201 | |
… | |
… | |
239 | # wait, to be sure we are not locked |
215 | # wait, to be sure we are not locked |
240 | lock_wait $key; |
216 | lock_wait $key; |
241 | |
217 | |
242 | $LOCK{$key} = []; |
218 | $LOCK{$key} = []; |
243 | |
219 | |
244 | cf::guard { |
220 | Coro::guard { |
245 | # wake up all waiters, to be on the safe side |
221 | # wake up all waiters, to be on the safe side |
246 | $_->ready for @{ delete $LOCK{$key} }; |
222 | $_->ready for @{ delete $LOCK{$key} }; |
247 | } |
223 | } |
|
|
224 | } |
|
|
225 | |
|
|
226 | =item cf::async { BLOCK } |
|
|
227 | |
|
|
228 | Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the |
|
|
229 | error instead of exiting the server in case of a problem. |
|
|
230 | |
|
|
231 | =cut |
|
|
232 | |
|
|
233 | sub async(&) { |
|
|
234 | my ($cb) = @_; |
|
|
235 | |
|
|
236 | Coro::async { |
|
|
237 | eval { $cb->() }; |
|
|
238 | warn $@ if $@; |
|
|
239 | } |
|
|
240 | } |
|
|
241 | |
|
|
242 | sub freeze_mainloop { |
|
|
243 | return unless $TICK_WATCHER->is_active; |
|
|
244 | |
|
|
245 | my $guard = Coro::guard { $TICK_WATCHER->start }; |
|
|
246 | $TICK_WATCHER->stop; |
|
|
247 | $guard |
248 | } |
248 | } |
249 | |
249 | |
250 | =item cf::sync_job { BLOCK } |
250 | =item cf::sync_job { BLOCK } |
251 | |
251 | |
252 | The design of crossfire+ requires that the main coro ($Coro::main) is |
252 | The design of crossfire+ requires that the main coro ($Coro::main) is |
… | |
… | |
267 | # this is the main coro, too bad, we have to block |
267 | # this is the main coro, too bad, we have to block |
268 | # till the operation succeeds, freezing the server :/ |
268 | # till the operation succeeds, freezing the server :/ |
269 | |
269 | |
270 | # TODO: use suspend/resume instead |
270 | # TODO: use suspend/resume instead |
271 | # (but this is cancel-safe) |
271 | # (but this is cancel-safe) |
272 | local $FREEZE = 1; |
272 | my $freeze_guard = freeze_mainloop; |
273 | |
273 | |
274 | my $busy = 1; |
274 | my $busy = 1; |
275 | my @res; |
275 | my @res; |
276 | |
276 | |
277 | (Coro::async { |
277 | (Coro::async { |
… | |
… | |
301 | =cut |
301 | =cut |
302 | |
302 | |
303 | sub coro(&) { |
303 | sub coro(&) { |
304 | my $cb = shift; |
304 | my $cb = shift; |
305 | |
305 | |
306 | my $coro; $coro = async { |
306 | my $coro = &cf::async ($cb); |
307 | eval { |
|
|
308 | $cb->(); |
|
|
309 | }; |
|
|
310 | warn $@ if $@; |
|
|
311 | }; |
|
|
312 | |
307 | |
313 | $coro->on_destroy (sub { |
308 | $coro->on_destroy (sub { |
314 | delete $EXT_CORO{$coro+0}; |
309 | delete $EXT_CORO{$coro+0}; |
315 | }); |
310 | }); |
316 | $EXT_CORO{$coro+0} = $coro; |
311 | $EXT_CORO{$coro+0} = $coro; |
… | |
… | |
1126 | package cf::map; |
1121 | package cf::map; |
1127 | |
1122 | |
1128 | use Fcntl; |
1123 | use Fcntl; |
1129 | use Coro::AIO; |
1124 | use Coro::AIO; |
1130 | |
1125 | |
1131 | our $MAX_RESET = 7200; |
1126 | our $MAX_RESET = 3600; |
1132 | our $DEFAULT_RESET = 3600; |
1127 | our $DEFAULT_RESET = 3000; |
1133 | |
1128 | |
1134 | sub generate_random_map { |
1129 | sub generate_random_map { |
1135 | my ($path, $rmp) = @_; |
1130 | my ($path, $rmp) = @_; |
1136 | |
1131 | |
1137 | # mit "rum" bekleckern, nicht |
1132 | # mit "rum" bekleckern, nicht |
… | |
… | |
1153 | # and all this just because we cannot iterate over |
1148 | # and all this just because we cannot iterate over |
1154 | # all maps in C++... |
1149 | # all maps in C++... |
1155 | sub change_all_map_light { |
1150 | sub change_all_map_light { |
1156 | my ($change) = @_; |
1151 | my ($change) = @_; |
1157 | |
1152 | |
1158 | $_->change_map_light ($change) for values %cf::MAP; |
1153 | $_->change_map_light ($change) |
|
|
1154 | for grep $_->outdoor, values %cf::MAP; |
1159 | } |
1155 | } |
1160 | |
1156 | |
1161 | sub try_load_header($) { |
1157 | sub try_load_header($) { |
1162 | my ($path) = @_; |
1158 | my ($path) = @_; |
1163 | |
1159 | |
… | |
… | |
1166 | or return; |
1162 | or return; |
1167 | |
1163 | |
1168 | my $map = cf::map::new |
1164 | my $map = cf::map::new |
1169 | or return; |
1165 | or return; |
1170 | |
1166 | |
|
|
1167 | # for better error messages only, will be overwritten |
|
|
1168 | $map->path ($path); |
|
|
1169 | |
1171 | $map->load_header ($path) |
1170 | $map->load_header ($path) |
1172 | or return; |
1171 | or return; |
1173 | |
1172 | |
1174 | $map->{load_path} = $path; |
1173 | $map->{load_path} = $path; |
1175 | |
1174 | |
1176 | $map |
1175 | $map |
1177 | } |
1176 | } |
1178 | |
1177 | |
|
|
1178 | sub find; |
1179 | sub find_map { |
1179 | sub find { |
1180 | my ($path, $origin) = @_; |
1180 | my ($path, $origin) = @_; |
1181 | |
1181 | |
1182 | #warn "find_map<$path,$origin>\n";#d# |
1182 | #warn "find<$path,$origin>\n";#d# |
1183 | |
1183 | |
1184 | $path = new cf::path $path, $origin && $origin->path; |
1184 | $path = new cf::path $path, $origin && $origin->path; |
1185 | my $key = $path->as_string; |
1185 | my $key = $path->as_string; |
1186 | |
1186 | |
1187 | cf::lock_wait "map_find:$key"; |
1187 | cf::lock_wait "map_find:$key"; |
… | |
… | |
1190 | my $guard = cf::lock_acquire "map_find:$key"; |
1190 | my $guard = cf::lock_acquire "map_find:$key"; |
1191 | |
1191 | |
1192 | # do it the slow way |
1192 | # do it the slow way |
1193 | my $map = try_load_header $path->save_path; |
1193 | my $map = try_load_header $path->save_path; |
1194 | |
1194 | |
|
|
1195 | Coro::cede; |
|
|
1196 | |
1195 | if ($map) { |
1197 | if ($map) { |
|
|
1198 | $map->last_access ((delete $map->{last_access}) |
|
|
1199 | || $cf::RUNTIME); #d# |
1196 | # safety |
1200 | # safety |
1197 | $map->{instantiate_time} = $cf::RUNTIME |
1201 | $map->{instantiate_time} = $cf::RUNTIME |
1198 | if $map->{instantiate_time} > $cf::RUNTIME; |
1202 | if $map->{instantiate_time} > $cf::RUNTIME; |
1199 | } else { |
1203 | } else { |
1200 | if (my $rmp = $path->random_map_params) { |
1204 | if (my $rmp = $path->random_map_params) { |
… | |
… | |
1205 | |
1209 | |
1206 | $map or return; |
1210 | $map or return; |
1207 | |
1211 | |
1208 | $map->{load_original} = 1; |
1212 | $map->{load_original} = 1; |
1209 | $map->{instantiate_time} = $cf::RUNTIME; |
1213 | $map->{instantiate_time} = $cf::RUNTIME; |
|
|
1214 | $map->last_access ($cf::RUNTIME); |
1210 | $map->instantiate; |
1215 | $map->instantiate; |
1211 | |
1216 | |
1212 | # per-player maps become, after loading, normal maps |
1217 | # per-player maps become, after loading, normal maps |
1213 | $map->per_player (0) if $path->{user_rel}; |
1218 | $map->per_player (0) if $path->{user_rel}; |
1214 | } |
1219 | } |
1215 | |
1220 | |
1216 | $map->path ($key); |
1221 | $map->path ($key); |
1217 | $map->{path} = $path; |
1222 | $map->{path} = $path; |
1218 | $map->{last_save} = $cf::RUNTIME; |
1223 | $map->{last_save} = $cf::RUNTIME; |
1219 | $map->last_access ($cf::RUNTIME); |
1224 | |
|
|
1225 | Coro::cede; |
1220 | |
1226 | |
1221 | if ($map->should_reset) { |
1227 | if ($map->should_reset) { |
1222 | $map->reset; |
1228 | $map->reset; |
|
|
1229 | undef $guard; |
1223 | $map = find_map $path; |
1230 | $map = find $path |
|
|
1231 | or return; |
1224 | } |
1232 | } |
1225 | |
1233 | |
1226 | $cf::MAP{$key} = $map |
1234 | $cf::MAP{$key} = $map |
1227 | } |
1235 | } |
1228 | } |
1236 | } |
… | |
… | |
1249 | if (aio_open $uniq, O_RDONLY, 0) { |
1257 | if (aio_open $uniq, O_RDONLY, 0) { |
1250 | $self->clear_unique_items; |
1258 | $self->clear_unique_items; |
1251 | $self->load_objects ($uniq, 0); |
1259 | $self->load_objects ($uniq, 0); |
1252 | } |
1260 | } |
1253 | } |
1261 | } |
|
|
1262 | |
|
|
1263 | Coro::cede; |
1254 | |
1264 | |
1255 | # now do the right thing for maps |
1265 | # now do the right thing for maps |
1256 | $self->link_multipart_objects; |
1266 | $self->link_multipart_objects; |
1257 | |
1267 | |
1258 | if ($self->{path}->is_style_map) { |
1268 | if ($self->{path}->is_style_map) { |
… | |
… | |
1266 | $self->difficulty ($self->estimate_difficulty) |
1276 | $self->difficulty ($self->estimate_difficulty) |
1267 | unless $self->difficulty; |
1277 | unless $self->difficulty; |
1268 | $self->activate; |
1278 | $self->activate; |
1269 | } |
1279 | } |
1270 | |
1280 | |
|
|
1281 | Coro::cede; |
|
|
1282 | |
1271 | $self->in_memory (cf::MAP_IN_MEMORY); |
1283 | $self->in_memory (cf::MAP_IN_MEMORY); |
1272 | } |
1284 | } |
1273 | |
1285 | |
1274 | sub load_map_sync { |
1286 | sub find_sync { |
1275 | my ($path, $origin) = @_; |
1287 | my ($path, $origin) = @_; |
1276 | |
1288 | |
1277 | #warn "load_map_sync<$path, $origin>\n";#d# |
1289 | cf::sync_job { cf::map::find $path, $origin } |
|
|
1290 | } |
1278 | |
1291 | |
1279 | cf::sync_job { |
1292 | sub do_load_sync { |
1280 | my $map = cf::map::find_map $path, $origin |
1293 | my ($map) = @_; |
1281 | or return; |
1294 | |
1282 | $map->load; |
1295 | cf::sync_job { $map->load }; |
1283 | $map |
|
|
1284 | } |
|
|
1285 | } |
1296 | } |
1286 | |
1297 | |
1287 | sub save { |
1298 | sub save { |
1288 | my ($self) = @_; |
1299 | my ($self) = @_; |
1289 | |
1300 | |
… | |
… | |
1295 | my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; |
1306 | my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; |
1296 | |
1307 | |
1297 | $self->{load_path} = $save; |
1308 | $self->{load_path} = $save; |
1298 | |
1309 | |
1299 | return if $self->{deny_save}; |
1310 | return if $self->{deny_save}; |
|
|
1311 | |
|
|
1312 | local $self->{last_access} = $self->last_access;#d# |
1300 | |
1313 | |
1301 | if ($uniq) { |
1314 | if ($uniq) { |
1302 | $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
1315 | $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); |
1303 | $self->save_objects ($uniq, cf::IO_UNIQUES); |
1316 | $self->save_objects ($uniq, cf::IO_UNIQUES); |
1304 | } else { |
1317 | } else { |
… | |
… | |
1307 | } |
1320 | } |
1308 | |
1321 | |
1309 | sub swap_out { |
1322 | sub swap_out { |
1310 | my ($self) = @_; |
1323 | my ($self) = @_; |
1311 | |
1324 | |
|
|
1325 | # save first because save cedes |
|
|
1326 | $self->save; |
|
|
1327 | |
1312 | return if $self->players; |
1328 | return if $self->players; |
1313 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
1329 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
1314 | return if $self->{deny_save}; |
1330 | return if $self->{deny_save}; |
1315 | |
1331 | |
1316 | $self->save; |
|
|
1317 | $self->clear; |
1332 | $self->clear; |
1318 | $self->in_memory (cf::MAP_SWAPPED); |
1333 | $self->in_memory (cf::MAP_SWAPPED); |
1319 | } |
1334 | } |
1320 | |
1335 | |
1321 | sub reset_at { |
1336 | sub reset_at { |
… | |
… | |
1387 | |
1402 | |
1388 | sub customise_for { |
1403 | sub customise_for { |
1389 | my ($map, $ob) = @_; |
1404 | my ($map, $ob) = @_; |
1390 | |
1405 | |
1391 | if ($map->per_player) { |
1406 | if ($map->per_player) { |
1392 | return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; |
1407 | return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; |
1393 | } |
1408 | } |
1394 | |
1409 | |
1395 | $map |
1410 | $map |
1396 | } |
1411 | } |
1397 | |
1412 | |
1398 | sub emergency_save { |
1413 | sub emergency_save { |
1399 | local $cf::FREEZE = 1; |
1414 | my $freeze_guard = cf::freeze_mainloop; |
1400 | |
1415 | |
1401 | warn "enter emergency map save\n"; |
1416 | warn "enter emergency map save\n"; |
1402 | |
1417 | |
1403 | cf::sync_job { |
1418 | cf::sync_job { |
1404 | warn "begin emergency map save\n"; |
1419 | warn "begin emergency map save\n"; |
… | |
… | |
1494 | my $link_pos = delete $self->{_link_pos}; |
1509 | my $link_pos = delete $self->{_link_pos}; |
1495 | |
1510 | |
1496 | unless ($map) { |
1511 | unless ($map) { |
1497 | # restore original map position |
1512 | # restore original map position |
1498 | ($map, $x, $y) = @{ $link_pos || [] }; |
1513 | ($map, $x, $y) = @{ $link_pos || [] }; |
1499 | $map = cf::map::find_map $map; |
1514 | $map = cf::map::find $map; |
1500 | |
1515 | |
1501 | unless ($map) { |
1516 | unless ($map) { |
1502 | ($map, $x, $y) = @$EMERGENCY_POSITION; |
1517 | ($map, $x, $y) = @$EMERGENCY_POSITION; |
1503 | $map = cf::map::find_map $map |
1518 | $map = cf::map::find $map |
1504 | or die "FATAL: cannot load emergency map\n"; |
1519 | or die "FATAL: cannot load emergency map\n"; |
1505 | } |
1520 | } |
1506 | } |
1521 | } |
1507 | |
1522 | |
1508 | ($x, $y) = (-1, -1) |
1523 | ($x, $y) = (-1, -1) |
… | |
… | |
1534 | |
1549 | |
1535 | # try to abort aborted map switching on player login :) |
1550 | # try to abort aborted map switching on player login :) |
1536 | # should happen only on crashes |
1551 | # should happen only on crashes |
1537 | if ($pl->ob->{_link_pos}) { |
1552 | if ($pl->ob->{_link_pos}) { |
1538 | $pl->ob->enter_link; |
1553 | $pl->ob->enter_link; |
1539 | Coro::async { |
1554 | cf::async { |
1540 | # we need this sleep as the login has a concurrent enter_exit running |
1555 | # we need this sleep as the login has a concurrent enter_exit running |
1541 | # and this sleep increases chances of the player not ending up in scorn |
1556 | # and this sleep increases chances of the player not ending up in scorn |
1542 | Coro::Timer::sleep 1; |
1557 | Coro::Timer::sleep 1; |
1543 | $pl->ob->leave_link; |
1558 | $pl->ob->leave_link; |
1544 | }; |
1559 | }; |
1545 | } |
1560 | } |
1546 | }, |
1561 | }, |
1547 | ); |
1562 | ); |
1548 | |
1563 | |
1549 | =item $player_object->goto_map ($path, $x, $y) |
1564 | =item $player_object->goto ($path, $x, $y) |
1550 | |
1565 | |
1551 | =cut |
1566 | =cut |
1552 | |
1567 | |
1553 | sub cf::object::player::goto_map { |
1568 | sub cf::object::player::goto { |
1554 | my ($self, $path, $x, $y) = @_; |
1569 | my ($self, $path, $x, $y) = @_; |
1555 | |
1570 | |
1556 | $self->enter_link; |
1571 | $self->enter_link; |
1557 | |
1572 | |
1558 | (Coro::async { |
1573 | (cf::async { |
1559 | $path = new cf::path $path; |
1574 | $path = new cf::path $path; |
1560 | |
1575 | |
1561 | my $map = cf::map::find_map $path->as_string; |
1576 | my $map = cf::map::find $path->as_string; |
1562 | $map = $map->customise_for ($self) if $map; |
1577 | $map = $map->customise_for ($self) if $map; |
1563 | |
1578 | |
1564 | # warn "entering ", $map->path, " at ($x, $y)\n" |
1579 | # warn "entering ", $map->path, " at ($x, $y)\n" |
1565 | # if $map; |
1580 | # if $map; |
1566 | |
1581 | |
… | |
… | |
1625 | |
1640 | |
1626 | return unless $self->type == cf::PLAYER; |
1641 | return unless $self->type == cf::PLAYER; |
1627 | |
1642 | |
1628 | $self->enter_link; |
1643 | $self->enter_link; |
1629 | |
1644 | |
1630 | (Coro::async { |
1645 | (cf::async { |
|
|
1646 | $self->deactivate_recursive; # just to be sure |
1631 | unless (eval { |
1647 | unless (eval { |
1632 | |
|
|
1633 | prepare_random_map $exit |
1648 | prepare_random_map $exit |
1634 | if $exit->slaying eq "/!"; |
1649 | if $exit->slaying eq "/!"; |
1635 | |
1650 | |
1636 | my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; |
1651 | my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; |
1637 | $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); |
1652 | $self->goto ($path, $exit->stats->hp, $exit->stats->sp); |
1638 | |
1653 | |
1639 | 1; |
1654 | 1; |
1640 | }) { |
1655 | }) { |
1641 | $self->message ("Something went wrong deep within the crossfire server. " |
1656 | $self->message ("Something went wrong deep within the crossfire server. " |
1642 | . "I'll try to bring you back to the map you were before. " |
1657 | . "I'll try to bring you back to the map you were before. " |
… | |
… | |
1699 | on_reply => sub { |
1714 | on_reply => sub { |
1700 | my ($ns, $msg) = @_; |
1715 | my ($ns, $msg) = @_; |
1701 | |
1716 | |
1702 | # this weird shuffling is so that direct followup queries |
1717 | # this weird shuffling is so that direct followup queries |
1703 | # get handled first |
1718 | # get handled first |
1704 | my $queue = delete $ns->{query_queue}; |
1719 | my $queue = delete $ns->{query_queue} |
|
|
1720 | or return; # be conservative, not sure how that can happen, but we saw a crash here |
1705 | |
1721 | |
1706 | (shift @$queue)->[1]->($msg); |
1722 | (shift @$queue)->[1]->($msg); |
1707 | |
1723 | |
1708 | push @{ $ns->{query_queue} }, @$queue; |
1724 | push @{ $ns->{query_queue} }, @$queue; |
1709 | |
1725 | |
… | |
… | |
1726 | =cut |
1742 | =cut |
1727 | |
1743 | |
1728 | sub cf::client::coro { |
1744 | sub cf::client::coro { |
1729 | my ($self, $cb) = @_; |
1745 | my ($self, $cb) = @_; |
1730 | |
1746 | |
1731 | my $coro; $coro = async { |
1747 | my $coro = &cf::async ($cb); |
1732 | eval { |
|
|
1733 | $cb->(); |
|
|
1734 | }; |
|
|
1735 | warn $@ if $@; |
|
|
1736 | }; |
|
|
1737 | |
1748 | |
1738 | $coro->on_destroy (sub { |
1749 | $coro->on_destroy (sub { |
1739 | delete $self->{_coro}{$coro+0}; |
1750 | delete $self->{_coro}{$coro+0}; |
1740 | }); |
1751 | }); |
1741 | |
1752 | |
… | |
… | |
1976 | open my $fh, "<:utf8", cf::confdir . "/config" |
1987 | open my $fh, "<:utf8", cf::confdir . "/config" |
1977 | or return; |
1988 | or return; |
1978 | |
1989 | |
1979 | local $/; |
1990 | local $/; |
1980 | *CFG = YAML::Syck::Load <$fh>; |
1991 | *CFG = YAML::Syck::Load <$fh>; |
|
|
1992 | |
|
|
1993 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
|
|
1994 | |
|
|
1995 | if (exists $CFG{mlockall}) { |
|
|
1996 | eval { |
|
|
1997 | $CFG{mlockall} ? &mlockall : &munlockall |
|
|
1998 | and die "WARNING: m(un)lockall failed: $!\n"; |
|
|
1999 | }; |
|
|
2000 | warn $@ if $@; |
|
|
2001 | } |
1981 | } |
2002 | } |
1982 | |
2003 | |
1983 | sub main { |
2004 | sub main { |
1984 | # we must not ever block the main coroutine |
2005 | # we must not ever block the main coroutine |
1985 | local $Coro::idle = sub { |
2006 | local $Coro::idle = sub { |
… | |
… | |
2005 | return; |
2026 | return; |
2006 | } |
2027 | } |
2007 | |
2028 | |
2008 | warn "reloading..."; |
2029 | warn "reloading..."; |
2009 | |
2030 | |
2010 | local $FREEZE = 1; |
2031 | my $guard = freeze_mainloop; |
2011 | cf::emergency_save; |
2032 | cf::emergency_save; |
2012 | |
2033 | |
2013 | eval { |
2034 | eval { |
2014 | # if anything goes wrong in here, we should simply crash as we already saved |
2035 | # if anything goes wrong in here, we should simply crash as we already saved |
2015 | |
2036 | |
… | |
… | |
2151 | reentrant => 0, |
2172 | reentrant => 0, |
2152 | prio => 0, |
2173 | prio => 0, |
2153 | at => $NEXT_TICK || $TICK, |
2174 | at => $NEXT_TICK || $TICK, |
2154 | data => WF_AUTOCANCEL, |
2175 | data => WF_AUTOCANCEL, |
2155 | cb => sub { |
2176 | cb => sub { |
2156 | unless ($FREEZE) { |
|
|
2157 | cf::server_tick; # one server iteration |
2177 | cf::server_tick; # one server iteration |
2158 | $RUNTIME += $TICK; |
2178 | $RUNTIME += $TICK; |
2159 | } |
|
|
2160 | |
|
|
2161 | $NEXT_TICK += $TICK; |
2179 | $NEXT_TICK += $TICK; |
2162 | |
2180 | |
2163 | # if we are delayed by four ticks or more, skip them all |
2181 | # if we are delayed by four ticks or more, skip them all |
2164 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2182 | $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; |
2165 | |
2183 | |
… | |
… | |
2188 | or warn "ERROR: unable to write runtime file: $!"; |
2206 | or warn "ERROR: unable to write runtime file: $!"; |
2189 | })->(); |
2207 | })->(); |
2190 | }, |
2208 | }, |
2191 | ); |
2209 | ); |
2192 | |
2210 | |
|
|
2211 | END { cf::emergency_save } |
|
|
2212 | |
2193 | 1 |
2213 | 1 |
2194 | |
2214 | |