ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.168 by root, Sun Jan 14 00:37:14 2007 UTC vs.
Revision 1.188 by root, Sat Jan 20 23:30:16 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
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;
… …
503our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
504our @CB_MAP = (); 507our @CB_MAP = ();
505 508
506my %attachment; 509my %attachment;
507 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
508sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
509 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
510 519
511 use sort 'stable'; 520 use sort 'stable';
512 521
… …
683# object support 692# object support
684 693
685sub reattach { 694sub reattach {
686 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
687 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
688 699
689 my $registry = $obj->registry; 700 my $registry = $obj->registry;
690 701
691 @$registry = (); 702 @$registry = ();
692 703
… …
949 960
950sub exists($) { 961sub exists($) {
951 my ($login) = @_; 962 my ($login) = @_;
952 963
953 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
954 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
955} 966}
956 967
957sub find($) { 968sub find($) {
958 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
959 my $login = $_[0]; 970 my $login = $_[0];
… …
1105 1116
1106use Fcntl; 1117use Fcntl;
1107use Coro::AIO; 1118use Coro::AIO;
1108 1119
1109use overload 1120use overload
1110 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1111 1123
1112our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1113our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1114 1126
1115sub generate_random_map { 1127sub generate_random_map {
1116 my ($self, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1117
1118 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1119 $self->_create_random_map ( 1130 $self->_create_random_map (
1120 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1121 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1122 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1129 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1130 (cf::region::find $rmp->{region}), $rmp->{custom} 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1131 ) 1142 )
1132} 1143}
1133 1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1134sub register { 1153sub register {
1135 my (undef, $regex) = @_; 1154 my (undef, $regex, $prio) = @_;
1136 my $pkg = caller; 1155 my $pkg = caller;
1137 1156
1138 no strict; 1157 no strict;
1139 push @{"$pkg\::ISA"}, __PACKAGE__; 1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1140 1159
1141 $EXT_MAP{$pkg} = qr<$regex>; 1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1142} 1161}
1143 1162
1144# also paths starting with '/' 1163# also paths starting with '/'
1145$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1146 1177
1147sub normalise { 1178sub normalise {
1148 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1149 1180
1150 # map plan: 1181 # map plan:
… …
1181 1212
1182 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
1183 1214
1184 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1185 1216
1186 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1187 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1188 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1189 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1190 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1191 return $self; 1222 return $self;
1192 } 1223 }
… …
1247 1278
1248sub unlink_save { 1279sub unlink_save {
1249 my ($self) = @_; 1280 my ($self) = @_;
1250 1281
1251 utf8::encode (my $save = $self->save_path); 1282 utf8::encode (my $save = $self->save_path);
1252 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1253 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1254} 1285}
1255 1286
1256sub load_header_from($) { 1287sub load_header_from($) {
1257 my ($self, $path) = @_; 1288 my ($self, $path) = @_;
1258 1289
… …
1266 $self->{load_path} = $path; 1297 $self->{load_path} = $path;
1267 1298
1268 1 1299 1
1269} 1300}
1270 1301
1271sub load_orig { 1302sub load_header_orig {
1272 my ($self) = @_; 1303 my ($self) = @_;
1273 1304
1274 $self->load_header_from ($self->load_path) 1305 $self->load_header_from ($self->load_path)
1275} 1306}
1276 1307
1277sub load_temp { 1308sub load_header_temp {
1278 my ($self) = @_; 1309 my ($self) = @_;
1279 1310
1280 $self->load_header_from ($self->save_path) 1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub 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
1324sub 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;
1281} 1331}
1282 1332
1283sub load_header { 1333sub load_header {
1284 my ($self) = @_; 1334 my ($self) = @_;
1285 1335
1286 if ($self->load_temp) { 1336 if ($self->load_header_temp) {
1287 $self->last_access ((delete $self->{last_access}) 1337 $self->prepare_temp;
1288 || $cf::RUNTIME); #d#
1289 # safety
1290 $self->{instantiate_time} = $cf::RUNTIME
1291 if $self->{instantiate_time} > $cf::RUNTIME;
1292 } else { 1338 } else {
1293 $self->load_orig 1339 $self->load_header_orig
1294 or return; 1340 or return;
1295 1341 $self->prepare_orig;
1296 $self->{load_original} = 1;
1297 $self->{instantiate_time} = $cf::RUNTIME;
1298 $self->last_access ($cf::RUNTIME);
1299 $self->instantiate;
1300 } 1342 }
1301 1343
1302 1 1344 1
1303} 1345}
1304 1346
… …
1319 1361
1320 $map->load_header 1362 $map->load_header
1321 or return; 1363 or return;
1322 1364
1323 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1324 $map->reset; 1368 $map->reset;
1325 undef $guard; 1369 undef $guard;
1326 $map = find $path 1370 $map = find $path
1327 or return; 1371 or return;
1328 } 1372 }
1329 1373
1330 $cf::MAP{$path} = $map 1374 $cf::MAP{$path} = $map
1331 } 1375 }
1332} 1376}
1333 1377
1378sub pre_load { }
1379sub post_load { }
1380
1334sub load { 1381sub load {
1335 my ($self) = @_; 1382 my ($self) = @_;
1336 1383
1337 my $path = $self->{path}; 1384 my $path = $self->{path};
1338 my $guard = cf::lock_acquire "map_load:$path"; 1385 my $guard = cf::lock_acquire "map_load:$path";
… …
1340 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1341 1388
1342 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1343 1390
1344 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1345 $self->_load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1346 or return; 1396 or return;
1347 1397
1348 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1349 if delete $self->{load_original}; 1399 if delete $self->{load_original};
… …
1371 unless $self->difficulty; 1421 unless $self->difficulty;
1372 Coro::cede; 1422 Coro::cede;
1373 $self->activate; 1423 $self->activate;
1374 } 1424 }
1375 1425
1426 $self->post_load;
1427
1376 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1377} 1429}
1378 1430
1379sub customise_for { 1431sub customise_for {
1380 my ($self, $ob) = @_; 1432 my ($self, $ob) = @_;
… …
1420 1472
1421 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1422} 1474}
1423 1475
1424our %MAP_PREFETCH; 1476our %MAP_PREFETCH;
1425our $MAP_PREFETCHER = Coro::async { 1477our $MAP_PREFETCHER = undef;
1426 while () {
1427 for my $path (keys %MAP_PREFETCH) {
1428 my $map = find $path
1429 or next;
1430 $map->load;
1431
1432 delete $MAP_PREFETCH{$path};
1433 }
1434 Coro::schedule;
1435 }
1436};
1437 1478
1438sub find_async { 1479sub find_async {
1439 my ($path, $origin) = @_; 1480 my ($path, $origin) = @_;
1440 1481
1441 $path = normalise $path, $origin && $origin->{path}; 1482 $path = normalise $path, $origin && $origin->{path};
1442 1483
1443 if (my $map = $cf::MAP{$path}) { 1484 if (my $map = $cf::MAP{$path}) {
1444 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1445 } 1486 }
1446 1487
1447 $MAP_PREFETCH{$path} = 0; 1488 undef $MAP_PREFETCH{$path};
1448 $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 };
1449 1501
1450 () 1502 ()
1451} 1503}
1452 1504
1453sub save { 1505sub save {
… …
1498 1550
1499sub reset_at { 1551sub reset_at {
1500 my ($self) = @_; 1552 my ($self) = @_;
1501 1553
1502 # TODO: safety, remove and allow resettable per-player maps 1554 # TODO: safety, remove and allow resettable per-player maps
1503 return 1e99 if $self->isa ("ext::map_per_player"); 1555 return 1e99 if $self->isa ("ext::map_per_player");#d#
1504 return 1e99 if $self->{deny_reset}; 1556 return 1e99 if $self->{deny_reset};
1505 1557
1506 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1558 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1507 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1559 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1508 1560
… …
1513 my ($self) = @_; 1565 my ($self) = @_;
1514 1566
1515 $self->reset_at <= $cf::RUNTIME 1567 $self->reset_at <= $cf::RUNTIME
1516} 1568}
1517 1569
1518sub rename {
1519 my ($self, $new_path) = @_;
1520
1521 normalise $new_path;
1522
1523 $self->unlink_save;
1524
1525 delete $cf::MAP{$self->path};
1526 $self->{path} = $new_path; $self->path ($self->{path});
1527 $cf::MAP{$self->path} = $self;
1528
1529 $self->save;
1530}
1531
1532sub reset { 1570sub reset {
1533 my ($self) = @_; 1571 my ($self) = @_;
1534 1572
1535 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1573 my $lock = cf::lock_acquire "map_data:$self->{path}";
1536 1574
… …
1553my $nuke_counter = "aaaa"; 1591my $nuke_counter = "aaaa";
1554 1592
1555sub nuke { 1593sub nuke {
1556 my ($self) = @_; 1594 my ($self) = @_;
1557 1595
1596 delete $cf::MAP{$self->path};
1597
1598 $self->unlink_save;
1599
1600 bless $self, "cf::map";
1601 delete $self->{deny_reset};
1558 $self->{deny_save} = 1; 1602 $self->{deny_save} = 1;
1559 $self->reset_timeout (1); 1603 $self->reset_timeout (1);
1560 $self->rename ("{nuke}/" . ($nuke_counter++)); 1604 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1605
1606 $cf::MAP{$self->path} = $self;
1607
1561 $self->reset; # polite request, might not happen 1608 $self->reset; # polite request, might not happen
1562} 1609}
1563 1610
1564=item cf::map::unique_maps 1611=item cf::map::unique_maps
1565 1612
… …
1796 1843
1797sub parse_random_map_params { 1844sub parse_random_map_params {
1798 my ($spec) = @_; 1845 my ($spec) = @_;
1799 1846
1800 my $rmp = { # defaults 1847 my $rmp = { # defaults
1801 xsize => 10, 1848 xsize => (cf::rndm 15, 40),
1802 ysize => 10, 1849 ysize => (cf::rndm 15, 40),
1850 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1851 #layout => string,
1803 }; 1852 };
1804 1853
1805 for (split /\n/, $spec) { 1854 for (split /\n/, $spec) {
1806 my ($k, $v) = split /\s+/, $_, 2; 1855 my ($k, $v) = split /\s+/, $_, 2;
1807 1856
… …
1811 $rmp 1860 $rmp
1812} 1861}
1813 1862
1814sub prepare_random_map { 1863sub prepare_random_map {
1815 my ($exit) = @_; 1864 my ($exit) = @_;
1865
1866 my $guard = cf::lock_acquire "exit_prepare:$exit";
1816 1867
1817 # all this does is basically replace the /! path by 1868 # all this does is basically replace the /! path by
1818 # a new random map path (?random/...) with a seed 1869 # a new random map path (?random/...) with a seed
1819 # that depends on the exit object 1870 # that depends on the exit object
1820 1871
… …
1829 1880
1830 $rmp->{random_seed} ||= $exit->random_seed; 1881 $rmp->{random_seed} ||= $exit->random_seed;
1831 1882
1832 my $data = cf::to_json $rmp; 1883 my $data = cf::to_json $rmp;
1833 my $md5 = Digest::MD5::md5_hex $data; 1884 my $md5 = Digest::MD5::md5_hex $data;
1885 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1834 1886
1835 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) {
1836 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;
1837 1891
1838 $exit->slaying ("?random/$md5"); 1892 $exit->slaying ("?random/$md5");
1839 $exit->msg (undef); 1893 $exit->msg (undef);
1840 } 1894 }
1841} 1895}
… …
2151 sub db_sync() { 2205 sub db_sync() {
2152 db_save if $dirty; 2206 db_save if $dirty;
2153 undef $dirty; 2207 undef $dirty;
2154 } 2208 }
2155 2209
2156 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 {
2157 db_sync; 2211 db_sync;
2158 }); 2212 });
2159 2213
2160 sub db_dirty() { 2214 sub db_dirty() {
2161 $dirty = 1; 2215 $dirty = 1;
… …
2211 2265
2212sub main { 2266sub main {
2213 # we must not ever block the main coroutine 2267 # we must not ever block the main coroutine
2214 local $Coro::idle = sub { 2268 local $Coro::idle = sub {
2215 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#
2270 (async {
2216 async { Event::one_event }; 2271 Event::one_event;
2272 })->prio (Coro::PRIO_MAX);
2217 }; 2273 };
2218 2274
2219 cfg_load; 2275 cfg_load;
2220 db_load; 2276 db_load;
2221 load_extensions; 2277 load_extensions;
2278
2279 $TICK_WATCHER->start;
2222 Event::loop; 2280 Event::loop;
2223} 2281}
2224 2282
2225############################################################################# 2283#############################################################################
2226# initialisation and cleanup 2284# initialisation and cleanup
… …
2268} 2326}
2269 2327
2270sub reload() { 2328sub reload() {
2271 # can/must only be called in main 2329 # can/must only be called in main
2272 if ($Coro::current != $Coro::main) { 2330 if ($Coro::current != $Coro::main) {
2273 warn "can only reload from main coroutine\n"; 2331 warn "can only reload from main coroutine";
2274 return; 2332 return;
2275 } 2333 }
2276 2334
2277 warn "reloading..."; 2335 warn "reloading...";
2278 2336
2279 warn "freezing server"; 2337 warn "cancelling server ticker";
2280 my $guard = freeze_mainloop; 2338 $TICK_WATCHER->cancel;
2339
2281 cf::emergency_save; 2340 cf::emergency_save;
2282
2283 warn "sync database to disk";
2284 cf::db_sync;
2285 IO::AIO::flush;
2286 2341
2287 eval { 2342 eval {
2288 # 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
2289 2344
2345 warn "syncing database to disk";
2346 cf::db_sync;
2347
2290 warn "cancel all watchers"; 2348 warn "cancelling all WF_AUTOCANCEL watchers";
2291 for (Event::all_watchers) { 2349 for (Event::all_watchers) {
2292 $_->cancel if $_->data & WF_AUTOCANCEL; 2350 $_->cancel if $_->data & WF_AUTOCANCEL;
2293 } 2351 }
2294 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
2295 warn "cancel all extension coros"; 2361 warn "cancelling all extension coros";
2296 $_->cancel for values %EXT_CORO; 2362 $_->cancel for values %EXT_CORO;
2297 %EXT_CORO = (); 2363 %EXT_CORO = ();
2298 2364
2299 warn "remove commands"; 2365 warn "removing commands";
2300 %COMMAND = (); 2366 %COMMAND = ();
2301 2367
2302 warn "remove ext commands"; 2368 warn "removing ext commands";
2303 %EXTCMD = (); 2369 %EXTCMD = ();
2304 2370
2305 warn "unload/nuke all extensions"; 2371 warn "unloading/nuking all extensions";
2306 for my $pkg (@EXTS) { 2372 for my $pkg (@EXTS) {
2307 warn "... unloading $pkg"; 2373 warn "... unloading $pkg";
2308 2374
2309 if (my $cb = $pkg->can ("unload")) { 2375 if (my $cb = $pkg->can ("unload")) {
2310 eval { 2376 eval {
… …
2315 2381
2316 warn "... nuking $pkg"; 2382 warn "... nuking $pkg";
2317 Symbol::delete_package $pkg; 2383 Symbol::delete_package $pkg;
2318 } 2384 }
2319 2385
2320 warn "unload all perl modules loaded from $LIBDIR"; 2386 warn "unloading all perl modules loaded from $LIBDIR";
2321 while (my ($k, $v) = each %INC) { 2387 while (my ($k, $v) = each %INC) {
2322 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2388 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2323 2389
2324 warn "removing <$k>"; 2390 warn "... unloading $k";
2325 delete $INC{$k}; 2391 delete $INC{$k};
2326 2392
2327 $k =~ s/\.pm$//; 2393 $k =~ s/\.pm$//;
2328 $k =~ s/\//::/g; 2394 $k =~ s/\//::/g;
2329 2395
… …
2332 } 2398 }
2333 2399
2334 Symbol::delete_package $k; 2400 Symbol::delete_package $k;
2335 } 2401 }
2336 2402
2337 warn "get rid of safe::, as good as possible"; 2403 warn "getting rid of safe::, as good as possible";
2338 Symbol::delete_package "safe::$_" 2404 Symbol::delete_package "safe::$_"
2339 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);
2340 2406
2341 warn "unload cf.pm \"a bit\""; 2407 warn "unloading cf.pm \"a bit\"";
2342 delete $INC{"cf.pm"}; 2408 delete $INC{"cf.pm"};
2343 2409
2344 # don't, removes xs symbols, too, 2410 # don't, removes xs symbols, too,
2345 # and global variables created in xs 2411 # and global variables created in xs
2346 #Symbol::delete_package __PACKAGE__; 2412 #Symbol::delete_package __PACKAGE__;
2347 2413
2414 warn "unload completed, starting to reload now";
2415
2348 warn "reloading cf.pm"; 2416 warn "reloading cf.pm";
2349 require cf; 2417 require cf;
2350 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2418 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2351 2419
2352 warn "load config and database again"; 2420 warn "loading config and database again";
2353 cf::cfg_load; 2421 cf::cfg_load;
2354 cf::db_load; 2422 cf::db_load;
2355 2423
2356 warn "load extensions"; 2424 warn "loading extensions";
2357 cf::load_extensions; 2425 cf::load_extensions;
2358 2426
2359 warn "reattach attachments to objects/players"; 2427 warn "reattaching attachments to objects/players";
2360 _global_reattach; 2428 _global_reattach;
2361 warn "reattach attachments to maps"; 2429 warn "reattaching attachments to maps";
2362 reattach $_ for values %MAP; 2430 reattach $_ for values %MAP;
2431
2432 warn "restarting server ticker";
2433
2434 $TICK_WATCHER->start;
2363 }; 2435 };
2364 2436
2365 if ($@) { 2437 if ($@) {
2366 warn $@; 2438 warn $@;
2367 warn "error while reloading, exiting."; 2439 warn "error while reloading, exiting.";
… …
2369 } 2441 }
2370 2442
2371 warn "reloaded"; 2443 warn "reloaded";
2372}; 2444};
2373 2445
2446our $RELOAD_WATCHER; # used only during reload
2447
2374register_command "reload" => sub { 2448register_command "reload" => sub {
2375 my ($who, $arg) = @_; 2449 my ($who, $arg) = @_;
2376 2450
2377 if ($who->flag (FLAG_WIZ)) { 2451 if ($who->flag (FLAG_WIZ)) {
2378 $who->message ("start of reload."); 2452 $who->message ("reloading server.");
2453
2454 # doing reload synchronously and two reloads happen back-to-back,
2455 # coro crashes during coro_state_free->destroy here.
2456
2457 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2379 reload; 2458 reload;
2380 $who->message ("end of reload."); 2459 undef $RELOAD_WATCHER;
2460 });
2381 } 2461 }
2382}; 2462};
2383 2463
2384unshift @INC, $LIBDIR; 2464unshift @INC, $LIBDIR;
2465
2466my $bug_warning = 0;
2385 2467
2386$TICK_WATCHER = Event->timer ( 2468$TICK_WATCHER = Event->timer (
2387 reentrant => 0, 2469 reentrant => 0,
2470 parked => 1,
2388 prio => 0, 2471 prio => 0,
2389 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2390 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2391 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
2392 $NOW = Event::time; 2481 $NOW = Event::time;
2393 2482
2394 cf::server_tick; # one server iteration 2483 cf::server_tick; # one server iteration
2395 $RUNTIME += $TICK; 2484 $RUNTIME += $TICK;
2396 $NEXT_TICK += $TICK; 2485 $NEXT_TICK += $TICK;
… …
2416 cb => \&IO::AIO::poll_cb, 2505 cb => \&IO::AIO::poll_cb,
2417); 2506);
2418 2507
2419$WRITE_RUNTIME_WATCHER = Event->timer ( 2508$WRITE_RUNTIME_WATCHER = Event->timer (
2420 data => WF_AUTOCANCEL, 2509 data => WF_AUTOCANCEL,
2421 after => 0, 2510 after => 1,
2422 interval => 10, 2511 interval => 10,
2423 cb => sub { 2512 prio => 6, # keep it lowest so it acts like a watchdog
2424 (Coro::unblock_sub { 2513 cb => Coro::unblock_sub {
2425 write_runtime 2514 write_runtime
2426 or warn "ERROR: unable to write runtime file: $!"; 2515 or warn "ERROR: unable to write runtime file: $!";
2427 })->();
2428 }, 2516 },
2429); 2517);
2430 2518
2431END { cf::emergency_save } 2519END { cf::emergency_save }
2432 2520

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines