… | |
… | |
349 | my $runtime = cf::localdir . "/runtime"; |
349 | my $runtime = cf::localdir . "/runtime"; |
350 | |
350 | |
351 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
351 | my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 |
352 | or return; |
352 | or return; |
353 | |
353 | |
|
|
354 | my $value = $cf::RUNTIME + 90 + 10; |
354 | my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock |
355 | # 10 is the runtime save interval, for a monotonic clock |
|
|
356 | # 60 allows for the watchdog to kill the server. |
|
|
357 | |
355 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
358 | (aio_write $fh, 0, (length $value), $value, 0) <= 0 |
356 | and return; |
359 | and return; |
357 | |
360 | |
358 | aio_fsync $fh |
361 | aio_fsync $fh |
359 | and return; |
362 | and return; |
… | |
… | |
957 | |
960 | |
958 | sub exists($) { |
961 | sub exists($) { |
959 | my ($login) = @_; |
962 | my ($login) = @_; |
960 | |
963 | |
961 | $cf::PLAYER{$login} |
964 | $cf::PLAYER{$login} |
962 | or cf::sync_job { !aio_stat $login } |
965 | or cf::sync_job { !aio_stat path $login } |
963 | } |
966 | } |
964 | |
967 | |
965 | sub find($) { |
968 | sub find($) { |
966 | return $cf::PLAYER{$_[0]} || do { |
969 | return $cf::PLAYER{$_[0]} || do { |
967 | my $login = $_[0]; |
970 | my $login = $_[0]; |
… | |
… | |
1121 | our $MAX_RESET = 3600; |
1124 | our $MAX_RESET = 3600; |
1122 | our $DEFAULT_RESET = 3000; |
1125 | our $DEFAULT_RESET = 3000; |
1123 | |
1126 | |
1124 | sub generate_random_map { |
1127 | sub generate_random_map { |
1125 | my ($self, $rmp) = @_; |
1128 | my ($self, $rmp) = @_; |
1126 | |
|
|
1127 | # mit "rum" bekleckern, nicht |
1129 | # mit "rum" bekleckern, nicht |
1128 | $self->_create_random_map ( |
1130 | $self->_create_random_map ( |
1129 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
1131 | $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, |
1130 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, |
1132 | $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, |
1131 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
1133 | $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, |
… | |
… | |
1138 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
1140 | $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, |
1139 | (cf::region::find $rmp->{region}), $rmp->{custom} |
1141 | (cf::region::find $rmp->{region}), $rmp->{custom} |
1140 | ) |
1142 | ) |
1141 | } |
1143 | } |
1142 | |
1144 | |
|
|
1145 | =item cf::map->register ($regex, $prio) |
|
|
1146 | |
|
|
1147 | Register a handler for the map path matching the given regex at the |
|
|
1148 | givne priority (higher is better, built-in handlers have priority 0, the |
|
|
1149 | default). |
|
|
1150 | |
|
|
1151 | =cut |
|
|
1152 | |
1143 | sub register { |
1153 | sub register { |
1144 | my (undef, $regex) = @_; |
1154 | my (undef, $regex, $prio) = @_; |
1145 | my $pkg = caller; |
1155 | my $pkg = caller; |
1146 | |
1156 | |
1147 | no strict; |
1157 | no strict; |
1148 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1158 | push @{"$pkg\::ISA"}, __PACKAGE__; |
1149 | |
1159 | |
1150 | $EXT_MAP{$pkg} = qr<$regex>; |
1160 | $EXT_MAP{$pkg} = [$prio, qr<$regex>]; |
1151 | } |
1161 | } |
1152 | |
1162 | |
1153 | # also paths starting with '/' |
1163 | # also paths starting with '/' |
1154 | $EXT_MAP{"cf::map"} = qr{^(?=/)}; |
1164 | $EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; |
1155 | |
1165 | |
1156 | sub thawer_merge { |
1166 | sub thawer_merge { |
1157 | my ($self, $merge) = @_; |
1167 | my ($self, $merge) = @_; |
1158 | |
1168 | |
1159 | # we have to keep some variables in memory intact |
1169 | # we have to keep some variables in memory intact |
… | |
… | |
1202 | |
1212 | |
1203 | return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object |
1213 | return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object |
1204 | |
1214 | |
1205 | $path = normalise $path, $base; |
1215 | $path = normalise $path, $base; |
1206 | |
1216 | |
1207 | for my $pkg (keys %EXT_MAP) { |
1217 | for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) { |
1208 | if ($path =~ $EXT_MAP{$pkg}) { |
1218 | if ($path =~ $EXT_MAP{$pkg}[1]) { |
1209 | my $self = bless cf::map::new, $pkg; |
1219 | my $self = bless cf::map::new, $pkg; |
1210 | $self->{path} = $path; $self->path ($path); |
1220 | $self->{path} = $path; $self->path ($path); |
1211 | $self->init; # pass $1 etc. |
1221 | $self->init; # pass $1 etc. |
1212 | return $self; |
1222 | return $self; |
1213 | } |
1223 | } |
… | |
… | |
1287 | $self->{load_path} = $path; |
1297 | $self->{load_path} = $path; |
1288 | |
1298 | |
1289 | 1 |
1299 | 1 |
1290 | } |
1300 | } |
1291 | |
1301 | |
1292 | sub load_orig { |
1302 | sub load_header_orig { |
1293 | my ($self) = @_; |
1303 | my ($self) = @_; |
1294 | |
1304 | |
1295 | $self->load_header_from ($self->load_path) |
1305 | $self->load_header_from ($self->load_path) |
1296 | } |
1306 | } |
1297 | |
1307 | |
1298 | sub load_temp { |
1308 | sub load_header_temp { |
1299 | my ($self) = @_; |
1309 | my ($self) = @_; |
1300 | |
1310 | |
1301 | $self->load_header_from ($self->save_path) |
1311 | $self->load_header_from ($self->save_path) |
|
|
1312 | } |
|
|
1313 | |
|
|
1314 | sub prepare_temp { |
|
|
1315 | my ($self) = @_; |
|
|
1316 | |
|
|
1317 | $self->last_access ((delete $self->{last_access}) |
|
|
1318 | || $cf::RUNTIME); #d# |
|
|
1319 | # safety |
|
|
1320 | $self->{instantiate_time} = $cf::RUNTIME |
|
|
1321 | if $self->{instantiate_time} > $cf::RUNTIME; |
|
|
1322 | } |
|
|
1323 | |
|
|
1324 | sub prepare_orig { |
|
|
1325 | my ($self) = @_; |
|
|
1326 | |
|
|
1327 | $self->{load_original} = 1; |
|
|
1328 | $self->{instantiate_time} = $cf::RUNTIME; |
|
|
1329 | $self->last_access ($cf::RUNTIME); |
|
|
1330 | $self->instantiate; |
1302 | } |
1331 | } |
1303 | |
1332 | |
1304 | sub load_header { |
1333 | sub load_header { |
1305 | my ($self) = @_; |
1334 | my ($self) = @_; |
1306 | |
1335 | |
1307 | if ($self->load_temp) { |
1336 | if ($self->load_header_temp) { |
1308 | $self->last_access ((delete $self->{last_access}) |
1337 | $self->prepare_temp; |
1309 | || $cf::RUNTIME); #d# |
|
|
1310 | # safety |
|
|
1311 | $self->{instantiate_time} = $cf::RUNTIME |
|
|
1312 | if $self->{instantiate_time} > $cf::RUNTIME; |
|
|
1313 | } else { |
1338 | } else { |
1314 | $self->load_orig |
1339 | $self->load_header_orig |
1315 | or return; |
1340 | or return; |
1316 | |
1341 | $self->prepare_orig; |
1317 | $self->{load_original} = 1; |
|
|
1318 | $self->{instantiate_time} = $cf::RUNTIME; |
|
|
1319 | $self->last_access ($cf::RUNTIME); |
|
|
1320 | $self->instantiate; |
|
|
1321 | } |
1342 | } |
1322 | |
1343 | |
1323 | 1 |
1344 | 1 |
1324 | } |
1345 | } |
1325 | |
1346 | |
… | |
… | |
1340 | |
1361 | |
1341 | $map->load_header |
1362 | $map->load_header |
1342 | or return; |
1363 | or return; |
1343 | |
1364 | |
1344 | if ($map->should_reset) { |
1365 | if ($map->should_reset) { |
|
|
1366 | # doing this can freeze the server in a sync job, obviously |
1345 | $cf::WAIT_FOR_TICK->wait; |
1367 | #$cf::WAIT_FOR_TICK->wait; |
1346 | $map->reset; |
1368 | $map->reset; |
1347 | undef $guard; |
1369 | undef $guard; |
1348 | $map = find $path |
1370 | $map = find $path |
1349 | or return; |
1371 | or return; |
1350 | } |
1372 | } |
1351 | |
1373 | |
1352 | $cf::MAP{$path} = $map |
1374 | $cf::MAP{$path} = $map |
1353 | } |
1375 | } |
1354 | } |
1376 | } |
1355 | |
1377 | |
|
|
1378 | sub pre_load { } |
|
|
1379 | sub post_load { } |
|
|
1380 | |
1356 | sub load { |
1381 | sub load { |
1357 | my ($self) = @_; |
1382 | my ($self) = @_; |
1358 | |
1383 | |
1359 | my $path = $self->{path}; |
1384 | my $path = $self->{path}; |
1360 | my $guard = cf::lock_acquire "map_load:$path"; |
1385 | my $guard = cf::lock_acquire "map_load:$path"; |
… | |
… | |
1362 | return if $self->in_memory != cf::MAP_SWAPPED; |
1387 | return if $self->in_memory != cf::MAP_SWAPPED; |
1363 | |
1388 | |
1364 | $self->in_memory (cf::MAP_LOADING); |
1389 | $self->in_memory (cf::MAP_LOADING); |
1365 | |
1390 | |
1366 | $self->alloc; |
1391 | $self->alloc; |
|
|
1392 | |
|
|
1393 | $self->pre_load; |
|
|
1394 | |
1367 | $self->_load_objects ($self->{load_path}, 1) |
1395 | $self->_load_objects ($self->{load_path}, 1) |
1368 | or return; |
1396 | or return; |
1369 | |
1397 | |
1370 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1398 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1371 | if delete $self->{load_original}; |
1399 | if delete $self->{load_original}; |
… | |
… | |
1393 | unless $self->difficulty; |
1421 | unless $self->difficulty; |
1394 | Coro::cede; |
1422 | Coro::cede; |
1395 | $self->activate; |
1423 | $self->activate; |
1396 | } |
1424 | } |
1397 | |
1425 | |
|
|
1426 | $self->post_load; |
|
|
1427 | |
1398 | $self->in_memory (cf::MAP_IN_MEMORY); |
1428 | $self->in_memory (cf::MAP_IN_MEMORY); |
1399 | } |
1429 | } |
1400 | |
1430 | |
1401 | sub customise_for { |
1431 | sub customise_for { |
1402 | my ($self, $ob) = @_; |
1432 | my ($self, $ob) = @_; |
… | |
… | |
1442 | |
1472 | |
1443 | cf::sync_job { $map->load }; |
1473 | cf::sync_job { $map->load }; |
1444 | } |
1474 | } |
1445 | |
1475 | |
1446 | our %MAP_PREFETCH; |
1476 | our %MAP_PREFETCH; |
1447 | our $MAP_PREFETCHER = Coro::async { |
1477 | our $MAP_PREFETCHER = undef; |
1448 | while () { |
|
|
1449 | for my $path (keys %MAP_PREFETCH) { |
|
|
1450 | my $map = find $path |
|
|
1451 | or next; |
|
|
1452 | $map->load; |
|
|
1453 | |
|
|
1454 | delete $MAP_PREFETCH{$path}; |
|
|
1455 | } |
|
|
1456 | Coro::schedule; |
|
|
1457 | } |
|
|
1458 | }; |
|
|
1459 | |
1478 | |
1460 | sub find_async { |
1479 | sub find_async { |
1461 | my ($path, $origin) = @_; |
1480 | my ($path, $origin) = @_; |
1462 | |
1481 | |
1463 | $path = normalise $path, $origin && $origin->{path}; |
1482 | $path = normalise $path, $origin && $origin->{path}; |
1464 | |
1483 | |
1465 | if (my $map = $cf::MAP{$path}) { |
1484 | if (my $map = $cf::MAP{$path}) { |
1466 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1485 | return $map if $map->in_memory == cf::MAP_IN_MEMORY; |
1467 | } |
1486 | } |
1468 | |
1487 | |
1469 | $MAP_PREFETCH{$path} = 0; |
1488 | undef $MAP_PREFETCH{$path}; |
1470 | $MAP_PREFETCHER->ready; |
1489 | $MAP_PREFETCHER ||= cf::async { |
|
|
1490 | while (%MAP_PREFETCH) { |
|
|
1491 | for my $path (keys %MAP_PREFETCH) { |
|
|
1492 | my $map = find $path |
|
|
1493 | or next; |
|
|
1494 | $map->load; |
|
|
1495 | |
|
|
1496 | delete $MAP_PREFETCH{$path}; |
|
|
1497 | } |
|
|
1498 | } |
|
|
1499 | undef $MAP_PREFETCHER; |
|
|
1500 | }; |
1471 | |
1501 | |
1472 | () |
1502 | () |
1473 | } |
1503 | } |
1474 | |
1504 | |
1475 | sub save { |
1505 | sub save { |
… | |
… | |
1813 | |
1843 | |
1814 | sub parse_random_map_params { |
1844 | sub parse_random_map_params { |
1815 | my ($spec) = @_; |
1845 | my ($spec) = @_; |
1816 | |
1846 | |
1817 | my $rmp = { # defaults |
1847 | my $rmp = { # defaults |
1818 | xsize => 10, |
1848 | xsize => (cf::rndm 15, 40), |
1819 | ysize => 10, |
1849 | ysize => (cf::rndm 15, 40), |
|
|
1850 | symmetry => (cf::rndm 1, cf::SYMMETRY_XY), |
|
|
1851 | #layout => string, |
1820 | }; |
1852 | }; |
1821 | |
1853 | |
1822 | for (split /\n/, $spec) { |
1854 | for (split /\n/, $spec) { |
1823 | my ($k, $v) = split /\s+/, $_, 2; |
1855 | my ($k, $v) = split /\s+/, $_, 2; |
1824 | |
1856 | |
… | |
… | |
1828 | $rmp |
1860 | $rmp |
1829 | } |
1861 | } |
1830 | |
1862 | |
1831 | sub prepare_random_map { |
1863 | sub prepare_random_map { |
1832 | my ($exit) = @_; |
1864 | my ($exit) = @_; |
|
|
1865 | |
|
|
1866 | my $guard = cf::lock_acquire "exit_prepare:$exit"; |
1833 | |
1867 | |
1834 | # all this does is basically replace the /! path by |
1868 | # all this does is basically replace the /! path by |
1835 | # a new random map path (?random/...) with a seed |
1869 | # a new random map path (?random/...) with a seed |
1836 | # that depends on the exit object |
1870 | # that depends on the exit object |
1837 | |
1871 | |
… | |
… | |
1846 | |
1880 | |
1847 | $rmp->{random_seed} ||= $exit->random_seed; |
1881 | $rmp->{random_seed} ||= $exit->random_seed; |
1848 | |
1882 | |
1849 | my $data = cf::to_json $rmp; |
1883 | my $data = cf::to_json $rmp; |
1850 | my $md5 = Digest::MD5::md5_hex $data; |
1884 | my $md5 = Digest::MD5::md5_hex $data; |
|
|
1885 | my $meta = "$cf::RANDOM_MAPS/$md5.meta"; |
1851 | |
1886 | |
1852 | if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { |
1887 | if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { |
1853 | aio_write $fh, 0, (length $data), $data, 0; |
1888 | aio_write $fh, 0, (length $data), $data, 0; |
|
|
1889 | undef $fh; |
|
|
1890 | aio_rename "$meta~", $meta; |
1854 | |
1891 | |
1855 | $exit->slaying ("?random/$md5"); |
1892 | $exit->slaying ("?random/$md5"); |
1856 | $exit->msg (undef); |
1893 | $exit->msg (undef); |
1857 | } |
1894 | } |
1858 | } |
1895 | } |
… | |
… | |
2168 | sub db_sync() { |
2205 | sub db_sync() { |
2169 | db_save if $dirty; |
2206 | db_save if $dirty; |
2170 | undef $dirty; |
2207 | undef $dirty; |
2171 | } |
2208 | } |
2172 | |
2209 | |
2173 | my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { |
2210 | my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub { |
2174 | db_sync; |
2211 | db_sync; |
2175 | }); |
2212 | }); |
2176 | |
2213 | |
2177 | sub db_dirty() { |
2214 | sub db_dirty() { |
2178 | $dirty = 1; |
2215 | $dirty = 1; |
… | |
… | |
2229 | sub main { |
2266 | sub main { |
2230 | # we must not ever block the main coroutine |
2267 | # we must not ever block the main coroutine |
2231 | local $Coro::idle = sub { |
2268 | local $Coro::idle = sub { |
2232 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
2269 | Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# |
2233 | (async { |
2270 | (async { |
2234 | warn "BP1\n";#d# |
|
|
2235 | Event::one_event; |
2271 | Event::one_event; |
2236 | warn "BP2\n";#d# |
|
|
2237 | })->prio (Coro::PRIO_MAX); |
2272 | })->prio (Coro::PRIO_MAX); |
2238 | }; |
2273 | }; |
2239 | |
2274 | |
2240 | cfg_load; |
2275 | cfg_load; |
2241 | db_load; |
2276 | db_load; |
2242 | load_extensions; |
2277 | load_extensions; |
|
|
2278 | |
|
|
2279 | $TICK_WATCHER->start; |
2243 | Event::loop; |
2280 | Event::loop; |
2244 | } |
2281 | } |
2245 | |
2282 | |
2246 | ############################################################################# |
2283 | ############################################################################# |
2247 | # initialisation and cleanup |
2284 | # initialisation and cleanup |
… | |
… | |
2289 | } |
2326 | } |
2290 | |
2327 | |
2291 | sub reload() { |
2328 | sub reload() { |
2292 | # can/must only be called in main |
2329 | # can/must only be called in main |
2293 | if ($Coro::current != $Coro::main) { |
2330 | if ($Coro::current != $Coro::main) { |
2294 | warn "can only reload from main coroutine\n"; |
2331 | warn "can only reload from main coroutine"; |
2295 | return; |
2332 | return; |
2296 | } |
2333 | } |
2297 | |
2334 | |
2298 | warn "reloading..."; |
2335 | warn "reloading..."; |
2299 | |
2336 | |
2300 | warn "freezing server"; |
2337 | warn "cancelling server ticker"; |
2301 | my $guard = freeze_mainloop; |
2338 | $TICK_WATCHER->cancel; |
|
|
2339 | |
2302 | cf::emergency_save; |
2340 | cf::emergency_save; |
2303 | |
|
|
2304 | warn "sync database to disk"; |
|
|
2305 | cf::db_sync; |
|
|
2306 | IO::AIO::flush; |
|
|
2307 | |
2341 | |
2308 | eval { |
2342 | eval { |
2309 | # if anything goes wrong in here, we should simply crash as we already saved |
2343 | # if anything goes wrong in here, we should simply crash as we already saved |
2310 | |
2344 | |
|
|
2345 | warn "syncing database to disk"; |
|
|
2346 | cf::db_sync; |
|
|
2347 | |
2311 | warn "cancel all watchers"; |
2348 | warn "cancelling all WF_AUTOCANCEL watchers"; |
2312 | for (Event::all_watchers) { |
2349 | for (Event::all_watchers) { |
2313 | $_->cancel if $_->data & WF_AUTOCANCEL; |
2350 | $_->cancel if $_->data & WF_AUTOCANCEL; |
2314 | } |
2351 | } |
2315 | |
2352 | |
|
|
2353 | warn "flushing outstanding aio requests"; |
|
|
2354 | for (;;) { |
|
|
2355 | IO::AIO::flush; |
|
|
2356 | Coro::cede; |
|
|
2357 | last unless IO::AIO::nreqs; |
|
|
2358 | warn "iterate..."; |
|
|
2359 | } |
|
|
2360 | |
2316 | warn "cancel all extension coros"; |
2361 | warn "cancelling all extension coros"; |
2317 | $_->cancel for values %EXT_CORO; |
2362 | $_->cancel for values %EXT_CORO; |
2318 | %EXT_CORO = (); |
2363 | %EXT_CORO = (); |
2319 | |
2364 | |
2320 | warn "remove commands"; |
2365 | warn "removing commands"; |
2321 | %COMMAND = (); |
2366 | %COMMAND = (); |
2322 | |
2367 | |
2323 | warn "remove ext commands"; |
2368 | warn "removing ext commands"; |
2324 | %EXTCMD = (); |
2369 | %EXTCMD = (); |
2325 | |
2370 | |
2326 | warn "unload/nuke all extensions"; |
2371 | warn "unloading/nuking all extensions"; |
2327 | for my $pkg (@EXTS) { |
2372 | for my $pkg (@EXTS) { |
2328 | warn "... unloading $pkg"; |
2373 | warn "... unloading $pkg"; |
2329 | |
2374 | |
2330 | if (my $cb = $pkg->can ("unload")) { |
2375 | if (my $cb = $pkg->can ("unload")) { |
2331 | eval { |
2376 | eval { |
… | |
… | |
2336 | |
2381 | |
2337 | warn "... nuking $pkg"; |
2382 | warn "... nuking $pkg"; |
2338 | Symbol::delete_package $pkg; |
2383 | Symbol::delete_package $pkg; |
2339 | } |
2384 | } |
2340 | |
2385 | |
2341 | warn "unload all perl modules loaded from $LIBDIR"; |
2386 | warn "unloading all perl modules loaded from $LIBDIR"; |
2342 | while (my ($k, $v) = each %INC) { |
2387 | while (my ($k, $v) = each %INC) { |
2343 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
2388 | next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; |
2344 | |
2389 | |
2345 | warn "removing <$k>"; |
2390 | warn "... unloading $k"; |
2346 | delete $INC{$k}; |
2391 | delete $INC{$k}; |
2347 | |
2392 | |
2348 | $k =~ s/\.pm$//; |
2393 | $k =~ s/\.pm$//; |
2349 | $k =~ s/\//::/g; |
2394 | $k =~ s/\//::/g; |
2350 | |
2395 | |
… | |
… | |
2353 | } |
2398 | } |
2354 | |
2399 | |
2355 | Symbol::delete_package $k; |
2400 | Symbol::delete_package $k; |
2356 | } |
2401 | } |
2357 | |
2402 | |
2358 | warn "get rid of safe::, as good as possible"; |
2403 | warn "getting rid of safe::, as good as possible"; |
2359 | Symbol::delete_package "safe::$_" |
2404 | Symbol::delete_package "safe::$_" |
2360 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
2405 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
2361 | |
2406 | |
2362 | warn "unload cf.pm \"a bit\""; |
2407 | warn "unloading cf.pm \"a bit\""; |
2363 | delete $INC{"cf.pm"}; |
2408 | delete $INC{"cf.pm"}; |
2364 | |
2409 | |
2365 | # don't, removes xs symbols, too, |
2410 | # don't, removes xs symbols, too, |
2366 | # and global variables created in xs |
2411 | # and global variables created in xs |
2367 | #Symbol::delete_package __PACKAGE__; |
2412 | #Symbol::delete_package __PACKAGE__; |
2368 | |
2413 | |
|
|
2414 | warn "unload completed, starting to reload now"; |
|
|
2415 | |
2369 | warn "reloading cf.pm"; |
2416 | warn "reloading cf.pm"; |
2370 | require cf; |
2417 | require cf; |
2371 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
2418 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
2372 | |
2419 | |
2373 | warn "load config and database again"; |
2420 | warn "loading config and database again"; |
2374 | cf::cfg_load; |
2421 | cf::cfg_load; |
2375 | cf::db_load; |
2422 | cf::db_load; |
2376 | |
2423 | |
2377 | warn "load extensions"; |
2424 | warn "loading extensions"; |
2378 | cf::load_extensions; |
2425 | cf::load_extensions; |
2379 | |
2426 | |
2380 | warn "reattach attachments to objects/players"; |
2427 | warn "reattaching attachments to objects/players"; |
2381 | _global_reattach; |
2428 | _global_reattach; |
2382 | warn "reattach attachments to maps"; |
2429 | warn "reattaching attachments to maps"; |
2383 | reattach $_ for values %MAP; |
2430 | reattach $_ for values %MAP; |
|
|
2431 | |
|
|
2432 | warn "restarting server ticker"; |
|
|
2433 | |
|
|
2434 | $TICK_WATCHER->start; |
2384 | }; |
2435 | }; |
2385 | |
2436 | |
2386 | if ($@) { |
2437 | if ($@) { |
2387 | warn $@; |
2438 | warn $@; |
2388 | warn "error while reloading, exiting."; |
2439 | warn "error while reloading, exiting."; |
… | |
… | |
2410 | } |
2461 | } |
2411 | }; |
2462 | }; |
2412 | |
2463 | |
2413 | unshift @INC, $LIBDIR; |
2464 | unshift @INC, $LIBDIR; |
2414 | |
2465 | |
|
|
2466 | my $bug_warning = 0; |
|
|
2467 | |
2415 | $TICK_WATCHER = Event->timer ( |
2468 | $TICK_WATCHER = Event->timer ( |
2416 | reentrant => 0, |
2469 | reentrant => 0, |
|
|
2470 | parked => 1, |
2417 | prio => 0, |
2471 | prio => 0, |
2418 | at => $NEXT_TICK || $TICK, |
2472 | at => $NEXT_TICK || $TICK, |
2419 | data => WF_AUTOCANCEL, |
2473 | data => WF_AUTOCANCEL, |
2420 | cb => sub { |
2474 | cb => sub { |
|
|
2475 | if ($Coro::current != $Coro::main) { |
|
|
2476 | Carp::cluck "major BUG: server tick called outside of main coro, skipping it" |
|
|
2477 | unless ++$bug_warning > 10; |
|
|
2478 | return; |
|
|
2479 | } |
|
|
2480 | |
2421 | $NOW = Event::time; |
2481 | $NOW = Event::time; |
2422 | |
2482 | |
2423 | cf::server_tick; # one server iteration |
2483 | cf::server_tick; # one server iteration |
2424 | $RUNTIME += $TICK; |
2484 | $RUNTIME += $TICK; |
2425 | $NEXT_TICK += $TICK; |
2485 | $NEXT_TICK += $TICK; |
… | |
… | |
2445 | cb => \&IO::AIO::poll_cb, |
2505 | cb => \&IO::AIO::poll_cb, |
2446 | ); |
2506 | ); |
2447 | |
2507 | |
2448 | $WRITE_RUNTIME_WATCHER = Event->timer ( |
2508 | $WRITE_RUNTIME_WATCHER = Event->timer ( |
2449 | data => WF_AUTOCANCEL, |
2509 | data => WF_AUTOCANCEL, |
2450 | after => 0, |
2510 | after => 1, |
2451 | interval => 10, |
2511 | interval => 10, |
2452 | cb => sub { |
2512 | prio => 6, # keep it lowest so it acts like a watchdog |
2453 | (Coro::unblock_sub { |
2513 | cb => Coro::unblock_sub { |
2454 | write_runtime |
2514 | write_runtime |
2455 | or warn "ERROR: unable to write runtime file: $!"; |
2515 | or warn "ERROR: unable to write runtime file: $!"; |
2456 | })->(); |
|
|
2457 | }, |
2516 | }, |
2458 | ); |
2517 | ); |
2459 | |
2518 | |
2460 | END { cf::emergency_save } |
2519 | END { cf::emergency_save } |
2461 | |
2520 | |