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.187 by root, Sat Jan 20 21:06: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
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},
… …
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
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
1143sub register { 1153sub 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{^(?=/)}];
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}
1155 1177
1156sub normalise { 1178sub normalise {
1157 my ($path, $base) = @_; 1179 my ($path, $base) = @_;
1158 1180
1159 # map plan: 1181 # map plan:
… …
1190 1212
1191 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
1192 1214
1193 $path = normalise $path, $base; 1215 $path = normalise $path, $base;
1194 1216
1195 for my $pkg (keys %EXT_MAP) { 1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1196 if ($path =~ $EXT_MAP{$pkg}) { 1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1197 my $self = bless cf::map::new, $pkg; 1219 my $self = bless cf::map::new, $pkg;
1198 $self->{path} = $path; $self->path ($path); 1220 $self->{path} = $path; $self->path ($path);
1199 $self->init; # pass $1 etc. 1221 $self->init; # pass $1 etc.
1200 return $self; 1222 return $self;
1201 } 1223 }
… …
1220# the displayed name, this is a one way mapping 1242# the displayed name, this is a one way mapping
1221sub visible_name { 1243sub visible_name {
1222 &as_string 1244 &as_string
1223} 1245}
1224 1246
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 1247# the original (read-only) location
1233sub load_path { 1248sub load_path {
1234 my ($self) = @_; 1249 my ($self) = @_;
1235 1250
1236 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
… …
1238 1253
1239# the temporary/swap location 1254# the temporary/swap location
1240sub save_path { 1255sub save_path {
1241 my ($self) = @_; 1256 my ($self) = @_;
1242 1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1243 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $self->_escaped_path 1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1244} 1260}
1245 1261
1246# the unique path, undef == no special unique path 1262# the unique path, undef == no special unique path
1247sub uniq_path { 1263sub uniq_path {
1248 my ($self) = @_; 1264 my ($self) = @_;
1249 1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1250 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1251} 1268}
1252 1269
1253# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1254# all maps in C++... 1271# all maps in C++...
1255sub change_all_map_light { 1272sub change_all_map_light {
… …
1261 1278
1262sub unlink_save { 1279sub unlink_save {
1263 my ($self) = @_; 1280 my ($self) = @_;
1264 1281
1265 utf8::encode (my $save = $self->save_path); 1282 utf8::encode (my $save = $self->save_path);
1266 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1267 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1268} 1285}
1269 1286
1270sub load_header_from($) { 1287sub load_header_from($) {
1271 my ($self, $path) = @_; 1288 my ($self, $path) = @_;
1272 1289
… …
1333 1350
1334 $map->load_header 1351 $map->load_header
1335 or return; 1352 or return;
1336 1353
1337 if ($map->should_reset) { 1354 if ($map->should_reset) {
1355 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait;
1338 $map->reset; 1357 $map->reset;
1339 undef $guard; 1358 undef $guard;
1340 $map = find $path 1359 $map = find $path
1341 or return; 1360 or return;
1342 } 1361 }
… …
1434 1453
1435 cf::sync_job { $map->load }; 1454 cf::sync_job { $map->load };
1436} 1455}
1437 1456
1438our %MAP_PREFETCH; 1457our %MAP_PREFETCH;
1439our $MAP_PREFETCHER = Coro::async { 1458our $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 1459
1452sub find_async { 1460sub find_async {
1453 my ($path, $origin) = @_; 1461 my ($path, $origin) = @_;
1454 1462
1455 $path = normalise $path, $origin && $origin->{path}; 1463 $path = normalise $path, $origin && $origin->{path};
1456 1464
1457 if (my $map = $cf::MAP{$path}) { 1465 if (my $map = $cf::MAP{$path}) {
1458 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1466 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1459 } 1467 }
1460 1468
1461 $MAP_PREFETCH{$path} = 0; 1469 undef $MAP_PREFETCH{$path};
1462 $MAP_PREFETCHER->ready; 1470 $MAP_PREFETCHER ||= cf::async {
1471 while (%MAP_PREFETCH) {
1472 for my $path (keys %MAP_PREFETCH) {
1473 my $map = find $path
1474 or next;
1475 $map->load;
1476
1477 delete $MAP_PREFETCH{$path};
1478 }
1479 }
1480 undef $MAP_PREFETCHER;
1481 };
1463 1482
1464 () 1483 ()
1465} 1484}
1466 1485
1467sub save { 1486sub save {
… …
1512 1531
1513sub reset_at { 1532sub reset_at {
1514 my ($self) = @_; 1533 my ($self) = @_;
1515 1534
1516 # TODO: safety, remove and allow resettable per-player maps 1535 # TODO: safety, remove and allow resettable per-player maps
1517 return 1e99 if $self->isa ("ext::map_per_player"); 1536 return 1e99 if $self->isa ("ext::map_per_player");#d#
1518 return 1e99 if $self->{deny_reset}; 1537 return 1e99 if $self->{deny_reset};
1519 1538
1520 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1539 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1521 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1540 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1522 1541
… …
1527 my ($self) = @_; 1546 my ($self) = @_;
1528 1547
1529 $self->reset_at <= $cf::RUNTIME 1548 $self->reset_at <= $cf::RUNTIME
1530} 1549}
1531 1550
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 { 1551sub reset {
1547 my ($self) = @_; 1552 my ($self) = @_;
1548 1553
1549 my $lock = cf::lock_acquire "map_data:" . $self->path; 1554 my $lock = cf::lock_acquire "map_data:$self->{path}";
1550 1555
1551 return if $self->players; 1556 return if $self->players;
1552 return if $self->isa ("ext::map_per_player");#d# 1557 return if $self->isa ("ext::map_per_player");#d#
1553 1558
1554 warn "resetting map ", $self->path;#d# 1559 warn "resetting map ", $self->path;#d#
1555 1560
1556 delete $cf::MAP{$self->path}; 1561 delete $cf::MAP{$self->path};
1557 1562
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear;
1565
1558 $_->clear_links_to ($self) for values %cf::MAP; 1566 $_->clear_links_to ($self) for values %cf::MAP;
1559 1567
1560 $self->unlink_save; 1568 $self->unlink_save;
1561 $self->destroy; 1569 $self->destroy;
1562} 1570}
… …
1564my $nuke_counter = "aaaa"; 1572my $nuke_counter = "aaaa";
1565 1573
1566sub nuke { 1574sub nuke {
1567 my ($self) = @_; 1575 my ($self) = @_;
1568 1576
1577 delete $cf::MAP{$self->path};
1578
1579 $self->unlink_save;
1580
1581 bless $self, "cf::map";
1582 delete $self->{deny_reset};
1569 $self->{deny_save} = 1; 1583 $self->{deny_save} = 1;
1570 $self->reset_timeout (1); 1584 $self->reset_timeout (1);
1571 $self->rename ("{nuke}/" . ($nuke_counter++)); 1585 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1586
1587 $cf::MAP{$self->path} = $self;
1588
1572 $self->reset; # polite request, might not happen 1589 $self->reset; # polite request, might not happen
1573} 1590}
1574 1591
1575=item cf::map::unique_maps 1592=item cf::map::unique_maps
1576 1593
… …
1588 for (@$files) { 1605 for (@$files) {
1589 utf8::decode $_; 1606 utf8::decode $_;
1590 next if /\.pst$/; 1607 next if /\.pst$/;
1591 next unless /^$PATH_SEP/o; 1608 next unless /^$PATH_SEP/o;
1592 1609
1610 s/\.map$//;
1593 push @paths, $_; 1611 push @paths, $_;
1594 } 1612 }
1595 1613
1596 \@paths 1614 \@paths
1597} 1615}
… …
1806 1824
1807sub parse_random_map_params { 1825sub parse_random_map_params {
1808 my ($spec) = @_; 1826 my ($spec) = @_;
1809 1827
1810 my $rmp = { # defaults 1828 my $rmp = { # defaults
1811 xsize => 10, 1829 xsize => (cf::rndm 15, 40),
1812 ysize => 10, 1830 ysize => (cf::rndm 15, 40),
1831 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1832 #layout => string,
1813 }; 1833 };
1814 1834
1815 for (split /\n/, $spec) { 1835 for (split /\n/, $spec) {
1816 my ($k, $v) = split /\s+/, $_, 2; 1836 my ($k, $v) = split /\s+/, $_, 2;
1817 1837
… …
1821 $rmp 1841 $rmp
1822} 1842}
1823 1843
1824sub prepare_random_map { 1844sub prepare_random_map {
1825 my ($exit) = @_; 1845 my ($exit) = @_;
1846
1847 my $guard = cf::lock_acquire "exit_prepare:$exit";
1826 1848
1827 # all this does is basically replace the /! path by 1849 # all this does is basically replace the /! path by
1828 # a new random map path (?random/...) with a seed 1850 # a new random map path (?random/...) with a seed
1829 # that depends on the exit object 1851 # that depends on the exit object
1830 1852
… …
1839 1861
1840 $rmp->{random_seed} ||= $exit->random_seed; 1862 $rmp->{random_seed} ||= $exit->random_seed;
1841 1863
1842 my $data = cf::to_json $rmp; 1864 my $data = cf::to_json $rmp;
1843 my $md5 = Digest::MD5::md5_hex $data; 1865 my $md5 = Digest::MD5::md5_hex $data;
1866 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1844 1867
1845 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1868 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1846 aio_write $fh, 0, (length $data), $data, 0; 1869 aio_write $fh, 0, (length $data), $data, 0;
1870 undef $fh;
1871 aio_rename "$meta~", $meta;
1847 1872
1848 $exit->slaying ("?random/$md5"); 1873 $exit->slaying ("?random/$md5");
1849 $exit->msg (undef); 1874 $exit->msg (undef);
1850 } 1875 }
1851} 1876}
… …
2161 sub db_sync() { 2186 sub db_sync() {
2162 db_save if $dirty; 2187 db_save if $dirty;
2163 undef $dirty; 2188 undef $dirty;
2164 } 2189 }
2165 2190
2166 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2167 db_sync; 2192 db_sync;
2168 }); 2193 });
2169 2194
2170 sub db_dirty() { 2195 sub db_dirty() {
2171 $dirty = 1; 2196 $dirty = 1;
… …
2221 2246
2222sub main { 2247sub main {
2223 # we must not ever block the main coroutine 2248 # we must not ever block the main coroutine
2224 local $Coro::idle = sub { 2249 local $Coro::idle = sub {
2225 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2250 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2251 (async {
2226 async { Event::one_event }; 2252 Event::one_event;
2253 })->prio (Coro::PRIO_MAX);
2227 }; 2254 };
2228 2255
2229 cfg_load; 2256 cfg_load;
2230 db_load; 2257 db_load;
2231 load_extensions; 2258 load_extensions;
2259
2260 $TICK_WATCHER->start;
2232 Event::loop; 2261 Event::loop;
2233} 2262}
2234 2263
2235############################################################################# 2264#############################################################################
2236# initialisation and cleanup 2265# initialisation and cleanup
… …
2254 warn "enter emergency perl save\n"; 2283 warn "enter emergency perl save\n";
2255 2284
2256 cf::sync_job { 2285 cf::sync_job {
2257 # use a peculiar iteration method to avoid tripping on perl 2286 # use a peculiar iteration method to avoid tripping on perl
2258 # refcount bugs in for. also avoids problems with players 2287 # refcount bugs in for. also avoids problems with players
2259 # and maps saved/Destroyed asynchronously. 2288 # and maps saved/destroyed asynchronously.
2260 warn "begin emergency player save\n"; 2289 warn "begin emergency player save\n";
2261 for my $login (keys %cf::PLAYER) { 2290 for my $login (keys %cf::PLAYER) {
2262 my $pl = $cf::PLAYER{$login} or next; 2291 my $pl = $cf::PLAYER{$login} or next;
2263 $pl->valid or next; 2292 $pl->valid or next;
2264 $pl->save; 2293 $pl->save;
… …
2278} 2307}
2279 2308
2280sub reload() { 2309sub reload() {
2281 # can/must only be called in main 2310 # can/must only be called in main
2282 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2283 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine";
2284 return; 2313 return;
2285 } 2314 }
2286 2315
2287 warn "reloading..."; 2316 warn "reloading...";
2288 2317
2289 warn "freezing server"; 2318 warn "cancelling server ticker";
2290 my $guard = freeze_mainloop; 2319 $TICK_WATCHER->cancel;
2320
2291 cf::emergency_save; 2321 cf::emergency_save;
2292
2293 warn "sync database to disk";
2294 cf::db_sync;
2295 IO::AIO::flush;
2296 2322
2297 eval { 2323 eval {
2298 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2299 2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2300 warn "cancel all watchers"; 2329 warn "cancelling all WF_AUTOCANCEL watchers";
2301 for (Event::all_watchers) { 2330 for (Event::all_watchers) {
2302 $_->cancel if $_->data & WF_AUTOCANCEL; 2331 $_->cancel if $_->data & WF_AUTOCANCEL;
2303 } 2332 }
2304 2333
2334 warn "flushing outstanding aio requests";
2335 for (;;) {
2336 IO::AIO::flush;
2337 Coro::cede;
2338 last unless IO::AIO::nreqs;
2339 warn "iterate...";
2340 }
2341
2305 warn "cancel all extension coros"; 2342 warn "cancelling all extension coros";
2306 $_->cancel for values %EXT_CORO; 2343 $_->cancel for values %EXT_CORO;
2307 %EXT_CORO = (); 2344 %EXT_CORO = ();
2308 2345
2309 warn "remove commands"; 2346 warn "removing commands";
2310 %COMMAND = (); 2347 %COMMAND = ();
2311 2348
2312 warn "remove ext commands"; 2349 warn "removing ext commands";
2313 %EXTCMD = (); 2350 %EXTCMD = ();
2314 2351
2315 warn "unload/nuke all extensions"; 2352 warn "unloading/nuking all extensions";
2316 for my $pkg (@EXTS) { 2353 for my $pkg (@EXTS) {
2317 warn "... unloading $pkg"; 2354 warn "... unloading $pkg";
2318 2355
2319 if (my $cb = $pkg->can ("unload")) { 2356 if (my $cb = $pkg->can ("unload")) {
2320 eval { 2357 eval {
… …
2325 2362
2326 warn "... nuking $pkg"; 2363 warn "... nuking $pkg";
2327 Symbol::delete_package $pkg; 2364 Symbol::delete_package $pkg;
2328 } 2365 }
2329 2366
2330 warn "unload all perl modules loaded from $LIBDIR"; 2367 warn "unloading all perl modules loaded from $LIBDIR";
2331 while (my ($k, $v) = each %INC) { 2368 while (my ($k, $v) = each %INC) {
2332 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2369 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2333 2370
2334 warn "removing <$k>"; 2371 warn "... unloading $k";
2335 delete $INC{$k}; 2372 delete $INC{$k};
2336 2373
2337 $k =~ s/\.pm$//; 2374 $k =~ s/\.pm$//;
2338 $k =~ s/\//::/g; 2375 $k =~ s/\//::/g;
2339 2376
… …
2342 } 2379 }
2343 2380
2344 Symbol::delete_package $k; 2381 Symbol::delete_package $k;
2345 } 2382 }
2346 2383
2347 warn "get rid of safe::, as good as possible"; 2384 warn "getting rid of safe::, as good as possible";
2348 Symbol::delete_package "safe::$_" 2385 Symbol::delete_package "safe::$_"
2349 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2386 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2350 2387
2351 warn "unload cf.pm \"a bit\""; 2388 warn "unloading cf.pm \"a bit\"";
2352 delete $INC{"cf.pm"}; 2389 delete $INC{"cf.pm"};
2353 2390
2354 # don't, removes xs symbols, too, 2391 # don't, removes xs symbols, too,
2355 # and global variables created in xs 2392 # and global variables created in xs
2356 #Symbol::delete_package __PACKAGE__; 2393 #Symbol::delete_package __PACKAGE__;
2357 2394
2395 warn "unload completed, starting to reload now";
2396
2358 warn "reloading cf.pm"; 2397 warn "reloading cf.pm";
2359 require cf; 2398 require cf;
2360 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2361 2400
2362 warn "load config and database again"; 2401 warn "loading config and database again";
2363 cf::cfg_load; 2402 cf::cfg_load;
2364 cf::db_load; 2403 cf::db_load;
2365 2404
2366 warn "load extensions"; 2405 warn "loading extensions";
2367 cf::load_extensions; 2406 cf::load_extensions;
2368 2407
2369 warn "reattach attachments to objects/players"; 2408 warn "reattaching attachments to objects/players";
2370 _global_reattach; 2409 _global_reattach;
2371 warn "reattach attachments to maps"; 2410 warn "reattaching attachments to maps";
2372 reattach $_ for values %MAP; 2411 reattach $_ for values %MAP;
2412
2413 warn "restarting server ticker";
2414
2415 $TICK_WATCHER->start;
2373 }; 2416 };
2374 2417
2375 if ($@) { 2418 if ($@) {
2376 warn $@; 2419 warn $@;
2377 warn "error while reloading, exiting."; 2420 warn "error while reloading, exiting.";
… …
2379 } 2422 }
2380 2423
2381 warn "reloaded"; 2424 warn "reloaded";
2382}; 2425};
2383 2426
2427our $RELOAD_WATCHER; # used only during reload
2428
2384register_command "reload" => sub { 2429register_command "reload" => sub {
2385 my ($who, $arg) = @_; 2430 my ($who, $arg) = @_;
2386 2431
2387 if ($who->flag (FLAG_WIZ)) { 2432 if ($who->flag (FLAG_WIZ)) {
2388 $who->message ("start of reload."); 2433 $who->message ("reloading server.");
2434
2435 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here.
2437
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub {
2389 reload; 2439 reload;
2390 $who->message ("end of reload."); 2440 undef $RELOAD_WATCHER;
2441 });
2391 } 2442 }
2392}; 2443};
2393 2444
2394unshift @INC, $LIBDIR; 2445unshift @INC, $LIBDIR;
2446
2447my $bug_warning = 0;
2395 2448
2396$TICK_WATCHER = Event->timer ( 2449$TICK_WATCHER = Event->timer (
2397 reentrant => 0, 2450 reentrant => 0,
2451 parked => 1,
2398 prio => 0, 2452 prio => 0,
2399 at => $NEXT_TICK || $TICK, 2453 at => $NEXT_TICK || $TICK,
2400 data => WF_AUTOCANCEL, 2454 data => WF_AUTOCANCEL,
2401 cb => sub { 2455 cb => sub {
2456 if ($Coro::current != $Coro::main) {
2457 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2458 unless ++$bug_warning > 10;
2459 return;
2460 }
2461
2402 $NOW = Event::time; 2462 $NOW = Event::time;
2403 2463
2404 cf::server_tick; # one server iteration 2464 cf::server_tick; # one server iteration
2405 $RUNTIME += $TICK; 2465 $RUNTIME += $TICK;
2406 $NEXT_TICK += $TICK; 2466 $NEXT_TICK += $TICK;
… …
2416 }, 2476 },
2417); 2477);
2418 2478
2419IO::AIO::max_poll_time $TICK * 0.2; 2479IO::AIO::max_poll_time $TICK * 0.2;
2420 2480
2421Event->io ( 2481$AIO_POLL_WATCHER = Event->io (
2422 fd => IO::AIO::poll_fileno, 2482 fd => IO::AIO::poll_fileno,
2423 poll => 'r', 2483 poll => 'r',
2424 prio => 5, 2484 prio => 5,
2425 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2426 cb => \&IO::AIO::poll_cb, 2486 cb => \&IO::AIO::poll_cb,
2427); 2487);
2428 2488
2429Event->timer ( 2489$WRITE_RUNTIME_WATCHER = Event->timer (
2430 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2431 after => 0, 2491 after => 1,
2432 interval => 10, 2492 interval => 10,
2433 cb => sub { 2493 prio => 6, # keep it lowest so it acts like a watchdog
2434 (Coro::unblock_sub { 2494 cb => Coro::unblock_sub {
2435 write_runtime 2495 write_runtime
2436 or warn "ERROR: unable to write runtime file: $!"; 2496 or warn "ERROR: unable to write runtime file: $!";
2437 })->();
2438 }, 2497 },
2439); 2498);
2440 2499
2441END { cf::emergency_save } 2500END { cf::emergency_save }
2442 2501

Diff Legend

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