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.183 by root, Fri Jan 19 19:42:37 2007 UTC vs.
Revision 1.213 by root, Tue Feb 13 20:01:04 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 ();
25use Time::HiRes; 26use Time::HiRes;
27use Compress::LZF;
28
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
26 30
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 31use Event; $Event::Eval = 1; # no idea why this is required, but it is
28 32
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 34
… …
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $WRITE_RUNTIME_WATCHER;
51our $NEXT_TICK; 55our $NEXT_TICK;
52our $NOW; 56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off
58
59our $BDB_POLL_WATCHER;
60our $DB_ENV;
53 61
54our %CFG; 62our %CFG;
55 63
56our $UPTIME; $UPTIME ||= time; 64our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 65our $RUNTIME;
58 66
59our %PLAYER; # all users 67our %PLAYER; # all users
60our %MAP; # all maps 68our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 69our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
63 72
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 75
67# used to convert map paths into valid unix filenames by replacing / by ∕ 76# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 89mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 90mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 91mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 92mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
85 95
86our $EMERGENCY_POSITION; 96our $EMERGENCY_POSITION;
97
98sub cf::map::normalise;
87 99
88############################################################################# 100#############################################################################
89 101
90=head2 GLOBAL VARIABLES 102=head2 GLOBAL VARIABLES
91 103
… …
349 my $runtime = cf::localdir . "/runtime"; 361 my $runtime = cf::localdir . "/runtime";
350 362
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 364 or return;
353 365
366 my $value = $cf::RUNTIME + 90 + 10;
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 367 # 10 is the runtime save interval, for a monotonic clock
368 # 60 allows for the watchdog to kill the server.
369
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return; 371 and return;
357 372
373 # always fsync - this file is important
358 aio_fsync $fh 374 aio_fsync $fh
359 and return; 375 and return;
360 376
361 close $fh 377 close $fh
362 or return; 378 or return;
… …
747 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
748 764
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 769 close $fh;
754 770
755 if (@$objs) { 771 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 777 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
763 } 779 }
764 } else { 780 } else {
765 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
771 } 787 }
772 } else { 788 } else {
773 aio_unlink $filename; 789 aio_unlink $filename;
774 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
775 } 791 }
792
793 #d##TODO# nuke non .map-files if exist
794 if ($filename =~ s/\.map$//) {
795 aio_unlink $filename;
796 aio_unlink "$filename.pst";
797 }
776 } 798 }
777} 799}
778 800
779sub object_freezer_as_string { 801sub object_freezer_as_string {
780 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
786 808
787sub object_thawer_load { 809sub object_thawer_load {
788 my ($filename) = @_; 810 my ($filename) = @_;
789 811
790 my ($data, $av); 812 my ($data, $av);
813
814 #d#TODO remove .map if file does not exist
815 aio_stat $filename and $filename =~ s/\.map$//;
791 816
792 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
793 or return; 818 or return;
794 819
795 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1065=cut 1090=cut
1066 1091
1067sub maps($) { 1092sub maps($) {
1068 my ($pl) = @_; 1093 my ($pl) = @_;
1069 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1070 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1071 or return; 1098 or return;
1072 1099
1073 my @paths; 1100 my @paths;
1074 1101
1075 for (@$files) { 1102 for (@$files) {
1076 utf8::decode $_; 1103 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1079 1106
1080 s/\.map$//; 1107 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1108 }
1083 1109
1084 \@paths 1110 \@paths
1085} 1111}
1086 1112
… …
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1165 )
1140} 1166}
1141 1167
1168=item cf::map->register ($regex, $prio)
1169
1170Register a handler for the map path matching the given regex at the
1171givne priority (higher is better, built-in handlers have priority 0, the
1172default).
1173
1174=cut
1175
1142sub register { 1176sub register {
1143 my (undef, $regex) = @_; 1177 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1178 my $pkg = caller;
1145 1179
1146 no strict; 1180 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1182
1149 $EXT_MAP{$pkg} = qr<$regex>; 1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1184}
1151 1185
1152# also paths starting with '/' 1186# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1188
1155sub thawer_merge { 1189sub thawer_merge {
1156 my ($self, $merge) = @_; 1190 my ($self, $merge) = @_;
1157 1191
1158 # we have to keep some variables in memory intact 1192 # we have to keep some variables in memory intact
… …
1164 $self->SUPER::thawer_merge ($merge); 1198 $self->SUPER::thawer_merge ($merge);
1165} 1199}
1166 1200
1167sub normalise { 1201sub normalise {
1168 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1169 1207
1170 # map plan: 1208 # map plan:
1171 # 1209 #
1172 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1173 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
… …
1201 1239
1202 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1240 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1203 1241
1204 $path = normalise $path, $base; 1242 $path = normalise $path, $base;
1205 1243
1206 for my $pkg (keys %EXT_MAP) { 1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1207 if ($path =~ $EXT_MAP{$pkg}) { 1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1208 my $self = bless cf::map::new, $pkg; 1246 my $self = bless cf::map::new, $pkg;
1209 $self->{path} = $path; $self->path ($path); 1247 $self->{path} = $path; $self->path ($path);
1210 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1211 return $self; 1249 return $self;
1212 } 1250 }
1213 } 1251 }
1214 1252
1215 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1216 () 1254 ()
1217} 1255}
1218 1256
1219sub init { 1257sub init {
1220 my ($self) = @_; 1258 my ($self) = @_;
… …
1235 1273
1236# the original (read-only) location 1274# the original (read-only) location
1237sub load_path { 1275sub load_path {
1238 my ($self) = @_; 1276 my ($self) = @_;
1239 1277
1240 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1241} 1279}
1242 1280
1243# the temporary/swap location 1281# the temporary/swap location
1244sub save_path { 1282sub save_path {
1245 my ($self) = @_; 1283 my ($self) = @_;
1246 1284
1247 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1248 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1249} 1287}
1250 1288
1251# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1252sub uniq_path { 1290sub uniq_path {
1253 my ($self) = @_; 1291 my ($self) = @_;
… …
1269 my ($self) = @_; 1307 my ($self) = @_;
1270 1308
1271 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1272 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1273 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1311 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1312
1313 #d#TODO remove .map and also nuke
1314 $save =~ s/\.map// or return;#d#
1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1274} 1317}
1275 1318
1276sub load_header_from($) { 1319sub load_header_from($) {
1277 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1278 1321
1279 utf8::encode $path; 1322 utf8::encode $path;
1280 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1281 or return; 1324 # or return;
1282 1325
1283 $self->_load_header ($path) 1326 $self->_load_header ($path)
1284 or return; 1327 or return;
1285 1328
1286 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1287 1330
1288 1 1331 1
1289} 1332}
1290 1333
1291sub load_orig { 1334sub load_header_orig {
1292 my ($self) = @_; 1335 my ($self) = @_;
1293 1336
1294 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1295} 1338}
1296 1339
1297sub load_temp { 1340sub load_header_temp {
1298 my ($self) = @_; 1341 my ($self) = @_;
1299 1342
1300 $self->load_header_from ($self->save_path) 1343 $self->load_header_from ($self->save_path)
1344}
1345
1346sub prepare_temp {
1347 my ($self) = @_;
1348
1349 $self->last_access ((delete $self->{last_access})
1350 || $cf::RUNTIME); #d#
1351 # safety
1352 $self->{instantiate_time} = $cf::RUNTIME
1353 if $self->{instantiate_time} > $cf::RUNTIME;
1354}
1355
1356sub prepare_orig {
1357 my ($self) = @_;
1358
1359 $self->{load_original} = 1;
1360 $self->{instantiate_time} = $cf::RUNTIME;
1361 $self->last_access ($cf::RUNTIME);
1362 $self->instantiate;
1301} 1363}
1302 1364
1303sub load_header { 1365sub load_header {
1304 my ($self) = @_; 1366 my ($self) = @_;
1305 1367
1306 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1307 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1308 || $cf::RUNTIME); #d#
1309 # safety
1310 $self->{instantiate_time} = $cf::RUNTIME
1311 if $self->{instantiate_time} > $cf::RUNTIME;
1312 } else { 1370 } else {
1313 $self->load_orig 1371 $self->load_header_orig
1314 or return; 1372 or return;
1315 1373 $self->prepare_orig;
1316 $self->{load_original} = 1;
1317 $self->{instantiate_time} = $cf::RUNTIME;
1318 $self->last_access ($cf::RUNTIME);
1319 $self->instantiate;
1320 } 1374 }
1321 1375
1322 1 1376 1
1323} 1377}
1324 1378
… …
1338 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1339 1393
1340 $map->load_header 1394 $map->load_header
1341 or return; 1395 or return;
1342 1396
1343 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1398 # doing this can freeze the server in a sync job, obviously
1344 $cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1345 $map->reset; 1400 $map->reset;
1346 undef $guard; 1401 undef $guard;
1347 $map = find $path 1402 return find $path;
1348 or return;
1349 } 1403 }
1350 1404
1351 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1352 } 1406 }
1353} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1354 1411
1355sub load { 1412sub load {
1356 my ($self) = @_; 1413 my ($self) = @_;
1357 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1358 my $path = $self->{path}; 1417 my $path = $self->{path};
1359 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1360 1419
1361 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1362 1421
1363 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1364 1423
1365 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1366 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1367 or return; 1429 or return;
1368 1430
1369 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1370 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1392 unless $self->difficulty; 1454 unless $self->difficulty;
1393 Coro::cede; 1455 Coro::cede;
1394 $self->activate; 1456 $self->activate;
1395 } 1457 }
1396 1458
1459 $self->post_load;
1460
1397 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1398} 1462}
1399 1463
1400sub customise_for { 1464sub customise_for {
1401 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1456 1520
1457 undef $MAP_PREFETCH{$path}; 1521 undef $MAP_PREFETCH{$path};
1458 $MAP_PREFETCHER ||= cf::async { 1522 $MAP_PREFETCHER ||= cf::async {
1459 while (%MAP_PREFETCH) { 1523 while (%MAP_PREFETCH) {
1460 for my $path (keys %MAP_PREFETCH) { 1524 for my $path (keys %MAP_PREFETCH) {
1461 warn "prefetching $path...\n";#d#
1462 my $map = find $path 1525 my $map = find $path
1463 or next; 1526 or next;
1464 $map->load; 1527 $map->load;
1465 1528
1466 delete $MAP_PREFETCH{$path}; 1529 delete $MAP_PREFETCH{$path};
1467 } 1530 }
1468 } 1531 }
1469 undef $MAP_PREFETCHER; 1532 undef $MAP_PREFETCHER;
1470 }; 1533 };
1534 $MAP_PREFETCHER->prio (6);
1471 1535
1472 () 1536 ()
1473} 1537}
1474 1538
1475sub save { 1539sub save {
… …
1545 return if $self->players; 1609 return if $self->players;
1546 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1547 1611
1548 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1549 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1550 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1551 1625
1552 $self->in_memory (cf::MAP_SWAPPED);
1553 $self->clear; 1626 $self->clear;
1554 1627
1555 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1556 1629
1557 $self->unlink_save; 1630 $self->unlink_save;
… …
1594 for (@$files) { 1667 for (@$files) {
1595 utf8::decode $_; 1668 utf8::decode $_;
1596 next if /\.pst$/; 1669 next if /\.pst$/;
1597 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1598 1671
1599 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1600 push @paths, $_;
1601 } 1673 }
1602 1674
1603 \@paths 1675 \@paths
1604} 1676}
1605 1677
… …
1699=cut 1771=cut
1700 1772
1701sub link_map { 1773sub link_map {
1702 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1703 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1704 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1705 $LINK_MAP->load; 1777 $LINK_MAP->load;
1706 } 1778 }
1707 1779
1708 $LINK_MAP 1780 $LINK_MAP
1709} 1781}
… …
1716 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1717 1789
1718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1719 if $self->map; 1791 if $self->map;
1720 1792
1721 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1722} 1794}
1723 1795
1724sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1725 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1726 1798
… …
1793 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1794 1866
1795 $self->enter_link; 1867 $self->enter_link;
1796 1868
1797 (async { 1869 (async {
1870 my $map = eval {
1798 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1799 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1800 1873 $map
1801# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1802# if $map;
1803
1804 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1875 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1805 1876
1806 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1807 })->prio (1); 1878 })->prio (1);
1808} 1879}
1809 1880
… …
1840 # that depends on the exit object 1911 # that depends on the exit object
1841 1912
1842 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1843 1914
1844 if ($exit->map) { 1915 if ($exit->map) {
1845 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1846 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1847 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1848 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1849 } 1920 }
1850 1921
… …
1867sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1868 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1869 1940
1870 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1871 1942
1943 if ($exit->slaying eq "/!") {
1944 #TODO: this should de-fi-ni-te-ly not be a sync-job
1945 cf::sync_job { prepare_random_map $exit };
1946 }
1947
1948 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1949 my $hp = $exit->stats->hp;
1950 my $sp = $exit->stats->sp;
1951
1872 $self->enter_link; 1952 $self->enter_link;
1873 1953
1874 (async { 1954 (async {
1875 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1876 unless (eval { 1956 unless (eval {
1877 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1878 if $exit->slaying eq "/!";
1879
1880 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1881 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1882 1958
1883 1; 1959 1;
1884 }) { 1960 }) {
1885 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1886 . "I'll try to bring you back to the map you were before. " 1962 . "I'll try to bring you back to the map you were before. "
… …
1947 # get handled first 2023 # get handled first
1948 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1949 or return; # be conservative, not sure how that can happen, but we saw a crash here 2025 or return; # be conservative, not sure how that can happen, but we saw a crash here
1950 2026
1951 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1952 2029
1953 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1954 2031
1955 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1956 if (@$queue) { 2033 if (@$queue) {
… …
2117The parameter C<$family> should best start with the name of the extension 2194The parameter C<$family> should best start with the name of the extension
2118using it, it should be unique. 2195using it, it should be unique.
2119 2196
2120=over 4 2197=over 4
2121 2198
2122=item $hashref = cf::db_get $family
2123
2124Return a hashref for use by the extension C<$family>, which can be
2125modified. After modifications, you have to call C<cf::db_dirty> or
2126C<cf::db_sync>.
2127
2128=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2129 2200
2130Returns a single value from the database 2201Returns a single value from the database.
2131
2132=item cf::db_put $family => $hashref
2133
2134Stores the given family hashref into the database. Updates are delayed, if
2135you want the data to be synced to disk immediately, use C<cf::db_sync>.
2136 2202
2137=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2138 2204
2139Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2140want the data to be synced to disk immediately, use C<cf::db_sync>.
2141
2142=item cf::db_dirty
2143
2144Marks the database as dirty, to be updated at a later time.
2145
2146=item cf::db_sync
2147
2148Immediately write the database to disk I<if it is dirty>.
2149 2206
2150=cut 2207=cut
2151 2208
2152our $DB; 2209our $DB;
2153 2210
2154{ 2211sub db_init {
2212 unless ($DB) {
2213 $DB = BDB::db_create $DB_ENV;
2214
2215 cf::sync_job {
2216 eval {
2217 $DB->set_flags (BDB::CHKSUM);
2218
2219 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2220 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2221 cf::cleanup "db_open(db): $!" if $!;
2222 };
2223 cf::cleanup "db_open(db): $@" if $@;
2224 };
2225
2155 my $path = cf::localdir . "/database.pst"; 2226 my $path = cf::localdir . "/database.pst";
2227 if (stat $path) {
2228 cf::sync_job {
2229 my $pst = Storable::retrieve $path;
2156 2230
2157 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2158 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2159 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2160 2235
2161 my $pid; 2236 unlink $path;
2162
2163 sub db_save() {
2164 waitpid $pid, 0 if $pid;
2165 if (0 == ($pid = fork)) {
2166 $DB->{_meta}{version} = 1;
2167 Storable::nstore $DB, "$path~";
2168 rename "$path~", $path;
2169 cf::_exit 0 if defined $pid;
2170 } 2237 };
2171 }
2172
2173 my $dirty;
2174
2175 sub db_sync() {
2176 db_save if $dirty;
2177 undef $dirty;
2178 }
2179
2180 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2181 db_sync;
2182 });
2183
2184 sub db_dirty() {
2185 $dirty = 1;
2186 $idle->start;
2187 }
2188
2189 sub db_get($;$) {
2190 @_ >= 2
2191 ? $DB->{$_[0]}{$_[1]}
2192 : ($DB->{$_[0]} ||= { })
2193 }
2194
2195 sub db_put($$;$) {
2196 if (@_ >= 3) {
2197 $DB->{$_[0]}{$_[1]} = $_[2];
2198 } else {
2199 $DB->{$_[0]} = $_[1];
2200 }
2201 db_dirty;
2202 }
2203
2204 cf::global->attach (
2205 prio => 10000,
2206 on_cleanup => sub {
2207 db_sync;
2208 }, 2238 }
2209 ); 2239 }
2240}
2241
2242sub db_get($$) {
2243 my $key = "$_[0]/$_[1]";
2244
2245 cf::sync_job {
2246 BDB::db_get $DB, undef, $key, my $data;
2247
2248 $! ? ()
2249 : Compress::LZF::sthaw $data
2250 }
2251}
2252
2253sub db_put($$$) {
2254 BDB::dbreq_pri 4;
2255 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2210} 2256}
2211 2257
2212############################################################################# 2258#############################################################################
2213# the server's main() 2259# the server's init and main functions
2260
2261sub load_resources {
2262 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2263 or die "unable to load regions file\n";#d#
2264}
2214 2265
2215sub cfg_load { 2266sub cfg_load {
2216 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2217 or return; 2268 or return;
2218 2269
… …
2229 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2230 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2231 }; 2282 };
2232 warn $@ if $@; 2283 warn $@ if $@;
2233 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2234} 2289}
2235 2290
2236sub main { 2291sub main {
2237 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2238 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2241 Event::one_event; 2296 Event::one_event;
2242 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2243 }; 2298 };
2244 2299
2245 cfg_load; 2300 cfg_load;
2246 db_load; 2301 db_init;
2247 load_extensions; 2302 load_extensions;
2248 2303
2249 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2250 Event::loop; 2306 Event::loop;
2251} 2307}
2252 2308
2253############################################################################# 2309#############################################################################
2254# initialisation and cleanup 2310# initialisation and cleanup
2255 2311
2256# install some emergency cleanup handlers 2312# install some emergency cleanup handlers
2257BEGIN { 2313BEGIN {
2258 for my $signal (qw(INT HUP TERM)) { 2314 for my $signal (qw(INT HUP TERM)) {
2259 Event->signal ( 2315 Event->signal (
2316 reentrant => 0,
2260 data => WF_AUTOCANCEL, 2317 data => WF_AUTOCANCEL,
2261 signal => $signal, 2318 signal => $signal,
2319 prio => 0,
2262 cb => sub { 2320 cb => sub {
2263 cf::cleanup "SIG$signal"; 2321 cf::cleanup "SIG$signal";
2264 }, 2322 },
2265 ); 2323 );
2266 } 2324 }
2267} 2325}
… …
2288 my $map = $cf::MAP{$path} or next; 2346 my $map = $cf::MAP{$path} or next;
2289 $map->valid or next; 2347 $map->valid or next;
2290 $map->save; 2348 $map->save;
2291 } 2349 }
2292 warn "end emergency map save\n"; 2350 warn "end emergency map save\n";
2351
2352 warn "begin emergency database checkpoint\n";
2353 BDB::db_env_txn_checkpoint $DB_ENV;
2354 warn "end emergency database checkpoint\n";
2293 }; 2355 };
2294 2356
2295 warn "leave emergency perl save\n"; 2357 warn "leave emergency perl save\n";
2358}
2359
2360sub post_cleanup {
2361 my ($make_core) = @_;
2362
2363 warn Carp::longmess "post_cleanup backtrace"
2364 if $make_core;
2296} 2365}
2297 2366
2298sub reload() { 2367sub reload() {
2299 # can/must only be called in main 2368 # can/must only be called in main
2300 if ($Coro::current != $Coro::main) { 2369 if ($Coro::current != $Coro::main) {
… …
2302 return; 2371 return;
2303 } 2372 }
2304 2373
2305 warn "reloading..."; 2374 warn "reloading...";
2306 2375
2307 warn "cancelling server ticker"; 2376 warn "entering sync_job";
2308 $TICK_WATCHER->cancel;
2309 2377
2378 cf::sync_job {
2379 cf::write_runtime;
2310 cf::emergency_save; 2380 cf::emergency_save;
2381 cf::write_runtime;
2311 2382
2312 eval { 2383 warn "syncing database to disk";
2384 BDB::db_env_txn_checkpoint $DB_ENV;
2385
2313 # if anything goes wrong in here, we should simply crash as we already saved 2386 # if anything goes wrong in here, we should simply crash as we already saved
2314
2315 warn "syncing database to disk";
2316 cf::db_sync;
2317 2387
2318 warn "cancelling all WF_AUTOCANCEL watchers"; 2388 warn "cancelling all WF_AUTOCANCEL watchers";
2319 for (Event::all_watchers) { 2389 for (Event::all_watchers) {
2320 $_->cancel if $_->data & WF_AUTOCANCEL; 2390 $_->cancel if $_->data & WF_AUTOCANCEL;
2321 } 2391 }
2322 2392
2323 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2324 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2325 IO::AIO::flush; 2396 IO::AIO::flush;
2326 Coro::cede; 2397 Coro::cede;
2327 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2328 warn "iterate..."; 2399 warn "iterate...";
2329 } 2400 }
2330 2401
2331 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2332 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2387 require cf; 2458 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 2460
2390 warn "loading config and database again"; 2461 warn "loading config and database again";
2391 cf::cfg_load; 2462 cf::cfg_load;
2392 cf::db_load;
2393 2463
2394 warn "loading extensions"; 2464 warn "loading extensions";
2395 cf::load_extensions; 2465 cf::load_extensions;
2396 2466
2397 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2398 _global_reattach; 2468 _global_reattach;
2399 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2401 2471
2402 warn "restarting server ticker"; 2472 warn "loading reloadable resources";
2473 load_resources;
2403 2474
2404 $TICK_WATCHER->start; 2475 warn "leaving sync_job";
2405 };
2406 2476
2407 if ($@) { 2477 1
2478 } or do {
2408 warn $@; 2479 warn $@;
2409 warn "error while reloading, exiting."; 2480 warn "error while reloading, exiting.";
2410 exit 1; 2481 exit 1;
2411 } 2482 };
2412 2483
2413 warn "reloaded"; 2484 warn "reloaded";
2414}; 2485};
2415 2486
2416our $RELOAD_WATCHER; # used only during reload 2487our $RELOAD_WATCHER; # used only during reload
… …
2422 $who->message ("reloading server."); 2493 $who->message ("reloading server.");
2423 2494
2424 # doing reload synchronously and two reloads happen back-to-back, 2495 # doing reload synchronously and two reloads happen back-to-back,
2425 # coro crashes during coro_state_free->destroy here. 2496 # coro crashes during coro_state_free->destroy here.
2426 2497
2427 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2498 $RELOAD_WATCHER ||= Event->timer (
2499 reentrant => 0,
2500 after => 0,
2501 data => WF_AUTOCANCEL,
2502 cb => sub {
2428 reload; 2503 reload;
2429 undef $RELOAD_WATCHER; 2504 undef $RELOAD_WATCHER;
2505 },
2430 }); 2506 );
2431 } 2507 }
2432}; 2508};
2433 2509
2434unshift @INC, $LIBDIR; 2510unshift @INC, $LIBDIR;
2435 2511
… …
2455 $NEXT_TICK += $TICK; 2531 $NEXT_TICK += $TICK;
2456 2532
2457 $WAIT_FOR_TICK->broadcast; 2533 $WAIT_FOR_TICK->broadcast;
2458 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2459 2535
2536# my $AFTER = Event::time;
2537# warn $AFTER - $NOW;#d#
2538
2460 # if we are delayed by four ticks or more, skip them all 2539 # if we are delayed by four ticks or more, skip them all
2461 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2540 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2462 2541
2463 $TICK_WATCHER->at ($NEXT_TICK); 2542 $TICK_WATCHER->at ($NEXT_TICK);
2464 $TICK_WATCHER->start; 2543 $TICK_WATCHER->start;
2465 }, 2544 },
2466); 2545);
2467 2546
2547{
2548 BDB::max_poll_time $TICK * 0.1;
2549 $BDB_POLL_WATCHER = Event->io (
2550 reentrant => 0,
2551 fd => BDB::poll_fileno,
2552 poll => 'r',
2553 prio => 0,
2554 data => WF_AUTOCANCEL,
2555 cb => \&BDB::poll_cb,
2556 );
2557 BDB::min_parallel 8;
2558
2559 BDB::set_sync_prepare {
2560 my $status;
2561 my $current = $Coro::current;
2562 (
2563 sub {
2564 $status = $!;
2565 $current->ready; undef $current;
2566 },
2567 sub {
2568 Coro::schedule while defined $current;
2569 $! = $status;
2570 },
2571 )
2572 };
2573
2574 unless ($DB_ENV) {
2575 $DB_ENV = BDB::db_env_create;
2576
2577 cf::sync_job {
2578 eval {
2579 BDB::db_env_open
2580 $DB_ENV,
2581 $BDB_ENV_DIR,
2582 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2583 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2584 0666;
2585
2586 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2587
2588 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2589 $DB_ENV->set_lk_detect;
2590 };
2591
2592 cf::cleanup "db_env_open(db): $@" if $@;
2593 };
2594 }
2595}
2596
2597{
2598 IO::AIO::min_parallel 8;
2599
2600 undef $Coro::AIO::WATCHER;
2468IO::AIO::max_poll_time $TICK * 0.2; 2601 IO::AIO::max_poll_time $TICK * 0.1;
2469
2470$AIO_POLL_WATCHER = Event->io ( 2602 $AIO_POLL_WATCHER = Event->io (
2603 reentrant => 0,
2471 fd => IO::AIO::poll_fileno, 2604 fd => IO::AIO::poll_fileno,
2472 poll => 'r', 2605 poll => 'r',
2473 prio => 5, 2606 prio => 6,
2474 data => WF_AUTOCANCEL, 2607 data => WF_AUTOCANCEL,
2475 cb => \&IO::AIO::poll_cb, 2608 cb => \&IO::AIO::poll_cb,
2476); 2609 );
2610}
2477 2611
2478$WRITE_RUNTIME_WATCHER = Event->timer ( 2612$WRITE_RUNTIME_WATCHER = Event->timer (
2613 reentrant => 0,
2479 data => WF_AUTOCANCEL, 2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2480 after => 1, 2616 after => 1,
2481 interval => 10, 2617 interval => 10,
2482 cb => Coro::unblock_sub { 2618 prio => 6, # keep it lowest so it acts like a watchdog
2619 cb => sub {
2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2483 write_runtime 2623 write_runtime
2484 or warn "ERROR: unable to write runtime file: $!"; 2624 or warn "ERROR: unable to write runtime file: $!";
2625 };
2485 }, 2626 },
2486); 2627);
2487 2628
2488END { cf::emergency_save } 2629END { cf::emergency_save }
2489 2630

Diff Legend

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