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

Diff Legend

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