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.184 by root, Fri Jan 19 22:47:57 2007 UTC vs.
Revision 1.208 by root, Mon Feb 12 00:27: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;
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) = @_;
… …
1465 delete $MAP_PREFETCH{$path}; 1529 delete $MAP_PREFETCH{$path};
1466 } 1530 }
1467 } 1531 }
1468 undef $MAP_PREFETCHER; 1532 undef $MAP_PREFETCHER;
1469 }; 1533 };
1534 $MAP_PREFETCHER->prio (6);
1470 1535
1471 () 1536 ()
1472} 1537}
1473 1538
1474sub save { 1539sub save {
… …
1593 for (@$files) { 1658 for (@$files) {
1594 utf8::decode $_; 1659 utf8::decode $_;
1595 next if /\.pst$/; 1660 next if /\.pst$/;
1596 next unless /^$PATH_SEP/o; 1661 next unless /^$PATH_SEP/o;
1597 1662
1598 s/\.map$//; 1663 push @paths, cf::map::normalise $_;
1599 push @paths, $_;
1600 } 1664 }
1601 1665
1602 \@paths 1666 \@paths
1603} 1667}
1604 1668
… …
1698=cut 1762=cut
1699 1763
1700sub link_map { 1764sub link_map {
1701 unless ($LINK_MAP) { 1765 unless ($LINK_MAP) {
1702 $LINK_MAP = cf::map::find "{link}" 1766 $LINK_MAP = cf::map::find "{link}"
1703 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1767 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1704 $LINK_MAP->load; 1768 $LINK_MAP->load;
1705 } 1769 }
1706 1770
1707 $LINK_MAP 1771 $LINK_MAP
1708} 1772}
… …
1715 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1779 return if UNIVERSAL::isa $self->map, "ext::map_link";
1716 1780
1717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1781 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1718 if $self->map; 1782 if $self->map;
1719 1783
1720 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1784 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1721} 1785}
1722 1786
1723sub cf::object::player::leave_link { 1787sub cf::object::player::leave_link {
1724 my ($self, $map, $x, $y) = @_; 1788 my ($self, $map, $x, $y) = @_;
1725 1789
… …
1792 my ($self, $path, $x, $y) = @_; 1856 my ($self, $path, $x, $y) = @_;
1793 1857
1794 $self->enter_link; 1858 $self->enter_link;
1795 1859
1796 (async { 1860 (async {
1861 my $map = eval {
1797 my $map = cf::map::find $path; 1862 my $map = cf::map::find $path;
1798 $map = $map->customise_for ($self) if $map; 1863 $map = $map->customise_for ($self) if $map;
1799 1864 $map
1800# warn "entering ", $map->path, " at ($x, $y)\n" 1865 } or
1801# if $map;
1802
1803 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1866 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1804 1867
1805 $self->leave_link ($map, $x, $y); 1868 $self->leave_link ($map, $x, $y);
1806 })->prio (1); 1869 })->prio (1);
1807} 1870}
1808 1871
… …
1839 # that depends on the exit object 1902 # that depends on the exit object
1840 1903
1841 my $rmp = parse_random_map_params $exit->msg; 1904 my $rmp = parse_random_map_params $exit->msg;
1842 1905
1843 if ($exit->map) { 1906 if ($exit->map) {
1844 $rmp->{region} = $exit->map->region_name; 1907 $rmp->{region} = $exit->region->name;
1845 $rmp->{origin_map} = $exit->map->path; 1908 $rmp->{origin_map} = $exit->map->path;
1846 $rmp->{origin_x} = $exit->x; 1909 $rmp->{origin_x} = $exit->x;
1847 $rmp->{origin_y} = $exit->y; 1910 $rmp->{origin_y} = $exit->y;
1848 } 1911 }
1849 1912
… …
1866sub cf::object::player::enter_exit { 1929sub cf::object::player::enter_exit {
1867 my ($self, $exit) = @_; 1930 my ($self, $exit) = @_;
1868 1931
1869 return unless $self->type == cf::PLAYER; 1932 return unless $self->type == cf::PLAYER;
1870 1933
1934 if ($exit->slaying eq "/!") {
1935 #TODO: this should de-fi-ni-te-ly not be a sync-job
1936 cf::sync_job { prepare_random_map $exit };
1937 }
1938
1939 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1940 my $hp = $exit->stats->hp;
1941 my $sp = $exit->stats->sp;
1942
1871 $self->enter_link; 1943 $self->enter_link;
1872 1944
1873 (async { 1945 (async {
1874 $self->deactivate_recursive; # just to be sure 1946 $self->deactivate_recursive; # just to be sure
1875 unless (eval { 1947 unless (eval {
1876 prepare_random_map $exit 1948 $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 1949
1882 1; 1950 1;
1883 }) { 1951 }) {
1884 $self->message ("Something went wrong deep within the crossfire server. " 1952 $self->message ("Something went wrong deep within the crossfire server. "
1885 . "I'll try to bring you back to the map you were before. " 1953 . "I'll try to bring you back to the map you were before. "
… …
1946 # get handled first 2014 # get handled first
1947 my $queue = delete $ns->{query_queue} 2015 my $queue = delete $ns->{query_queue}
1948 or return; # be conservative, not sure how that can happen, but we saw a crash here 2016 or return; # be conservative, not sure how that can happen, but we saw a crash here
1949 2017
1950 (shift @$queue)->[1]->($msg); 2018 (shift @$queue)->[1]->($msg);
2019 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1951 2020
1952 push @{ $ns->{query_queue} }, @$queue; 2021 push @{ $ns->{query_queue} }, @$queue;
1953 2022
1954 if (@{ $ns->{query_queue} } == @$queue) { 2023 if (@{ $ns->{query_queue} } == @$queue) {
1955 if (@$queue) { 2024 if (@$queue) {
… …
2116The parameter C<$family> should best start with the name of the extension 2185The parameter C<$family> should best start with the name of the extension
2117using it, it should be unique. 2186using it, it should be unique.
2118 2187
2119=over 4 2188=over 4
2120 2189
2121=item $hashref = cf::db_get $family
2122
2123Return a hashref for use by the extension C<$family>, which can be
2124modified. After modifications, you have to call C<cf::db_dirty> or
2125C<cf::db_sync>.
2126
2127=item $value = cf::db_get $family => $key 2190=item $value = cf::db_get $family => $key
2128 2191
2129Returns a single value from the database 2192Returns a single value from the database.
2130
2131=item cf::db_put $family => $hashref
2132
2133Stores the given family hashref into the database. Updates are delayed, if
2134you want the data to be synced to disk immediately, use C<cf::db_sync>.
2135 2193
2136=item cf::db_put $family => $key => $value 2194=item cf::db_put $family => $key => $value
2137 2195
2138Stores the given C<$value> in the family hash. Updates are delayed, if you 2196Stores the given C<$value> in the family.
2139want the data to be synced to disk immediately, use C<cf::db_sync>.
2140
2141=item cf::db_dirty
2142
2143Marks the database as dirty, to be updated at a later time.
2144
2145=item cf::db_sync
2146
2147Immediately write the database to disk I<if it is dirty>.
2148 2197
2149=cut 2198=cut
2150 2199
2151our $DB; 2200our $DB;
2152 2201
2153{ 2202sub db_load() {
2203 unless ($DB) {
2204 $DB = BDB::db_create $DB_ENV;
2205
2206 cf::sync_job {
2207 eval {
2208 $DB->set_flags (BDB::CHKSUM);
2209
2210 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2211 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2212 cf::cleanup "db_open(db): $!" if $!;
2213 };
2214 cf::cleanup "db_open(db): $@" if $@;
2215 };
2216
2154 my $path = cf::localdir . "/database.pst"; 2217 my $path = cf::localdir . "/database.pst";
2218 if (stat $path) {
2219 cf::sync_job {
2220 my $pst = Storable::retrieve $path;
2155 2221
2156 sub db_load() { 2222 cf::db_put (board => data => $pst->{board});
2157 $DB = stat $path ? Storable::retrieve $path : { }; 2223 cf::db_put (guildrules => data => $pst->{guildrules});
2158 } 2224 cf::db_put (rent => balance => $pst->{rent}{balance});
2225 BDB::db_env_txn_checkpoint $DB_ENV;
2159 2226
2160 my $pid; 2227 unlink $path;
2161
2162 sub db_save() {
2163 waitpid $pid, 0 if $pid;
2164 if (0 == ($pid = fork)) {
2165 $DB->{_meta}{version} = 1;
2166 Storable::nstore $DB, "$path~";
2167 rename "$path~", $path;
2168 cf::_exit 0 if defined $pid;
2169 } 2228 };
2170 }
2171
2172 my $dirty;
2173
2174 sub db_sync() {
2175 db_save if $dirty;
2176 undef $dirty;
2177 }
2178
2179 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2180 db_sync;
2181 });
2182
2183 sub db_dirty() {
2184 $dirty = 1;
2185 $idle->start;
2186 }
2187
2188 sub db_get($;$) {
2189 @_ >= 2
2190 ? $DB->{$_[0]}{$_[1]}
2191 : ($DB->{$_[0]} ||= { })
2192 }
2193
2194 sub db_put($$;$) {
2195 if (@_ >= 3) {
2196 $DB->{$_[0]}{$_[1]} = $_[2];
2197 } else {
2198 $DB->{$_[0]} = $_[1];
2199 }
2200 db_dirty;
2201 }
2202
2203 cf::global->attach (
2204 prio => 10000,
2205 on_cleanup => sub {
2206 db_sync;
2207 }, 2229 }
2208 ); 2230 }
2231}
2232
2233sub db_get($$) {
2234 my $key = "$_[0]/$_[1]";
2235
2236 cf::sync_job {
2237 BDB::db_get $DB, undef, $key, my $data;
2238
2239 $! ? ()
2240 : Compress::LZF::sthaw $data
2241 }
2242}
2243
2244sub db_put($$$) {
2245 BDB::dbreq_pri 4;
2246 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2209} 2247}
2210 2248
2211############################################################################# 2249#############################################################################
2212# the server's main() 2250# the server's init and main functions
2251
2252sub load_resources {
2253 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2254 or die "unable to load regions file\n";#d#
2255}
2213 2256
2214sub cfg_load { 2257sub cfg_load {
2215 open my $fh, "<:utf8", cf::confdir . "/config" 2258 open my $fh, "<:utf8", cf::confdir . "/config"
2216 or return; 2259 or return;
2217 2260
… …
2228 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2229 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
2230 }; 2273 };
2231 warn $@ if $@; 2274 warn $@ if $@;
2232 } 2275 }
2276}
2277
2278sub init {
2279 load_resources;
2233} 2280}
2234 2281
2235sub main { 2282sub main {
2236 # we must not ever block the main coroutine 2283 # we must not ever block the main coroutine
2237 local $Coro::idle = sub { 2284 local $Coro::idle = sub {
… …
2254 2301
2255# install some emergency cleanup handlers 2302# install some emergency cleanup handlers
2256BEGIN { 2303BEGIN {
2257 for my $signal (qw(INT HUP TERM)) { 2304 for my $signal (qw(INT HUP TERM)) {
2258 Event->signal ( 2305 Event->signal (
2306 reentrant => 0,
2259 data => WF_AUTOCANCEL, 2307 data => WF_AUTOCANCEL,
2260 signal => $signal, 2308 signal => $signal,
2309 prio => 0,
2261 cb => sub { 2310 cb => sub {
2262 cf::cleanup "SIG$signal"; 2311 cf::cleanup "SIG$signal";
2263 }, 2312 },
2264 ); 2313 );
2265 } 2314 }
2266} 2315}
… …
2287 my $map = $cf::MAP{$path} or next; 2336 my $map = $cf::MAP{$path} or next;
2288 $map->valid or next; 2337 $map->valid or next;
2289 $map->save; 2338 $map->save;
2290 } 2339 }
2291 warn "end emergency map save\n"; 2340 warn "end emergency map save\n";
2341
2342 warn "begin emergency database checkpoint\n";
2343 BDB::db_env_txn_checkpoint $DB_ENV;
2344 warn "end emergency database checkpoint\n";
2292 }; 2345 };
2293 2346
2294 warn "leave emergency perl save\n"; 2347 warn "leave emergency perl save\n";
2295} 2348}
2296 2349
… …
2309 cf::emergency_save; 2362 cf::emergency_save;
2310 2363
2311 eval { 2364 eval {
2312 # if anything goes wrong in here, we should simply crash as we already saved 2365 # if anything goes wrong in here, we should simply crash as we already saved
2313 2366
2314 warn "syncing database to disk";
2315 cf::db_sync;
2316
2317 warn "cancelling all WF_AUTOCANCEL watchers"; 2367 warn "cancelling all WF_AUTOCANCEL watchers";
2318 for (Event::all_watchers) { 2368 for (Event::all_watchers) {
2319 $_->cancel if $_->data & WF_AUTOCANCEL; 2369 $_->cancel if $_->data & WF_AUTOCANCEL;
2320 } 2370 }
2321 2371
2372 warn "syncing database to disk";
2373 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2374
2322 warn "flushing outstanding aio requests"; 2375 warn "flushing outstanding aio requests";
2323 for (;;) { 2376 for (;;) {
2377 BDB::flush;
2324 IO::AIO::flush; 2378 IO::AIO::flush;
2325 Coro::cede; 2379 Coro::cede;
2326 last unless IO::AIO::nreqs; 2380 last unless IO::AIO::nreqs || BDB::nreqs;
2327 warn "iterate..."; 2381 warn "iterate...";
2328 } 2382 }
2329 2383
2330 warn "cancelling all extension coros"; 2384 warn "cancelling all extension coros";
2331 $_->cancel for values %EXT_CORO; 2385 $_->cancel for values %EXT_CORO;
… …
2396 warn "reattaching attachments to objects/players"; 2450 warn "reattaching attachments to objects/players";
2397 _global_reattach; 2451 _global_reattach;
2398 warn "reattaching attachments to maps"; 2452 warn "reattaching attachments to maps";
2399 reattach $_ for values %MAP; 2453 reattach $_ for values %MAP;
2400 2454
2455 warn "loading reloadable resources";
2456 load_resources;
2457
2401 warn "restarting server ticker"; 2458 warn "restarting server ticker";
2402 2459
2403 $TICK_WATCHER->start; 2460 $TICK_WATCHER->start;
2404 }; 2461 };
2405 2462
… …
2421 $who->message ("reloading server."); 2478 $who->message ("reloading server.");
2422 2479
2423 # doing reload synchronously and two reloads happen back-to-back, 2480 # doing reload synchronously and two reloads happen back-to-back,
2424 # coro crashes during coro_state_free->destroy here. 2481 # coro crashes during coro_state_free->destroy here.
2425 2482
2426 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2483 $RELOAD_WATCHER ||= Event->timer (
2484 reentrant => 0,
2485 after => 0,
2486 data => WF_AUTOCANCEL,
2487 cb => sub {
2427 reload; 2488 reload;
2428 undef $RELOAD_WATCHER; 2489 undef $RELOAD_WATCHER;
2490 },
2429 }); 2491 );
2430 } 2492 }
2431}; 2493};
2432 2494
2433unshift @INC, $LIBDIR; 2495unshift @INC, $LIBDIR;
2434 2496
… …
2454 $NEXT_TICK += $TICK; 2516 $NEXT_TICK += $TICK;
2455 2517
2456 $WAIT_FOR_TICK->broadcast; 2518 $WAIT_FOR_TICK->broadcast;
2457 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2519 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2458 2520
2521 Event::sweep;
2522 Coro::cede_notself;
2523
2524# my $AFTER = Event::time;
2525# warn $AFTER - $NOW;#d#
2526
2459 # if we are delayed by four ticks or more, skip them all 2527 # if we are delayed by four ticks or more, skip them all
2460 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2528 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2461 2529
2462 $TICK_WATCHER->at ($NEXT_TICK); 2530 $TICK_WATCHER->at ($NEXT_TICK);
2463 $TICK_WATCHER->start; 2531 $TICK_WATCHER->start;
2464 }, 2532 },
2465); 2533);
2466 2534
2535{
2536 BDB::max_poll_time $TICK * 0.1;
2537 $BDB_POLL_WATCHER = Event->io (
2538 reentrant => 0,
2539 fd => BDB::poll_fileno,
2540 poll => 'r',
2541 prio => 0,
2542 data => WF_AUTOCANCEL,
2543 cb => \&BDB::poll_cb,
2544 );
2545 BDB::min_parallel 8;
2546
2547 BDB::set_sync_prepare {
2548 my $status;
2549 my $current = $Coro::current;
2550 (
2551 sub {
2552 $status = $!;
2553 $current->ready; undef $current;
2554 },
2555 sub {
2556 Coro::schedule while defined $current;
2557 $! = $status;
2558 },
2559 )
2560 };
2561
2562 unless ($DB_ENV) {
2563 $DB_ENV = BDB::db_env_create;
2564
2565 cf::sync_job {
2566 eval {
2567 BDB::db_env_open
2568 $DB_ENV,
2569 $BDB_ENV_DIR,
2570 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2571 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2572 0666;
2573
2574 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2575
2576 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2577 $DB_ENV->set_lk_detect;
2578 };
2579
2580 cf::cleanup "db_env_open(db): $@" if $@;
2581 };
2582 }
2583}
2584
2585{
2586 IO::AIO::min_parallel 8;
2587
2588 undef $Coro::AIO::WATCHER;
2467IO::AIO::max_poll_time $TICK * 0.2; 2589 IO::AIO::max_poll_time $TICK * 0.1;
2468
2469$AIO_POLL_WATCHER = Event->io ( 2590 $AIO_POLL_WATCHER = Event->io (
2591 reentrant => 0,
2470 fd => IO::AIO::poll_fileno, 2592 fd => IO::AIO::poll_fileno,
2471 poll => 'r', 2593 poll => 'r',
2472 prio => 5, 2594 prio => 6,
2473 data => WF_AUTOCANCEL, 2595 data => WF_AUTOCANCEL,
2474 cb => \&IO::AIO::poll_cb, 2596 cb => \&IO::AIO::poll_cb,
2475); 2597 );
2598}
2476 2599
2477$WRITE_RUNTIME_WATCHER = Event->timer ( 2600$WRITE_RUNTIME_WATCHER = Event->timer (
2601 reentrant => 0,
2478 data => WF_AUTOCANCEL, 2602 data => WF_AUTOCANCEL,
2479 after => 1, 2603 after => 1,
2480 interval => 10, 2604 interval => 10,
2605 prio => 6, # keep it lowest so it acts like a watchdog
2481 cb => Coro::unblock_sub { 2606 cb => Coro::unblock_sub {
2482 write_runtime 2607 write_runtime
2483 or warn "ERROR: unable to write runtime file: $!"; 2608 or warn "ERROR: unable to write runtime file: $!";
2484 }, 2609 },
2485); 2610);
2486 2611

Diff Legend

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