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.166 by root, Sat Jan 13 23:06:13 2007 UTC vs.
Revision 1.186 by root, Sat Jan 20 01:12:39 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;
… …
44our @EVENT; 44our @EVENT;
45our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
46 46
47our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
49our $NEXT_TICK; 51our $NEXT_TICK;
50our $NOW; 52our $NOW;
51 53
52our %CFG; 54our %CFG;
53 55
… …
257} 259}
258 260
259sub freeze_mainloop { 261sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
261 263
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
263 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
264 $guard 270 $guard
265} 271}
266 272
267=item cf::async { BLOCK } 273=item cf::async { BLOCK }
… …
338 344
339 $coro 345 $coro
340} 346}
341 347
342sub write_runtime { 348sub write_runtime {
343 return unless $TICK_WATCHER->is_active;
344
345 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
346 350
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
348 or return; 352 or return;
349 353
354 my $value = $cf::RUNTIME + 90 + 10;
350 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
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
352 and return; 359 and return;
353 360
354 aio_fsync $fh 361 aio_fsync $fh
355 and return; 362 and return;
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 507our @CB_MAP = ();
501 508
502my %attachment; 509my %attachment;
503 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
504sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
506 519
507 use sort 'stable'; 520 use sort 'stable';
508 521
… …
679# object support 692# object support
680 693
681sub reattach { 694sub reattach {
682 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 699
685 my $registry = $obj->registry; 700 my $registry = $obj->registry;
686 701
687 @$registry = (); 702 @$registry = ();
688 703
… …
900 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
901 } 916 }
902} 917}
903 918
904############################################################################# 919#############################################################################
905# load/save/clean perl data associated with a map
906
907*cf::mapsupport::on_clean = sub {
908 my ($map) = @_;
909
910 my $path = $map->tmpname;
911 defined $path or return;
912
913 unlink "$path.pst";
914};
915
916cf::map->attach (prio => -10000, package => cf::mapsupport::);
917
918#############################################################################
919 920
920=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
921 922
922Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
923 924
… …
959 960
960sub exists($) { 961sub exists($) {
961 my ($login) = @_; 962 my ($login) = @_;
962 963
963 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
964 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
965} 966}
966 967
967sub find($) { 968sub find($) {
968 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
969 my $login = $_[0]; 970 my $login = $_[0];
… …
1077 for (@$files) { 1078 for (@$files) {
1078 utf8::decode $_; 1079 utf8::decode $_;
1079 next if /\.(?:pl|pst)$/; 1080 next if /\.(?:pl|pst)$/;
1080 next unless /^$PATH_SEP/o; 1081 next unless /^$PATH_SEP/o;
1081 1082
1083 s/\.map$//;
1082 push @paths, "~" . $pl->ob->name . "/" . $_; 1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1083 } 1085 }
1084 1086
1085 \@paths 1087 \@paths
1086} 1088}
… …
1114 1116
1115use Fcntl; 1117use Fcntl;
1116use Coro::AIO; 1118use Coro::AIO;
1117 1119
1118use overload 1120use overload
1119 '""' => \&as_string; 1121 '""' => \&as_string,
1122 fallback => 1;
1120 1123
1121our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1122our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1123 1126
1124sub generate_random_map { 1127sub 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},
… …
1151} 1153}
1152 1154
1153# also paths starting with '/' 1155# also paths starting with '/'
1154$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1156$EXT_MAP{"cf::map"} = qr{^(?=/)};
1155 1157
1158sub thawer_merge {
1159 my ($self, $merge) = @_;
1160
1161 # we have to keep some variables in memory intact
1162 local $self->{path};
1163 local $self->{load_path};
1164 local $self->{deny_save};
1165 local $self->{deny_reset};
1166
1167 $self->SUPER::thawer_merge ($merge);
1168}
1169
1156sub normalise { 1170sub normalise {
1157 my ($path, $base) = @_; 1171 my ($path, $base) = @_;
1158 1172
1159 # map plan: 1173 # map plan:
1160 # 1174 #
… …
1220# the displayed name, this is a one way mapping 1234# the displayed name, this is a one way mapping
1221sub visible_name { 1235sub visible_name {
1222 &as_string 1236 &as_string
1223} 1237}
1224 1238
1225# escape the /'s in the path
1226sub _escaped_path {
1227 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1228
1229 $path
1230}
1231
1232# the original (read-only) location 1239# the original (read-only) location
1233sub load_path { 1240sub load_path {
1234 my ($self) = @_; 1241 my ($self) = @_;
1235 1242
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1245
1239# the temporary/swap location 1246# the temporary/swap location
1240sub save_path { 1247sub save_path {
1241 my ($self) = @_; 1248 my ($self) = @_;
1242 1249
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1252}
1245 1253
1246# the unique path, undef == no special unique path 1254# the unique path, undef == no special unique path
1247sub uniq_path { 1255sub uniq_path {
1248 my ($self) = @_; 1256 my ($self) = @_;
1249 1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1259 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1260}
1252 1261
1253# and all this just because we cannot iterate over 1262# and all this just because we cannot iterate over
1254# all maps in C++... 1263# all maps in C++...
1255sub change_all_map_light { 1264sub change_all_map_light {
… …
1261 1270
1262sub unlink_save { 1271sub unlink_save {
1263 my ($self) = @_; 1272 my ($self) = @_;
1264 1273
1265 utf8::encode (my $save = $self->save_path); 1274 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1276 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1277}
1269 1278
1270sub load_header_from($) { 1279sub load_header_from($) {
1271 my ($self, $path) = @_; 1280 my ($self, $path) = @_;
1272 1281
… …
1333 1342
1334 $map->load_header 1343 $map->load_header
1335 or return; 1344 or return;
1336 1345
1337 if ($map->should_reset) { 1346 if ($map->should_reset) {
1347 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1349 $map->reset;
1339 undef $guard; 1350 undef $guard;
1340 $map = find $path 1351 $map = find $path
1341 or return; 1352 or return;
1342 } 1353 }
… …
1434 1445
1435 cf::sync_job { $map->load }; 1446 cf::sync_job { $map->load };
1436} 1447}
1437 1448
1438our %MAP_PREFETCH; 1449our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1450our $MAP_PREFETCHER = undef;
1440 while () {
1441 for my $path (keys %MAP_PREFETCH) {
1442 my $map = find $path
1443 or next;
1444 $map->load;
1445
1446 delete $MAP_PREFETCH{$path};
1447 }
1448 Coro::schedule;
1449 }
1450};
1451 1451
1452sub find_async { 1452sub find_async {
1453 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1454 1454
1455 $path = normalise $path, $origin && $origin->{path}; 1455 $path = normalise $path, $origin && $origin->{path};
1456 1456
1457 if (my $map = $cf::MAP{$path}) { 1457 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1459 }
1460 1460
1461 $MAP_PREFETCH{$path} = 0; 1461 undef $MAP_PREFETCH{$path};
1462 $MAP_PREFETCHER->ready; 1462 $MAP_PREFETCHER ||= cf::async {
1463 while (%MAP_PREFETCH) {
1464 for my $path (keys %MAP_PREFETCH) {
1465 my $map = find $path
1466 or next;
1467 $map->load;
1468
1469 delete $MAP_PREFETCH{$path};
1470 }
1471 }
1472 undef $MAP_PREFETCHER;
1473 };
1463 1474
1464 () 1475 ()
1465} 1476}
1466 1477
1467sub save { 1478sub save {
… …
1512 1523
1513sub reset_at { 1524sub reset_at {
1514 my ($self) = @_; 1525 my ($self) = @_;
1515 1526
1516 # TODO: safety, remove and allow resettable per-player maps 1527 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1528 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1529 return 1e99 if $self->{deny_reset};
1519 1530
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1531 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1532 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1533
… …
1527 my ($self) = @_; 1538 my ($self) = @_;
1528 1539
1529 $self->reset_at <= $cf::RUNTIME 1540 $self->reset_at <= $cf::RUNTIME
1530} 1541}
1531 1542
1532sub rename {
1533 my ($self, $new_path) = @_;
1534
1535 normalise $new_path;
1536
1537 $self->unlink_save;
1538
1539 delete $cf::MAP{$self->path};
1540 $self->{path} = $new_path; $self->path ($self->{path});
1541 $cf::MAP{$self->path} = $self;
1542
1543 $self->save;
1544}
1545
1546sub reset { 1543sub reset {
1547 my ($self) = @_; 1544 my ($self) = @_;
1548 1545
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1546 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1547
1551 return if $self->players; 1548 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1549 return if $self->isa ("ext::map_per_player");#d#
1553 1550
1554 warn "resetting map ", $self->path;#d# 1551 warn "resetting map ", $self->path;#d#
1555 1552
1556 delete $cf::MAP{$self->path}; 1553 delete $cf::MAP{$self->path};
1557 1554
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear;
1557
1558 $_->clear_links_to ($self) for values %cf::MAP; 1558 $_->clear_links_to ($self) for values %cf::MAP;
1559 1559
1560 $self->unlink_save; 1560 $self->unlink_save;
1561 $self->destroy; 1561 $self->destroy;
1562} 1562}
… …
1564my $nuke_counter = "aaaa"; 1564my $nuke_counter = "aaaa";
1565 1565
1566sub nuke { 1566sub nuke {
1567 my ($self) = @_; 1567 my ($self) = @_;
1568 1568
1569 delete $cf::MAP{$self->path};
1570
1571 $self->unlink_save;
1572
1573 bless $self, "cf::map";
1574 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1575 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1576 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1577 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1578
1579 $cf::MAP{$self->path} = $self;
1580
1572 $self->reset; # polite request, might not happen 1581 $self->reset; # polite request, might not happen
1573} 1582}
1574 1583
1575=item cf::map::unique_maps 1584=item cf::map::unique_maps
1576 1585
… …
1588 for (@$files) { 1597 for (@$files) {
1589 utf8::decode $_; 1598 utf8::decode $_;
1590 next if /\.pst$/; 1599 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1600 next unless /^$PATH_SEP/o;
1592 1601
1602 s/\.map$//;
1593 push @paths, $_; 1603 push @paths, $_;
1594 } 1604 }
1595 1605
1596 \@paths 1606 \@paths
1597} 1607}
… …
1806 1816
1807sub parse_random_map_params { 1817sub parse_random_map_params {
1808 my ($spec) = @_; 1818 my ($spec) = @_;
1809 1819
1810 my $rmp = { # defaults 1820 my $rmp = { # defaults
1811 xsize => 10, 1821 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1822 ysize => (cf::rndm 15, 40),
1823 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1824 #layout => string,
1813 }; 1825 };
1814 1826
1815 for (split /\n/, $spec) { 1827 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1828 my ($k, $v) = split /\s+/, $_, 2;
1817 1829
… …
1821 $rmp 1833 $rmp
1822} 1834}
1823 1835
1824sub prepare_random_map { 1836sub prepare_random_map {
1825 my ($exit) = @_; 1837 my ($exit) = @_;
1838
1839 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1840
1827 # all this does is basically replace the /! path by 1841 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1842 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1843 # that depends on the exit object
1830 1844
… …
1839 1853
1840 $rmp->{random_seed} ||= $exit->random_seed; 1854 $rmp->{random_seed} ||= $exit->random_seed;
1841 1855
1842 my $data = cf::to_json $rmp; 1856 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1857 my $md5 = Digest::MD5::md5_hex $data;
1858 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1859
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1860 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1861 aio_write $fh, 0, (length $data), $data, 0;
1862 undef $fh;
1863 aio_rename "$meta~", $meta;
1847 1864
1848 $exit->slaying ("?random/$md5"); 1865 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1866 $exit->msg (undef);
1850 } 1867 }
1851} 1868}
… …
2161 sub db_sync() { 2178 sub db_sync() {
2162 db_save if $dirty; 2179 db_save if $dirty;
2163 undef $dirty; 2180 undef $dirty;
2164 } 2181 }
2165 2182
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync; 2184 db_sync;
2168 }); 2185 });
2169 2186
2170 sub db_dirty() { 2187 sub db_dirty() {
2171 $dirty = 1; 2188 $dirty = 1;
… …
2221 2238
2222sub main { 2239sub main {
2223 # we must not ever block the main coroutine 2240 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2241 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2242 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2243 (async {
2226 async { Event::one_event }; 2244 Event::one_event;
2245 })->prio (Coro::PRIO_MAX);
2227 }; 2246 };
2228 2247
2229 cfg_load; 2248 cfg_load;
2230 db_load; 2249 db_load;
2231 load_extensions; 2250 load_extensions;
2251
2252 $TICK_WATCHER->start;
2232 Event::loop; 2253 Event::loop;
2233} 2254}
2234 2255
2235############################################################################# 2256#############################################################################
2236# initialisation and cleanup 2257# initialisation and cleanup
… …
2254 warn "enter emergency perl save\n"; 2275 warn "enter emergency perl save\n";
2255 2276
2256 cf::sync_job { 2277 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2278 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2279 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2280 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2281 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2282 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2283 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2284 $pl->valid or next;
2264 $pl->save; 2285 $pl->save;
… …
2278} 2299}
2279 2300
2280sub reload() { 2301sub reload() {
2281 # can/must only be called in main 2302 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2303 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2304 warn "can only reload from main coroutine";
2284 return; 2305 return;
2285 } 2306 }
2286 2307
2287 warn "reloading..."; 2308 warn "reloading...";
2288 2309
2289 warn "freezing server"; 2310 warn "cancelling server ticker";
2290 my $guard = freeze_mainloop; 2311 $TICK_WATCHER->cancel;
2312
2291 cf::emergency_save; 2313 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296 2314
2297 eval { 2315 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2316 # if anything goes wrong in here, we should simply crash as we already saved
2299 2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320
2300 warn "cancel all watchers"; 2321 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2322 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2323 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2324 }
2304 2325
2326 warn "flushing outstanding aio requests";
2327 for (;;) {
2328 IO::AIO::flush;
2329 Coro::cede;
2330 last unless IO::AIO::nreqs;
2331 warn "iterate...";
2332 }
2333
2305 warn "cancel all extension coros"; 2334 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2335 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2336 %EXT_CORO = ();
2308 2337
2309 warn "remove commands"; 2338 warn "removing commands";
2310 %COMMAND = (); 2339 %COMMAND = ();
2311 2340
2312 warn "remove ext commands"; 2341 warn "removing ext commands";
2313 %EXTCMD = (); 2342 %EXTCMD = ();
2314 2343
2315 warn "unload/nuke all extensions"; 2344 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2345 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2346 warn "... unloading $pkg";
2318 2347
2319 if (my $cb = $pkg->can ("unload")) { 2348 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2349 eval {
… …
2325 2354
2326 warn "... nuking $pkg"; 2355 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2356 Symbol::delete_package $pkg;
2328 } 2357 }
2329 2358
2330 warn "unload all perl modules loaded from $LIBDIR"; 2359 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2360 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2362
2334 warn "removing <$k>"; 2363 warn "... unloading $k";
2335 delete $INC{$k}; 2364 delete $INC{$k};
2336 2365
2337 $k =~ s/\.pm$//; 2366 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2367 $k =~ s/\//::/g;
2339 2368
… …
2342 } 2371 }
2343 2372
2344 Symbol::delete_package $k; 2373 Symbol::delete_package $k;
2345 } 2374 }
2346 2375
2347 warn "get rid of safe::, as good as possible"; 2376 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2377 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2379
2351 warn "unload cf.pm \"a bit\""; 2380 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2381 delete $INC{"cf.pm"};
2353 2382
2354 # don't, removes xs symbols, too, 2383 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2384 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2385 #Symbol::delete_package __PACKAGE__;
2357 2386
2387 warn "unload completed, starting to reload now";
2388
2358 warn "reloading cf.pm"; 2389 warn "reloading cf.pm";
2359 require cf; 2390 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2392
2362 warn "load config and database again"; 2393 warn "loading config and database again";
2363 cf::cfg_load; 2394 cf::cfg_load;
2364 cf::db_load; 2395 cf::db_load;
2365 2396
2366 warn "load extensions"; 2397 warn "loading extensions";
2367 cf::load_extensions; 2398 cf::load_extensions;
2368 2399
2369 warn "reattach attachments to objects/players"; 2400 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2401 _global_reattach;
2371 warn "reattach attachments to maps"; 2402 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2403 reattach $_ for values %MAP;
2404
2405 warn "restarting server ticker";
2406
2407 $TICK_WATCHER->start;
2373 }; 2408 };
2374 2409
2375 if ($@) { 2410 if ($@) {
2376 warn $@; 2411 warn $@;
2377 warn "error while reloading, exiting."; 2412 warn "error while reloading, exiting.";
… …
2379 } 2414 }
2380 2415
2381 warn "reloaded"; 2416 warn "reloaded";
2382}; 2417};
2383 2418
2419our $RELOAD_WATCHER; # used only during reload
2420
2384register_command "reload" => sub { 2421register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2422 my ($who, $arg) = @_;
2386 2423
2387 if ($who->flag (FLAG_WIZ)) { 2424 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2425 $who->message ("reloading server.");
2426
2427 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here.
2429
2430 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2389 reload; 2431 reload;
2390 $who->message ("end of reload."); 2432 undef $RELOAD_WATCHER;
2433 });
2391 } 2434 }
2392}; 2435};
2393 2436
2394unshift @INC, $LIBDIR; 2437unshift @INC, $LIBDIR;
2438
2439my $bug_warning = 0;
2395 2440
2396$TICK_WATCHER = Event->timer ( 2441$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2442 reentrant => 0,
2443 parked => 1,
2398 prio => 0, 2444 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2445 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2446 data => WF_AUTOCANCEL,
2401 cb => sub { 2447 cb => sub {
2448 if ($Coro::current != $Coro::main) {
2449 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2450 unless ++$bug_warning > 10;
2451 return;
2452 }
2453
2402 $NOW = Event::time; 2454 $NOW = Event::time;
2403 2455
2404 cf::server_tick; # one server iteration 2456 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2457 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2458 $NEXT_TICK += $TICK;
… …
2416 }, 2468 },
2417); 2469);
2418 2470
2419IO::AIO::max_poll_time $TICK * 0.2; 2471IO::AIO::max_poll_time $TICK * 0.2;
2420 2472
2421Event->io ( 2473$AIO_POLL_WATCHER = Event->io (
2422 fd => IO::AIO::poll_fileno, 2474 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2475 poll => 'r',
2424 prio => 5, 2476 prio => 5,
2425 data => WF_AUTOCANCEL, 2477 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2478 cb => \&IO::AIO::poll_cb,
2427); 2479);
2428 2480
2429Event->timer ( 2481$WRITE_RUNTIME_WATCHER = Event->timer (
2430 data => WF_AUTOCANCEL, 2482 data => WF_AUTOCANCEL,
2431 after => 0, 2483 after => 1,
2432 interval => 10, 2484 interval => 10,
2433 cb => sub { 2485 prio => 6, # keep it lowest so it acts like a watchdog
2434 (Coro::unblock_sub { 2486 cb => Coro::unblock_sub {
2435 write_runtime 2487 write_runtime
2436 or warn "ERROR: unable to write runtime file: $!"; 2488 or warn "ERROR: unable to write runtime file: $!";
2437 })->();
2438 }, 2489 },
2439); 2490);
2440 2491
2441END { cf::emergency_save } 2492END { cf::emergency_save }
2442 2493

Diff Legend

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