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.181 by root, Fri Jan 19 15:29:52 2007 UTC vs.
Revision 1.205 by root, Mon Feb 5 18:29:20 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.4 (); 13use Coro 3.5 ();
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;
… …
48our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 50our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 51our $NEXT_TICK;
52our $NOW; 52our $NOW;
53our $USE_FSYNC = 1; # use fsync to write maps - default off
53 54
54our %CFG; 55our %CFG;
55 56
56our $UPTIME; $UPTIME ||= time; 57our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 58our $RUNTIME;
… …
82mkdir cf::localdir . "/" . cf::tmpdir; 83mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 84mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 85mkdir $RANDOM_MAPS;
85 86
86our $EMERGENCY_POSITION; 87our $EMERGENCY_POSITION;
88
89sub cf::map::normalise;
87 90
88############################################################################# 91#############################################################################
89 92
90=head2 GLOBAL VARIABLES 93=head2 GLOBAL VARIABLES
91 94
… …
349 my $runtime = cf::localdir . "/runtime"; 352 my $runtime = cf::localdir . "/runtime";
350 353
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 355 or return;
353 356
357 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 361 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 362 and return;
357 363
364 # always fsync - this file is important
358 aio_fsync $fh 365 aio_fsync $fh
359 and return; 366 and return;
360 367
361 close $fh 368 close $fh
362 or return; 369 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 754 $filename, length $$rdata, scalar @$objs;
748 755
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 756 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 757 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 758 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 759 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 760 close $fh;
754 761
755 if (@$objs) { 762 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 765 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 766 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 767 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 768 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 769 aio_rename "$filename.pst~", "$filename.pst";
763 } 770 }
764 } else { 771 } else {
765 aio_unlink "$filename.pst"; 772 aio_unlink "$filename.pst";
… …
771 } 778 }
772 } else { 779 } else {
773 aio_unlink $filename; 780 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
775 } 782 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
776 } 789 }
777} 790}
778 791
779sub object_freezer_as_string { 792sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 793 my ($rdata, $objs) = @_;
… …
786 799
787sub object_thawer_load { 800sub object_thawer_load {
788 my ($filename) = @_; 801 my ($filename) = @_;
789 802
790 my ($data, $av); 803 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
791 807
792 (aio_load $filename, $data) >= 0 808 (aio_load $filename, $data) >= 0
793 or return; 809 or return;
794 810
795 unless (aio_stat "$filename.pst") { 811 unless (aio_stat "$filename.pst") {
… …
1065=cut 1081=cut
1066 1082
1067sub maps($) { 1083sub maps($) {
1068 my ($pl) = @_; 1084 my ($pl) = @_;
1069 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1070 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1071 or return; 1089 or return;
1072 1090
1073 my @paths; 1091 my @paths;
1074 1092
1075 for (@$files) { 1093 for (@$files) {
1076 utf8::decode $_; 1094 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1079 1097
1080 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1099 }
1083 1100
1084 \@paths 1101 \@paths
1085} 1102}
1086 1103
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1154 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1155 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1156 )
1140} 1157}
1141 1158
1159=item cf::map->register ($regex, $prio)
1160
1161Register a handler for the map path matching the given regex at the
1162givne priority (higher is better, built-in handlers have priority 0, the
1163default).
1164
1165=cut
1166
1142sub register { 1167sub register {
1143 my (undef, $regex) = @_; 1168 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1169 my $pkg = caller;
1145 1170
1146 no strict; 1171 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1172 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1173
1149 $EXT_MAP{$pkg} = qr<$regex>; 1174 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1175}
1151 1176
1152# also paths starting with '/' 1177# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1178$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1179
1155sub thawer_merge { 1180sub thawer_merge {
1156 my ($self, $merge) = @_; 1181 my ($self, $merge) = @_;
1157 1182
1158 # we have to keep some variables in memory intact 1183 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1189 $self->SUPER::thawer_merge ($merge);
1165} 1190}
1166 1191
1167sub normalise { 1192sub normalise {
1168 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1169 1198
1170 # map plan: 1199 # map plan:
1171 # 1200 #
1172 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
… …
1201 1230
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1231 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1232
1204 $path = normalise $path, $base; 1233 $path = normalise $path, $base;
1205 1234
1206 for my $pkg (keys %EXT_MAP) { 1235 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1236 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1237 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1238 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1211 return $self; 1240 return $self;
1212 } 1241 }
1213 } 1242 }
1214 1243
1215 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1245 ()
1217} 1246}
1218 1247
1219sub init { 1248sub init {
1220 my ($self) = @_; 1249 my ($self) = @_;
… …
1235 1264
1236# the original (read-only) location 1265# the original (read-only) location
1237sub load_path { 1266sub load_path {
1238 my ($self) = @_; 1267 my ($self) = @_;
1239 1268
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1270}
1242 1271
1243# the temporary/swap location 1272# the temporary/swap location
1244sub save_path { 1273sub save_path {
1245 my ($self) = @_; 1274 my ($self) = @_;
1246 1275
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1278}
1250 1279
1251# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1252sub uniq_path { 1281sub uniq_path {
1253 my ($self) = @_; 1282 my ($self) = @_;
… …
1269 my ($self) = @_; 1298 my ($self) = @_;
1270 1299
1271 utf8::encode (my $save = $self->save_path); 1300 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1308}
1275 1309
1276sub load_header_from($) { 1310sub load_header_from($) {
1277 my ($self, $path) = @_; 1311 my ($self, $path) = @_;
1278 1312
1279 utf8::encode $path; 1313 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1314 #aio_open $path, O_RDONLY, 0
1281 or return; 1315 # or return;
1282 1316
1283 $self->_load_header ($path) 1317 $self->_load_header ($path)
1284 or return; 1318 or return;
1285 1319
1286 $self->{load_path} = $path; 1320 $self->{load_path} = $path;
1287 1321
1288 1 1322 1
1289} 1323}
1290 1324
1291sub load_orig { 1325sub load_header_orig {
1292 my ($self) = @_; 1326 my ($self) = @_;
1293 1327
1294 $self->load_header_from ($self->load_path) 1328 $self->load_header_from ($self->load_path)
1295} 1329}
1296 1330
1297sub load_temp { 1331sub load_header_temp {
1298 my ($self) = @_; 1332 my ($self) = @_;
1299 1333
1300 $self->load_header_from ($self->save_path) 1334 $self->load_header_from ($self->save_path)
1335}
1336
1337sub prepare_temp {
1338 my ($self) = @_;
1339
1340 $self->last_access ((delete $self->{last_access})
1341 || $cf::RUNTIME); #d#
1342 # safety
1343 $self->{instantiate_time} = $cf::RUNTIME
1344 if $self->{instantiate_time} > $cf::RUNTIME;
1345}
1346
1347sub prepare_orig {
1348 my ($self) = @_;
1349
1350 $self->{load_original} = 1;
1351 $self->{instantiate_time} = $cf::RUNTIME;
1352 $self->last_access ($cf::RUNTIME);
1353 $self->instantiate;
1301} 1354}
1302 1355
1303sub load_header { 1356sub load_header {
1304 my ($self) = @_; 1357 my ($self) = @_;
1305 1358
1306 if ($self->load_temp) { 1359 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1360 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1361 } else {
1313 $self->load_orig 1362 $self->load_header_orig
1314 or return; 1363 or return;
1315 1364 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1365 }
1321 1366
1322 1 1367 1
1323} 1368}
1324 1369
… …
1338 $map->{last_save} = $cf::RUNTIME; 1383 $map->{last_save} = $cf::RUNTIME;
1339 1384
1340 $map->load_header 1385 $map->load_header
1341 or return; 1386 or return;
1342 1387
1343 if ($map->should_reset) { 1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1390 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1391 $map->reset;
1346 undef $guard; 1392 undef $guard;
1347 $map = find $path 1393 return find $path;
1348 or return;
1349 } 1394 }
1350 1395
1351 $cf::MAP{$path} = $map 1396 $cf::MAP{$path} = $map
1352 } 1397 }
1353} 1398}
1399
1400sub pre_load { }
1401sub post_load { }
1354 1402
1355sub load { 1403sub load {
1356 my ($self) = @_; 1404 my ($self) = @_;
1357 1405
1406 local $self->{deny_reset} = 1; # loading can take a long time
1407
1358 my $path = $self->{path}; 1408 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1409 my $guard = cf::lock_acquire "map_load:$path";
1360 1410
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1411 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1412
1363 $self->in_memory (cf::MAP_LOADING); 1413 $self->in_memory (cf::MAP_LOADING);
1364 1414
1365 $self->alloc; 1415 $self->alloc;
1416
1417 $self->pre_load;
1418
1366 $self->_load_objects ($self->{load_path}, 1) 1419 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1420 or return;
1368 1421
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1423 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1445 unless $self->difficulty;
1393 Coro::cede; 1446 Coro::cede;
1394 $self->activate; 1447 $self->activate;
1395 } 1448 }
1396 1449
1450 $self->post_load;
1451
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1452 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1453}
1399 1454
1400sub customise_for { 1455sub customise_for {
1401 my ($self, $ob) = @_; 1456 my ($self, $ob) = @_;
… …
1441 1496
1442 cf::sync_job { $map->load }; 1497 cf::sync_job { $map->load };
1443} 1498}
1444 1499
1445our %MAP_PREFETCH; 1500our %MAP_PREFETCH;
1446our $MAP_PREFETCHER = Coro::async { 1501our $MAP_PREFETCHER = undef;
1447 while () {
1448 for my $path (keys %MAP_PREFETCH) {
1449 my $map = find $path
1450 or next;
1451 $map->load;
1452
1453 delete $MAP_PREFETCH{$path};
1454 }
1455 Coro::schedule;
1456 }
1457};
1458 1502
1459sub find_async { 1503sub find_async {
1460 my ($path, $origin) = @_; 1504 my ($path, $origin) = @_;
1461 1505
1462 $path = normalise $path, $origin && $origin->{path}; 1506 $path = normalise $path, $origin && $origin->{path};
1463 1507
1464 if (my $map = $cf::MAP{$path}) { 1508 if (my $map = $cf::MAP{$path}) {
1465 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1509 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1466 } 1510 }
1467 1511
1468 $MAP_PREFETCH{$path} = 0; 1512 undef $MAP_PREFETCH{$path};
1513 $MAP_PREFETCHER ||= cf::async {
1514 while (%MAP_PREFETCH) {
1515 for my $path (keys %MAP_PREFETCH) {
1516 my $map = find $path
1517 or next;
1518 $map->load;
1519
1520 delete $MAP_PREFETCH{$path};
1521 }
1522 }
1523 undef $MAP_PREFETCHER;
1524 };
1469 $MAP_PREFETCHER->ready; 1525 $MAP_PREFETCHER->prio (6);
1470 1526
1471 () 1527 ()
1472} 1528}
1473 1529
1474sub save { 1530sub save {
… …
1593 for (@$files) { 1649 for (@$files) {
1594 utf8::decode $_; 1650 utf8::decode $_;
1595 next if /\.pst$/; 1651 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1652 next unless /^$PATH_SEP/o;
1597 1653
1598 s/\.map$//; 1654 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1655 }
1601 1656
1602 \@paths 1657 \@paths
1603} 1658}
1604 1659
… …
1698=cut 1753=cut
1699 1754
1700sub link_map { 1755sub link_map {
1701 unless ($LINK_MAP) { 1756 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1757 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1758 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1759 $LINK_MAP->load;
1705 } 1760 }
1706 1761
1707 $LINK_MAP 1762 $LINK_MAP
1708} 1763}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1770 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1771
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1773 if $self->map;
1719 1774
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1775 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1776}
1722 1777
1723sub cf::object::player::leave_link { 1778sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1779 my ($self, $map, $x, $y) = @_;
1725 1780
… …
1792 my ($self, $path, $x, $y) = @_; 1847 my ($self, $path, $x, $y) = @_;
1793 1848
1794 $self->enter_link; 1849 $self->enter_link;
1795 1850
1796 (async { 1851 (async {
1852 my $map = eval {
1797 my $map = cf::map::find $path; 1853 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1854 $map = $map->customise_for ($self) if $map;
1799 1855 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1856 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1858
1805 $self->leave_link ($map, $x, $y); 1859 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1860 })->prio (1);
1807} 1861}
1808 1862
… …
1815 1869
1816 my $rmp = { # defaults 1870 my $rmp = { # defaults
1817 xsize => (cf::rndm 15, 40), 1871 xsize => (cf::rndm 15, 40),
1818 ysize => (cf::rndm 15, 40), 1872 ysize => (cf::rndm 15, 40),
1819 symmetry => (cf::rndm 1, cf::SYMMETRY_XY), 1873 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1820 #layout => string 1874 #layout => string,
1821 }; 1875 };
1822 1876
1823 for (split /\n/, $spec) { 1877 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 1878 my ($k, $v) = split /\s+/, $_, 2;
1825 1879
… …
1839 # that depends on the exit object 1893 # that depends on the exit object
1840 1894
1841 my $rmp = parse_random_map_params $exit->msg; 1895 my $rmp = parse_random_map_params $exit->msg;
1842 1896
1843 if ($exit->map) { 1897 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1898 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1899 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1900 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1901 $rmp->{origin_y} = $exit->y;
1848 } 1902 }
1849 1903
… …
1866sub cf::object::player::enter_exit { 1920sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1921 my ($self, $exit) = @_;
1868 1922
1869 return unless $self->type == cf::PLAYER; 1923 return unless $self->type == cf::PLAYER;
1870 1924
1925 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job
1927 cf::sync_job { prepare_random_map $exit };
1928 }
1929
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp;
1933
1871 $self->enter_link; 1934 $self->enter_link;
1872 1935
1873 (async { 1936 (async {
1874 $self->deactivate_recursive; # just to be sure 1937 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1938 unless (eval {
1876 prepare_random_map $exit 1939 $self->goto ($slaying, $hp, $sp);
1877 if $exit->slaying eq "/!";
1878
1879 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1880 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1881 1940
1882 1; 1941 1;
1883 }) { 1942 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1943 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1944 . "I'll try to bring you back to the map you were before. "
… …
1946 # get handled first 2005 # get handled first
1947 my $queue = delete $ns->{query_queue} 2006 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2007 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2008
1950 (shift @$queue)->[1]->($msg); 2009 (shift @$queue)->[1]->($msg);
2010 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2011
1952 push @{ $ns->{query_queue} }, @$queue; 2012 push @{ $ns->{query_queue} }, @$queue;
1953 2013
1954 if (@{ $ns->{query_queue} } == @$queue) { 2014 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2015 if (@$queue) {
… …
2174 sub db_sync() { 2234 sub db_sync() {
2175 db_save if $dirty; 2235 db_save if $dirty;
2176 undef $dirty; 2236 undef $dirty;
2177 } 2237 }
2178 2238
2179 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2239 my $idle = Event->idle (
2180 db_sync; 2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2181 }); 2246 );
2182 2247
2183 sub db_dirty() { 2248 sub db_dirty() {
2184 $dirty = 1; 2249 $dirty = 1;
2185 $idle->start; 2250 $idle->start;
2186 } 2251 }
… …
2207 }, 2272 },
2208 ); 2273 );
2209} 2274}
2210 2275
2211############################################################################# 2276#############################################################################
2212# the server's main() 2277# the server's init and main functions
2278
2279sub load_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d#
2282}
2213 2283
2214sub cfg_load { 2284sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2285 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2286 or return;
2217 2287
… …
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n"; 2299 and die "WARNING: m(un)lockall failed: $!\n";
2230 }; 2300 };
2231 warn $@ if $@; 2301 warn $@ if $@;
2232 } 2302 }
2303}
2304
2305sub init {
2306 load_resources;
2233} 2307}
2234 2308
2235sub main { 2309sub main {
2236 # we must not ever block the main coroutine 2310 # we must not ever block the main coroutine
2237 local $Coro::idle = sub { 2311 local $Coro::idle = sub {
… …
2242 }; 2316 };
2243 2317
2244 cfg_load; 2318 cfg_load;
2245 db_load; 2319 db_load;
2246 load_extensions; 2320 load_extensions;
2321
2322 $TICK_WATCHER->start;
2247 Event::loop; 2323 Event::loop;
2248} 2324}
2249 2325
2250############################################################################# 2326#############################################################################
2251# initialisation and cleanup 2327# initialisation and cleanup
2252 2328
2253# install some emergency cleanup handlers 2329# install some emergency cleanup handlers
2254BEGIN { 2330BEGIN {
2255 for my $signal (qw(INT HUP TERM)) { 2331 for my $signal (qw(INT HUP TERM)) {
2256 Event->signal ( 2332 Event->signal (
2333 reentrant => 0,
2257 data => WF_AUTOCANCEL, 2334 data => WF_AUTOCANCEL,
2258 signal => $signal, 2335 signal => $signal,
2336 prio => 0,
2259 cb => sub { 2337 cb => sub {
2260 cf::cleanup "SIG$signal"; 2338 cf::cleanup "SIG$signal";
2261 }, 2339 },
2262 ); 2340 );
2263 } 2341 }
2264} 2342}
… …
2293} 2371}
2294 2372
2295sub reload() { 2373sub reload() {
2296 # can/must only be called in main 2374 # can/must only be called in main
2297 if ($Coro::current != $Coro::main) { 2375 if ($Coro::current != $Coro::main) {
2298 warn "can only reload from main coroutine\n"; 2376 warn "can only reload from main coroutine";
2299 return; 2377 return;
2300 } 2378 }
2301 2379
2302 warn "reloading..."; 2380 warn "reloading...";
2303 2381
2304 warn "freezing server"; 2382 warn "cancelling server ticker";
2305 my $guard = freeze_mainloop; 2383 $TICK_WATCHER->cancel;
2384
2306 cf::emergency_save; 2385 cf::emergency_save;
2307
2308 warn "sync database to disk";
2309 cf::db_sync;
2310 IO::AIO::flush;
2311 2386
2312 eval { 2387 eval {
2313 # if anything goes wrong in here, we should simply crash as we already saved 2388 # if anything goes wrong in here, we should simply crash as we already saved
2314 2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392
2315 warn "cancel all watchers"; 2393 warn "cancelling all WF_AUTOCANCEL watchers";
2316 for (Event::all_watchers) { 2394 for (Event::all_watchers) {
2317 $_->cancel if $_->data & WF_AUTOCANCEL; 2395 $_->cancel if $_->data & WF_AUTOCANCEL;
2318 } 2396 }
2319 2397
2398 warn "flushing outstanding aio requests";
2399 for (;;) {
2400 IO::AIO::flush;
2401 Coro::cede;
2402 last unless IO::AIO::nreqs;
2403 warn "iterate...";
2404 }
2405
2320 warn "cancel all extension coros"; 2406 warn "cancelling all extension coros";
2321 $_->cancel for values %EXT_CORO; 2407 $_->cancel for values %EXT_CORO;
2322 %EXT_CORO = (); 2408 %EXT_CORO = ();
2323 2409
2324 warn "remove commands"; 2410 warn "removing commands";
2325 %COMMAND = (); 2411 %COMMAND = ();
2326 2412
2327 warn "remove ext commands"; 2413 warn "removing ext commands";
2328 %EXTCMD = (); 2414 %EXTCMD = ();
2329 2415
2330 warn "unload/nuke all extensions"; 2416 warn "unloading/nuking all extensions";
2331 for my $pkg (@EXTS) { 2417 for my $pkg (@EXTS) {
2332 warn "... unloading $pkg"; 2418 warn "... unloading $pkg";
2333 2419
2334 if (my $cb = $pkg->can ("unload")) { 2420 if (my $cb = $pkg->can ("unload")) {
2335 eval { 2421 eval {
… …
2340 2426
2341 warn "... nuking $pkg"; 2427 warn "... nuking $pkg";
2342 Symbol::delete_package $pkg; 2428 Symbol::delete_package $pkg;
2343 } 2429 }
2344 2430
2345 warn "unload all perl modules loaded from $LIBDIR"; 2431 warn "unloading all perl modules loaded from $LIBDIR";
2346 while (my ($k, $v) = each %INC) { 2432 while (my ($k, $v) = each %INC) {
2347 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2433 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2348 2434
2349 warn "removing <$k>"; 2435 warn "... unloading $k";
2350 delete $INC{$k}; 2436 delete $INC{$k};
2351 2437
2352 $k =~ s/\.pm$//; 2438 $k =~ s/\.pm$//;
2353 $k =~ s/\//::/g; 2439 $k =~ s/\//::/g;
2354 2440
… …
2357 } 2443 }
2358 2444
2359 Symbol::delete_package $k; 2445 Symbol::delete_package $k;
2360 } 2446 }
2361 2447
2362 warn "get rid of safe::, as good as possible"; 2448 warn "getting rid of safe::, as good as possible";
2363 Symbol::delete_package "safe::$_" 2449 Symbol::delete_package "safe::$_"
2364 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2365 2451
2366 warn "unload cf.pm \"a bit\""; 2452 warn "unloading cf.pm \"a bit\"";
2367 delete $INC{"cf.pm"}; 2453 delete $INC{"cf.pm"};
2368 2454
2369 # don't, removes xs symbols, too, 2455 # don't, removes xs symbols, too,
2370 # and global variables created in xs 2456 # and global variables created in xs
2371 #Symbol::delete_package __PACKAGE__; 2457 #Symbol::delete_package __PACKAGE__;
2372 2458
2459 warn "unload completed, starting to reload now";
2460
2373 warn "reloading cf.pm"; 2461 warn "reloading cf.pm";
2374 require cf; 2462 require cf;
2375 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2376 2464
2377 warn "load config and database again"; 2465 warn "loading config and database again";
2378 cf::cfg_load; 2466 cf::cfg_load;
2379 cf::db_load; 2467 cf::db_load;
2380 2468
2381 warn "load extensions"; 2469 warn "loading extensions";
2382 cf::load_extensions; 2470 cf::load_extensions;
2383 2471
2384 warn "reattach attachments to objects/players"; 2472 warn "reattaching attachments to objects/players";
2385 _global_reattach; 2473 _global_reattach;
2386 warn "reattach attachments to maps"; 2474 warn "reattaching attachments to maps";
2387 reattach $_ for values %MAP; 2475 reattach $_ for values %MAP;
2476
2477 warn "loading reloadable resources";
2478 load_resources;
2479
2480 warn "restarting server ticker";
2481
2482 $TICK_WATCHER->start;
2388 }; 2483 };
2389 2484
2390 if ($@) { 2485 if ($@) {
2391 warn $@; 2486 warn $@;
2392 warn "error while reloading, exiting."; 2487 warn "error while reloading, exiting.";
… …
2405 $who->message ("reloading server."); 2500 $who->message ("reloading server.");
2406 2501
2407 # doing reload synchronously and two reloads happen back-to-back, 2502 # doing reload synchronously and two reloads happen back-to-back,
2408 # coro crashes during coro_state_free->destroy here. 2503 # coro crashes during coro_state_free->destroy here.
2409 2504
2410 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2411 reload; 2510 reload;
2412 undef $RELOAD_WATCHER; 2511 undef $RELOAD_WATCHER;
2512 },
2413 }); 2513 );
2414 } 2514 }
2415}; 2515};
2416 2516
2417unshift @INC, $LIBDIR; 2517unshift @INC, $LIBDIR;
2518
2519my $bug_warning = 0;
2418 2520
2419$TICK_WATCHER = Event->timer ( 2521$TICK_WATCHER = Event->timer (
2420 reentrant => 0, 2522 reentrant => 0,
2523 parked => 1,
2421 prio => 0, 2524 prio => 0,
2422 at => $NEXT_TICK || $TICK, 2525 at => $NEXT_TICK || $TICK,
2423 data => WF_AUTOCANCEL, 2526 data => WF_AUTOCANCEL,
2424 cb => sub { 2527 cb => sub {
2528 if ($Coro::current != $Coro::main) {
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10;
2531 return;
2532 }
2533
2425 $NOW = Event::time; 2534 $NOW = Event::time;
2426 2535
2427 cf::server_tick; # one server iteration 2536 cf::server_tick; # one server iteration
2428 $RUNTIME += $TICK; 2537 $RUNTIME += $TICK;
2429 $NEXT_TICK += $TICK; 2538 $NEXT_TICK += $TICK;
2430 2539
2431 $WAIT_FOR_TICK->broadcast; 2540 $WAIT_FOR_TICK->broadcast;
2432 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d#
2433 2548
2434 # if we are delayed by four ticks or more, skip them all 2549 # if we are delayed by four ticks or more, skip them all
2435 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2436 2551
2437 $TICK_WATCHER->at ($NEXT_TICK); 2552 $TICK_WATCHER->at ($NEXT_TICK);
2438 $TICK_WATCHER->start; 2553 $TICK_WATCHER->start;
2439 }, 2554 },
2440); 2555);
2441 2556
2442IO::AIO::max_poll_time $TICK * 0.2; 2557IO::AIO::max_poll_time $TICK * 0.1;
2443 2558
2559undef $Coro::AIO::WATCHER;
2444$AIO_POLL_WATCHER = Event->io ( 2560$AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0,
2445 fd => IO::AIO::poll_fileno, 2562 fd => IO::AIO::poll_fileno,
2446 poll => 'r', 2563 poll => 'r',
2447 prio => 5, 2564 prio => 6,
2448 data => WF_AUTOCANCEL, 2565 data => WF_AUTOCANCEL,
2449 cb => \&IO::AIO::poll_cb, 2566 cb => \&IO::AIO::poll_cb,
2450); 2567);
2451 2568
2452$WRITE_RUNTIME_WATCHER = Event->timer ( 2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2453 data => WF_AUTOCANCEL, 2571 data => WF_AUTOCANCEL,
2454 after => 0, 2572 after => 1,
2455 interval => 10, 2573 interval => 10,
2456 cb => sub { 2574 prio => 6, # keep it lowest so it acts like a watchdog
2457 (Coro::unblock_sub { 2575 cb => Coro::unblock_sub {
2458 write_runtime 2576 write_runtime
2459 or warn "ERROR: unable to write runtime file: $!"; 2577 or warn "ERROR: unable to write runtime file: $!";
2460 })->();
2461 }, 2578 },
2462); 2579);
2463 2580
2464END { cf::emergency_save } 2581END { cf::emergency_save }
2465 2582

Diff Legend

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