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.186 by root, Sat Jan 20 01:12:39 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
… …
356 # 60 allows for the watchdog to kill the server. 368 # 60 allows for the watchdog to kill the server.
357 369
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 370 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 371 and return;
360 372
373 # always fsync - this file is important
361 aio_fsync $fh 374 aio_fsync $fh
362 and return; 375 and return;
363 376
364 close $fh 377 close $fh
365 or return; 378 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 763 $filename, length $$rdata, scalar @$objs;
751 764
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 766 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 767 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 768 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 769 close $fh;
757 770
758 if (@$objs) { 771 if (@$objs) {
759 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) {
760 chmod SAVE_MODE, $fh; 773 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 774 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 775 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 776 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 777 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 778 aio_rename "$filename.pst~", "$filename.pst";
766 } 779 }
767 } else { 780 } else {
768 aio_unlink "$filename.pst"; 781 aio_unlink "$filename.pst";
… …
774 } 787 }
775 } else { 788 } else {
776 aio_unlink $filename; 789 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 790 aio_unlink "$filename.pst";
778 } 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 }
779 } 798 }
780} 799}
781 800
782sub object_freezer_as_string { 801sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 802 my ($rdata, $objs) = @_;
… …
789 808
790sub object_thawer_load { 809sub object_thawer_load {
791 my ($filename) = @_; 810 my ($filename) = @_;
792 811
793 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$//;
794 816
795 (aio_load $filename, $data) >= 0 817 (aio_load $filename, $data) >= 0
796 or return; 818 or return;
797 819
798 unless (aio_stat "$filename.pst") { 820 unless (aio_stat "$filename.pst") {
… …
1068=cut 1090=cut
1069 1091
1070sub maps($) { 1092sub maps($) {
1071 my ($pl) = @_; 1093 my ($pl) = @_;
1072 1094
1095 $pl = ref $pl ? $pl->ob->name : $pl;
1096
1073 my $files = aio_readdir playerdir $pl 1097 my $files = aio_readdir playerdir $pl
1074 or return; 1098 or return;
1075 1099
1076 my @paths; 1100 my @paths;
1077 1101
1078 for (@$files) { 1102 for (@$files) {
1079 utf8::decode $_; 1103 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1104 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1105 next unless /^$PATH_SEP/o;
1082 1106
1083 s/\.map$//; 1107 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1108 }
1086 1109
1087 \@paths 1110 \@paths
1088} 1111}
1089 1112
… …
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1163 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}), $rmp->{custom} 1164 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 ) 1165 )
1143} 1166}
1144 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
1145sub register { 1176sub register {
1146 my (undef, $regex) = @_; 1177 my (undef, $regex, $prio) = @_;
1147 my $pkg = caller; 1178 my $pkg = caller;
1148 1179
1149 no strict; 1180 no strict;
1150 push @{"$pkg\::ISA"}, __PACKAGE__; 1181 push @{"$pkg\::ISA"}, __PACKAGE__;
1151 1182
1152 $EXT_MAP{$pkg} = qr<$regex>; 1183 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1153} 1184}
1154 1185
1155# also paths starting with '/' 1186# also paths starting with '/'
1156$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1187$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1157 1188
1158sub thawer_merge { 1189sub thawer_merge {
1159 my ($self, $merge) = @_; 1190 my ($self, $merge) = @_;
1160 1191
1161 # we have to keep some variables in memory intact 1192 # we have to keep some variables in memory intact
… …
1167 $self->SUPER::thawer_merge ($merge); 1198 $self->SUPER::thawer_merge ($merge);
1168} 1199}
1169 1200
1170sub normalise { 1201sub normalise {
1171 my ($path, $base) = @_; 1202 my ($path, $base) = @_;
1203
1204 $path = "$path"; # make sure its a string
1205
1206 $path =~ s/\.map$//;
1172 1207
1173 # map plan: 1208 # map plan:
1174 # 1209 #
1175 # /! non-realised random map exit (special hack!) 1210 # /! non-realised random map exit (special hack!)
1176 # {... are special paths that are not being touched 1211 # {... are special paths that are not being touched
… …
1204 1239
1205 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
1206 1241
1207 $path = normalise $path, $base; 1242 $path = normalise $path, $base;
1208 1243
1209 for my $pkg (keys %EXT_MAP) { 1244 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1210 if ($path =~ $EXT_MAP{$pkg}) { 1245 if ($path =~ $EXT_MAP{$pkg}[1]) {
1211 my $self = bless cf::map::new, $pkg; 1246 my $self = bless cf::map::new, $pkg;
1212 $self->{path} = $path; $self->path ($path); 1247 $self->{path} = $path; $self->path ($path);
1213 $self->init; # pass $1 etc. 1248 $self->init; # pass $1 etc.
1214 return $self; 1249 return $self;
1215 } 1250 }
1216 } 1251 }
1217 1252
1218 Carp::carp "unable to resolve path '$path'."; 1253 Carp::carp "unable to resolve path '$path' (base '$base').";
1219 () 1254 ()
1220} 1255}
1221 1256
1222sub init { 1257sub init {
1223 my ($self) = @_; 1258 my ($self) = @_;
… …
1238 1273
1239# the original (read-only) location 1274# the original (read-only) location
1240sub load_path { 1275sub load_path {
1241 my ($self) = @_; 1276 my ($self) = @_;
1242 1277
1243 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1278 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1244} 1279}
1245 1280
1246# the temporary/swap location 1281# the temporary/swap location
1247sub save_path { 1282sub save_path {
1248 my ($self) = @_; 1283 my ($self) = @_;
1249 1284
1250 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1285 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1251 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1286 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1252} 1287}
1253 1288
1254# the unique path, undef == no special unique path 1289# the unique path, undef == no special unique path
1255sub uniq_path { 1290sub uniq_path {
1256 my ($self) = @_; 1291 my ($self) = @_;
… …
1272 my ($self) = @_; 1307 my ($self) = @_;
1273 1308
1274 utf8::encode (my $save = $self->save_path); 1309 utf8::encode (my $save = $self->save_path);
1275 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1310 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1276 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#
1277} 1317}
1278 1318
1279sub load_header_from($) { 1319sub load_header_from($) {
1280 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1281 1321
1282 utf8::encode $path; 1322 utf8::encode $path;
1283 aio_open $path, O_RDONLY, 0 1323 #aio_open $path, O_RDONLY, 0
1284 or return; 1324 # or return;
1285 1325
1286 $self->_load_header ($path) 1326 $self->_load_header ($path)
1287 or return; 1327 or return;
1288 1328
1289 $self->{load_path} = $path; 1329 $self->{load_path} = $path;
1290 1330
1291 1 1331 1
1292} 1332}
1293 1333
1294sub load_orig { 1334sub load_header_orig {
1295 my ($self) = @_; 1335 my ($self) = @_;
1296 1336
1297 $self->load_header_from ($self->load_path) 1337 $self->load_header_from ($self->load_path)
1298} 1338}
1299 1339
1300sub load_temp { 1340sub load_header_temp {
1301 my ($self) = @_; 1341 my ($self) = @_;
1302 1342
1303 $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;
1304} 1363}
1305 1364
1306sub load_header { 1365sub load_header {
1307 my ($self) = @_; 1366 my ($self) = @_;
1308 1367
1309 if ($self->load_temp) { 1368 if ($self->load_header_temp) {
1310 $self->last_access ((delete $self->{last_access}) 1369 $self->prepare_temp;
1311 || $cf::RUNTIME); #d#
1312 # safety
1313 $self->{instantiate_time} = $cf::RUNTIME
1314 if $self->{instantiate_time} > $cf::RUNTIME;
1315 } else { 1370 } else {
1316 $self->load_orig 1371 $self->load_header_orig
1317 or return; 1372 or return;
1318 1373 $self->prepare_orig;
1319 $self->{load_original} = 1;
1320 $self->{instantiate_time} = $cf::RUNTIME;
1321 $self->last_access ($cf::RUNTIME);
1322 $self->instantiate;
1323 } 1374 }
1324 1375
1325 1 1376 1
1326} 1377}
1327 1378
… …
1341 $map->{last_save} = $cf::RUNTIME; 1392 $map->{last_save} = $cf::RUNTIME;
1342 1393
1343 $map->load_header 1394 $map->load_header
1344 or return; 1395 or return;
1345 1396
1346 if ($map->should_reset) { 1397 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1347 # doing this can freeze the server in a sync job, obviously 1398 # doing this can freeze the server in a sync job, obviously
1348 #$cf::WAIT_FOR_TICK->wait; 1399 #$cf::WAIT_FOR_TICK->wait;
1349 $map->reset; 1400 $map->reset;
1350 undef $guard; 1401 undef $guard;
1351 $map = find $path 1402 return find $path;
1352 or return;
1353 } 1403 }
1354 1404
1355 $cf::MAP{$path} = $map 1405 $cf::MAP{$path} = $map
1356 } 1406 }
1357} 1407}
1408
1409sub pre_load { }
1410sub post_load { }
1358 1411
1359sub load { 1412sub load {
1360 my ($self) = @_; 1413 my ($self) = @_;
1361 1414
1415 local $self->{deny_reset} = 1; # loading can take a long time
1416
1362 my $path = $self->{path}; 1417 my $path = $self->{path};
1363 my $guard = cf::lock_acquire "map_load:$path"; 1418 my $guard = cf::lock_acquire "map_load:$path";
1364 1419
1365 return if $self->in_memory != cf::MAP_SWAPPED; 1420 return if $self->in_memory != cf::MAP_SWAPPED;
1366 1421
1367 $self->in_memory (cf::MAP_LOADING); 1422 $self->in_memory (cf::MAP_LOADING);
1368 1423
1369 $self->alloc; 1424 $self->alloc;
1425
1426 $self->pre_load;
1427
1370 $self->_load_objects ($self->{load_path}, 1) 1428 $self->_load_objects ($self->{load_path}, 1)
1371 or return; 1429 or return;
1372 1430
1373 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1374 if delete $self->{load_original}; 1432 if delete $self->{load_original};
… …
1396 unless $self->difficulty; 1454 unless $self->difficulty;
1397 Coro::cede; 1455 Coro::cede;
1398 $self->activate; 1456 $self->activate;
1399 } 1457 }
1400 1458
1459 $self->post_load;
1460
1401 $self->in_memory (cf::MAP_IN_MEMORY); 1461 $self->in_memory (cf::MAP_IN_MEMORY);
1402} 1462}
1403 1463
1404sub customise_for { 1464sub customise_for {
1405 my ($self, $ob) = @_; 1465 my ($self, $ob) = @_;
… …
1469 delete $MAP_PREFETCH{$path}; 1529 delete $MAP_PREFETCH{$path};
1470 } 1530 }
1471 } 1531 }
1472 undef $MAP_PREFETCHER; 1532 undef $MAP_PREFETCHER;
1473 }; 1533 };
1534 $MAP_PREFETCHER->prio (6);
1474 1535
1475 () 1536 ()
1476} 1537}
1477 1538
1478sub save { 1539sub save {
… …
1548 return if $self->players; 1609 return if $self->players;
1549 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1550 1611
1551 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1552 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
1553 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1554 1625
1555 $self->in_memory (cf::MAP_SWAPPED);
1556 $self->clear; 1626 $self->clear;
1557 1627
1558 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1559 1629
1560 $self->unlink_save; 1630 $self->unlink_save;
… …
1597 for (@$files) { 1667 for (@$files) {
1598 utf8::decode $_; 1668 utf8::decode $_;
1599 next if /\.pst$/; 1669 next if /\.pst$/;
1600 next unless /^$PATH_SEP/o; 1670 next unless /^$PATH_SEP/o;
1601 1671
1602 s/\.map$//; 1672 push @paths, cf::map::normalise $_;
1603 push @paths, $_;
1604 } 1673 }
1605 1674
1606 \@paths 1675 \@paths
1607} 1676}
1608 1677
… …
1702=cut 1771=cut
1703 1772
1704sub link_map { 1773sub link_map {
1705 unless ($LINK_MAP) { 1774 unless ($LINK_MAP) {
1706 $LINK_MAP = cf::map::find "{link}" 1775 $LINK_MAP = cf::map::find "{link}"
1707 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1776 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1708 $LINK_MAP->load; 1777 $LINK_MAP->load;
1709 } 1778 }
1710 1779
1711 $LINK_MAP 1780 $LINK_MAP
1712} 1781}
… …
1719 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1788 return if UNIVERSAL::isa $self->map, "ext::map_link";
1720 1789
1721 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1722 if $self->map; 1791 if $self->map;
1723 1792
1724 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1793 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1725} 1794}
1726 1795
1727sub cf::object::player::leave_link { 1796sub cf::object::player::leave_link {
1728 my ($self, $map, $x, $y) = @_; 1797 my ($self, $map, $x, $y) = @_;
1729 1798
… …
1796 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1797 1866
1798 $self->enter_link; 1867 $self->enter_link;
1799 1868
1800 (async { 1869 (async {
1870 my $map = eval {
1801 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1802 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1803 1873 $map
1804# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1805# if $map;
1806
1807 $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);
1808 1876
1809 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1810 })->prio (1); 1878 })->prio (1);
1811} 1879}
1812 1880
… …
1843 # that depends on the exit object 1911 # that depends on the exit object
1844 1912
1845 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1846 1914
1847 if ($exit->map) { 1915 if ($exit->map) {
1848 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1849 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1850 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1851 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1852 } 1920 }
1853 1921
… …
1870sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1871 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1872 1940
1873 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1874 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
1875 $self->enter_link; 1952 $self->enter_link;
1876 1953
1877 (async { 1954 (async {
1878 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1879 unless (eval { 1956 unless (eval {
1880 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1881 if $exit->slaying eq "/!";
1882
1883 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1884 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1885 1958
1886 1; 1959 1;
1887 }) { 1960 }) {
1888 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1889 . "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. "
… …
1950 # get handled first 2023 # get handled first
1951 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1952 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
1953 2026
1954 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1955 2029
1956 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1957 2031
1958 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1959 if (@$queue) { 2033 if (@$queue) {
… …
2120The 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
2121using it, it should be unique. 2195using it, it should be unique.
2122 2196
2123=over 4 2197=over 4
2124 2198
2125=item $hashref = cf::db_get $family
2126
2127Return a hashref for use by the extension C<$family>, which can be
2128modified. After modifications, you have to call C<cf::db_dirty> or
2129C<cf::db_sync>.
2130
2131=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2132 2200
2133Returns a single value from the database 2201Returns a single value from the database.
2134
2135=item cf::db_put $family => $hashref
2136
2137Stores the given family hashref into the database. Updates are delayed, if
2138you want the data to be synced to disk immediately, use C<cf::db_sync>.
2139 2202
2140=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2141 2204
2142Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2143want the data to be synced to disk immediately, use C<cf::db_sync>.
2144
2145=item cf::db_dirty
2146
2147Marks the database as dirty, to be updated at a later time.
2148
2149=item cf::db_sync
2150
2151Immediately write the database to disk I<if it is dirty>.
2152 2206
2153=cut 2207=cut
2154 2208
2155our $DB; 2209our $DB;
2156 2210
2157{ 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
2158 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;
2159 2230
2160 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2161 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2162 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2163 2235
2164 my $pid; 2236 unlink $path;
2165
2166 sub db_save() {
2167 waitpid $pid, 0 if $pid;
2168 if (0 == ($pid = fork)) {
2169 $DB->{_meta}{version} = 1;
2170 Storable::nstore $DB, "$path~";
2171 rename "$path~", $path;
2172 cf::_exit 0 if defined $pid;
2173 } 2237 };
2174 }
2175
2176 my $dirty;
2177
2178 sub db_sync() {
2179 db_save if $dirty;
2180 undef $dirty;
2181 }
2182
2183 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2184 db_sync;
2185 });
2186
2187 sub db_dirty() {
2188 $dirty = 1;
2189 $idle->start;
2190 }
2191
2192 sub db_get($;$) {
2193 @_ >= 2
2194 ? $DB->{$_[0]}{$_[1]}
2195 : ($DB->{$_[0]} ||= { })
2196 }
2197
2198 sub db_put($$;$) {
2199 if (@_ >= 3) {
2200 $DB->{$_[0]}{$_[1]} = $_[2];
2201 } else {
2202 $DB->{$_[0]} = $_[1];
2203 }
2204 db_dirty;
2205 }
2206
2207 cf::global->attach (
2208 prio => 10000,
2209 on_cleanup => sub {
2210 db_sync;
2211 }, 2238 }
2212 ); 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 { };
2213} 2256}
2214 2257
2215############################################################################# 2258#############################################################################
2216# 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}
2217 2265
2218sub cfg_load { 2266sub cfg_load {
2219 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2220 or return; 2268 or return;
2221 2269
… …
2232 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2233 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2234 }; 2282 };
2235 warn $@ if $@; 2283 warn $@ if $@;
2236 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2237} 2289}
2238 2290
2239sub main { 2291sub main {
2240 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2241 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2244 Event::one_event; 2296 Event::one_event;
2245 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2246 }; 2298 };
2247 2299
2248 cfg_load; 2300 cfg_load;
2249 db_load; 2301 db_init;
2250 load_extensions; 2302 load_extensions;
2251 2303
2252 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2305 $WRITE_RUNTIME_WATCHER->start;
2253 Event::loop; 2306 Event::loop;
2254} 2307}
2255 2308
2256############################################################################# 2309#############################################################################
2257# initialisation and cleanup 2310# initialisation and cleanup
2258 2311
2259# install some emergency cleanup handlers 2312# install some emergency cleanup handlers
2260BEGIN { 2313BEGIN {
2261 for my $signal (qw(INT HUP TERM)) { 2314 for my $signal (qw(INT HUP TERM)) {
2262 Event->signal ( 2315 Event->signal (
2316 reentrant => 0,
2263 data => WF_AUTOCANCEL, 2317 data => WF_AUTOCANCEL,
2264 signal => $signal, 2318 signal => $signal,
2319 prio => 0,
2265 cb => sub { 2320 cb => sub {
2266 cf::cleanup "SIG$signal"; 2321 cf::cleanup "SIG$signal";
2267 }, 2322 },
2268 ); 2323 );
2269 } 2324 }
2270} 2325}
… …
2291 my $map = $cf::MAP{$path} or next; 2346 my $map = $cf::MAP{$path} or next;
2292 $map->valid or next; 2347 $map->valid or next;
2293 $map->save; 2348 $map->save;
2294 } 2349 }
2295 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";
2296 }; 2355 };
2297 2356
2298 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;
2299} 2365}
2300 2366
2301sub reload() { 2367sub reload() {
2302 # can/must only be called in main 2368 # can/must only be called in main
2303 if ($Coro::current != $Coro::main) { 2369 if ($Coro::current != $Coro::main) {
… …
2305 return; 2371 return;
2306 } 2372 }
2307 2373
2308 warn "reloading..."; 2374 warn "reloading...";
2309 2375
2310 warn "cancelling server ticker"; 2376 warn "entering sync_job";
2311 $TICK_WATCHER->cancel;
2312 2377
2378 cf::sync_job {
2379 cf::write_runtime;
2313 cf::emergency_save; 2380 cf::emergency_save;
2381 cf::write_runtime;
2314 2382
2315 eval { 2383 warn "syncing database to disk";
2384 BDB::db_env_txn_checkpoint $DB_ENV;
2385
2316 # 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
2317
2318 warn "syncing database to disk";
2319 cf::db_sync;
2320 2387
2321 warn "cancelling all WF_AUTOCANCEL watchers"; 2388 warn "cancelling all WF_AUTOCANCEL watchers";
2322 for (Event::all_watchers) { 2389 for (Event::all_watchers) {
2323 $_->cancel if $_->data & WF_AUTOCANCEL; 2390 $_->cancel if $_->data & WF_AUTOCANCEL;
2324 } 2391 }
2325 2392
2326 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2327 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2328 IO::AIO::flush; 2396 IO::AIO::flush;
2329 Coro::cede; 2397 Coro::cede;
2330 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2331 warn "iterate..."; 2399 warn "iterate...";
2332 } 2400 }
2333 2401
2334 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2335 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2390 require cf; 2458 require cf;
2391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2392 2460
2393 warn "loading config and database again"; 2461 warn "loading config and database again";
2394 cf::cfg_load; 2462 cf::cfg_load;
2395 cf::db_load;
2396 2463
2397 warn "loading extensions"; 2464 warn "loading extensions";
2398 cf::load_extensions; 2465 cf::load_extensions;
2399 2466
2400 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2401 _global_reattach; 2468 _global_reattach;
2402 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2403 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2404 2471
2405 warn "restarting server ticker"; 2472 warn "loading reloadable resources";
2473 load_resources;
2406 2474
2407 $TICK_WATCHER->start; 2475 warn "leaving sync_job";
2408 };
2409 2476
2410 if ($@) { 2477 1
2478 } or do {
2411 warn $@; 2479 warn $@;
2412 warn "error while reloading, exiting."; 2480 warn "error while reloading, exiting.";
2413 exit 1; 2481 exit 1;
2414 } 2482 };
2415 2483
2416 warn "reloaded"; 2484 warn "reloaded";
2417}; 2485};
2418 2486
2419our $RELOAD_WATCHER; # used only during reload 2487our $RELOAD_WATCHER; # used only during reload
… …
2425 $who->message ("reloading server."); 2493 $who->message ("reloading server.");
2426 2494
2427 # doing reload synchronously and two reloads happen back-to-back, 2495 # doing reload synchronously and two reloads happen back-to-back,
2428 # coro crashes during coro_state_free->destroy here. 2496 # coro crashes during coro_state_free->destroy here.
2429 2497
2430 $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 {
2431 reload; 2503 reload;
2432 undef $RELOAD_WATCHER; 2504 undef $RELOAD_WATCHER;
2505 },
2433 }); 2506 );
2434 } 2507 }
2435}; 2508};
2436 2509
2437unshift @INC, $LIBDIR; 2510unshift @INC, $LIBDIR;
2438 2511
… …
2458 $NEXT_TICK += $TICK; 2531 $NEXT_TICK += $TICK;
2459 2532
2460 $WAIT_FOR_TICK->broadcast; 2533 $WAIT_FOR_TICK->broadcast;
2461 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2534 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2462 2535
2536# my $AFTER = Event::time;
2537# warn $AFTER - $NOW;#d#
2538
2463 # 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
2464 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2540 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2465 2541
2466 $TICK_WATCHER->at ($NEXT_TICK); 2542 $TICK_WATCHER->at ($NEXT_TICK);
2467 $TICK_WATCHER->start; 2543 $TICK_WATCHER->start;
2468 }, 2544 },
2469); 2545);
2470 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;
2471IO::AIO::max_poll_time $TICK * 0.2; 2601 IO::AIO::max_poll_time $TICK * 0.1;
2472
2473$AIO_POLL_WATCHER = Event->io ( 2602 $AIO_POLL_WATCHER = Event->io (
2603 reentrant => 0,
2474 fd => IO::AIO::poll_fileno, 2604 fd => IO::AIO::poll_fileno,
2475 poll => 'r', 2605 poll => 'r',
2476 prio => 5, 2606 prio => 6,
2477 data => WF_AUTOCANCEL, 2607 data => WF_AUTOCANCEL,
2478 cb => \&IO::AIO::poll_cb, 2608 cb => \&IO::AIO::poll_cb,
2479); 2609 );
2610}
2480 2611
2481$WRITE_RUNTIME_WATCHER = Event->timer ( 2612$WRITE_RUNTIME_WATCHER = Event->timer (
2613 reentrant => 0,
2482 data => WF_AUTOCANCEL, 2614 data => WF_AUTOCANCEL,
2615 parked => 1,
2483 after => 1, 2616 after => 1,
2484 interval => 10, 2617 interval => 10,
2485 prio => 6, # keep it lowest so it acts like a watchdog 2618 prio => 6, # keep it lowest so it acts like a watchdog
2486 cb => Coro::unblock_sub { 2619 cb => sub {
2620 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
2621
2622 Coro::async_pool {
2487 write_runtime 2623 write_runtime
2488 or warn "ERROR: unable to write runtime file: $!"; 2624 or warn "ERROR: unable to write runtime file: $!";
2625 };
2489 }, 2626 },
2490); 2627);
2491 2628
2492END { cf::emergency_save } 2629END { cf::emergency_save }
2493 2630

Diff Legend

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