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

Diff Legend

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