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.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.215 by root, Thu Feb 15 03:19:02 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
… …
45our $LIBDIR = datadir . "/ext"; 49our $LIBDIR = datadir . "/ext";
46 50
47our $TICK = MAX_TIME * 1e-6; 51our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 52our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 53our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
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
… …
261sub freeze_mainloop { 273sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 274 return unless $TICK_WATCHER->is_active;
263 275
264 my $guard = Coro::guard { 276 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 277 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 278 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 279 $TICK_WATCHER->stop;
270 $guard 280 $guard
271} 281}
272 282
273=item cf::async { BLOCK } 283=item cf::async { BLOCK }
… …
356 # 60 allows for the watchdog to kill the server. 366 # 60 allows for the watchdog to kill the server.
357 367
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 368 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 369 and return;
360 370
371 # always fsync - this file is important
361 aio_fsync $fh 372 aio_fsync $fh
362 and return; 373 and return;
363 374
364 close $fh 375 close $fh
365 or return; 376 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 761 $filename, length $$rdata, scalar @$objs;
751 762
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 763 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 764 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 765 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 766 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 767 close $fh;
757 768
758 if (@$objs) { 769 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 770 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 771 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 772 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 773 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 774 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 775 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 776 aio_rename "$filename.pst~", "$filename.pst";
766 } 777 }
767 } else { 778 } else {
768 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
… …
774 } 785 }
775 } else { 786 } else {
776 aio_unlink $filename; 787 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 788 aio_unlink "$filename.pst";
778 } 789 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
779 } 796 }
780} 797}
781 798
782sub object_freezer_as_string { 799sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 800 my ($rdata, $objs) = @_;
… …
789 806
790sub object_thawer_load { 807sub object_thawer_load {
791 my ($filename) = @_; 808 my ($filename) = @_;
792 809
793 my ($data, $av); 810 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
794 814
795 (aio_load $filename, $data) >= 0 815 (aio_load $filename, $data) >= 0
796 or return; 816 or return;
797 817
798 unless (aio_stat "$filename.pst") { 818 unless (aio_stat "$filename.pst") {
… …
1068=cut 1088=cut
1069 1089
1070sub maps($) { 1090sub maps($) {
1071 my ($pl) = @_; 1091 my ($pl) = @_;
1072 1092
1093 $pl = ref $pl ? $pl->ob->name : $pl;
1094
1073 my $files = aio_readdir playerdir $pl 1095 my $files = aio_readdir playerdir $pl
1074 or return; 1096 or return;
1075 1097
1076 my @paths; 1098 my @paths;
1077 1099
1078 for (@$files) { 1100 for (@$files) {
1079 utf8::decode $_; 1101 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1102 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1103 next unless /^$PATH_SEP/o;
1082 1104
1083 s/\.map$//; 1105 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1106 }
1086 1107
1087 \@paths 1108 \@paths
1088} 1109}
1089 1110
… …
1176} 1197}
1177 1198
1178sub normalise { 1199sub normalise {
1179 my ($path, $base) = @_; 1200 my ($path, $base) = @_;
1180 1201
1202 $path = "$path"; # make sure its a string
1203
1204 $path =~ s/\.map$//;
1205
1181 # map plan: 1206 # map plan:
1182 # 1207 #
1183 # /! non-realised random map exit (special hack!) 1208 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1209 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1210 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1246 $self->init; # pass $1 etc.
1222 return $self; 1247 return $self;
1223 } 1248 }
1224 } 1249 }
1225 1250
1226 Carp::carp "unable to resolve path '$path'."; 1251 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1252 ()
1228} 1253}
1229 1254
1230sub init { 1255sub init {
1231 my ($self) = @_; 1256 my ($self) = @_;
… …
1246 1271
1247# the original (read-only) location 1272# the original (read-only) location
1248sub load_path { 1273sub load_path {
1249 my ($self) = @_; 1274 my ($self) = @_;
1250 1275
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1277}
1253 1278
1254# the temporary/swap location 1279# the temporary/swap location
1255sub save_path { 1280sub save_path {
1256 my ($self) = @_; 1281 my ($self) = @_;
1257 1282
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1285}
1261 1286
1262# the unique path, undef == no special unique path 1287# the unique path, undef == no special unique path
1263sub uniq_path { 1288sub uniq_path {
1264 my ($self) = @_; 1289 my ($self) = @_;
… …
1280 my ($self) = @_; 1305 my ($self) = @_;
1281 1306
1282 utf8::encode (my $save = $self->save_path); 1307 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1315}
1286 1316
1287sub load_header_from($) { 1317sub load_header_from($) {
1288 my ($self, $path) = @_; 1318 my ($self, $path) = @_;
1289 1319
1290 utf8::encode $path; 1320 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1321 #aio_open $path, O_RDONLY, 0
1292 or return; 1322 # or return;
1293 1323
1294 $self->_load_header ($path) 1324 $self->_load_header ($path)
1295 or return; 1325 or return;
1296 1326
1297 $self->{load_path} = $path; 1327 $self->{load_path} = $path;
1298 1328
1299 1 1329 1
1300} 1330}
1301 1331
1302sub load_orig { 1332sub load_header_orig {
1303 my ($self) = @_; 1333 my ($self) = @_;
1304 1334
1305 $self->load_header_from ($self->load_path) 1335 $self->load_header_from ($self->load_path)
1306} 1336}
1307 1337
1308sub load_temp { 1338sub load_header_temp {
1309 my ($self) = @_; 1339 my ($self) = @_;
1310 1340
1311 $self->load_header_from ($self->save_path) 1341 $self->load_header_from ($self->save_path)
1342}
1343
1344sub prepare_temp {
1345 my ($self) = @_;
1346
1347 $self->last_access ((delete $self->{last_access})
1348 || $cf::RUNTIME); #d#
1349 # safety
1350 $self->{instantiate_time} = $cf::RUNTIME
1351 if $self->{instantiate_time} > $cf::RUNTIME;
1352}
1353
1354sub prepare_orig {
1355 my ($self) = @_;
1356
1357 $self->{load_original} = 1;
1358 $self->{instantiate_time} = $cf::RUNTIME;
1359 $self->last_access ($cf::RUNTIME);
1360 $self->instantiate;
1312} 1361}
1313 1362
1314sub load_header { 1363sub load_header {
1315 my ($self) = @_; 1364 my ($self) = @_;
1316 1365
1317 if ($self->load_temp) { 1366 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1367 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1368 } else {
1324 $self->load_orig 1369 $self->load_header_orig
1325 or return; 1370 or return;
1326 1371 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1372 }
1332 1373
1333 1 1374 1
1334} 1375}
1335 1376
… …
1349 $map->{last_save} = $cf::RUNTIME; 1390 $map->{last_save} = $cf::RUNTIME;
1350 1391
1351 $map->load_header 1392 $map->load_header
1352 or return; 1393 or return;
1353 1394
1354 if ($map->should_reset) { 1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1396 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1397 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1398 $map->reset;
1358 undef $guard; 1399 undef $guard;
1359 $map = find $path 1400 return find $path;
1360 or return;
1361 } 1401 }
1362 1402
1363 $cf::MAP{$path} = $map 1403 $cf::MAP{$path} = $map
1364 } 1404 }
1365} 1405}
1406
1407sub pre_load { }
1408sub post_load { }
1366 1409
1367sub load { 1410sub load {
1368 my ($self) = @_; 1411 my ($self) = @_;
1369 1412
1413 local $self->{deny_reset} = 1; # loading can take a long time
1414
1370 my $path = $self->{path}; 1415 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1416 my $guard = cf::lock_acquire "map_load:$path";
1372 1417
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1418 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1419
1375 $self->in_memory (cf::MAP_LOADING); 1420 $self->in_memory (cf::MAP_LOADING);
1376 1421
1377 $self->alloc; 1422 $self->alloc;
1423
1424 $self->pre_load;
1425
1378 $self->_load_objects ($self->{load_path}, 1) 1426 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1427 or return;
1380 1428
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1430 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1452 unless $self->difficulty;
1405 Coro::cede; 1453 Coro::cede;
1406 $self->activate; 1454 $self->activate;
1407 } 1455 }
1408 1456
1457 $self->post_load;
1458
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1459 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1460}
1411 1461
1412sub customise_for { 1462sub customise_for {
1413 my ($self, $ob) = @_; 1463 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1527 delete $MAP_PREFETCH{$path};
1478 } 1528 }
1479 } 1529 }
1480 undef $MAP_PREFETCHER; 1530 undef $MAP_PREFETCHER;
1481 }; 1531 };
1532 $MAP_PREFETCHER->prio (6);
1482 1533
1483 () 1534 ()
1484} 1535}
1485 1536
1486sub save { 1537sub save {
… …
1556 return if $self->players; 1607 return if $self->players;
1557 return if $self->isa ("ext::map_per_player");#d# 1608 return if $self->isa ("ext::map_per_player");#d#
1558 1609
1559 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1560 1611
1612 $self->in_memory (cf::MAP_SWAPPED);
1613
1614 # need to save uniques path
1615 unless ($self->{deny_save}) {
1616 my $uniq = $self->uniq_path; utf8::encode $uniq;
1617
1618 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1619 if $uniq;
1620 }
1621
1561 delete $cf::MAP{$self->path}; 1622 delete $cf::MAP{$self->path};
1562 1623
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear; 1624 $self->clear;
1565 1625
1566 $_->clear_links_to ($self) for values %cf::MAP; 1626 $_->clear_links_to ($self) for values %cf::MAP;
1567 1627
1568 $self->unlink_save; 1628 $self->unlink_save;
… …
1605 for (@$files) { 1665 for (@$files) {
1606 utf8::decode $_; 1666 utf8::decode $_;
1607 next if /\.pst$/; 1667 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1668 next unless /^$PATH_SEP/o;
1609 1669
1610 s/\.map$//; 1670 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1671 }
1613 1672
1614 \@paths 1673 \@paths
1615} 1674}
1616 1675
… …
1710=cut 1769=cut
1711 1770
1712sub link_map { 1771sub link_map {
1713 unless ($LINK_MAP) { 1772 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1773 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1774 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1775 $LINK_MAP->load;
1717 } 1776 }
1718 1777
1719 $LINK_MAP 1778 $LINK_MAP
1720} 1779}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1786 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1787
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1789 if $self->map;
1731 1790
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1791 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1792}
1734 1793
1735sub cf::object::player::leave_link { 1794sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1795 my ($self, $map, $x, $y) = @_;
1737 1796
… …
1759 $map->load; 1818 $map->load;
1760 $map->load_diag; 1819 $map->load_diag;
1761 1820
1762 return unless $self->contr->active; 1821 return unless $self->contr->active;
1763 $self->activate_recursive; 1822 $self->activate_recursive;
1823
1824 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1764 $self->enter_map ($map, $x, $y); 1825 $self->enter_map ($map, $x, $y);
1765} 1826}
1766 1827
1767cf::player->attach ( 1828cf::player->attach (
1768 on_logout => sub { 1829 on_logout => sub {
… …
1781 # try to abort aborted map switching on player login :) 1842 # try to abort aborted map switching on player login :)
1782 # should happen only on crashes 1843 # should happen only on crashes
1783 if ($pl->ob->{_link_pos}) { 1844 if ($pl->ob->{_link_pos}) {
1784 $pl->ob->enter_link; 1845 $pl->ob->enter_link;
1785 (async { 1846 (async {
1786 # we need this sleep as the login has a concurrent enter_exit running
1787 # and this sleep increases chances of the player not ending up in scorn
1788 $pl->ob->reply (undef, 1847 $pl->ob->reply (undef,
1789 "There was an internal problem at your last logout, " 1848 "There was an internal problem at your last logout, "
1790 . "the server will try to bring you to your intended destination in a second.", 1849 . "the server will try to bring you to your intended destination in a second.",
1791 cf::NDI_RED); 1850 cf::NDI_RED);
1851 # we need this sleep as the login has a concurrent enter_exit running
1852 # and this sleep increases chances of the player not ending up in scorn
1792 Coro::Timer::sleep 1; 1853 Coro::Timer::sleep 1;
1793 $pl->ob->leave_link; 1854 $pl->ob->leave_link;
1794 })->prio (2); 1855 })->prio (2);
1795 } 1856 }
1796 }, 1857 },
… …
1804 my ($self, $path, $x, $y) = @_; 1865 my ($self, $path, $x, $y) = @_;
1805 1866
1806 $self->enter_link; 1867 $self->enter_link;
1807 1868
1808 (async { 1869 (async {
1870 my $map = eval {
1809 my $map = cf::map::find $path; 1871 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1872 $map = $map->customise_for ($self) if $map;
1811 1873 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1874 } or
1813# if $map;
1814
1815 $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);
1816 1876
1817 $self->leave_link ($map, $x, $y); 1877 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1878 })->prio (1);
1819} 1879}
1820 1880
… …
1851 # that depends on the exit object 1911 # that depends on the exit object
1852 1912
1853 my $rmp = parse_random_map_params $exit->msg; 1913 my $rmp = parse_random_map_params $exit->msg;
1854 1914
1855 if ($exit->map) { 1915 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1916 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1917 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1918 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1919 $rmp->{origin_y} = $exit->y;
1860 } 1920 }
1861 1921
… …
1878sub cf::object::player::enter_exit { 1938sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1939 my ($self, $exit) = @_;
1880 1940
1881 return unless $self->type == cf::PLAYER; 1941 return unless $self->type == cf::PLAYER;
1882 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
1883 $self->enter_link; 1952 $self->enter_link;
1884 1953
1885 (async { 1954 (async {
1886 $self->deactivate_recursive; # just to be sure 1955 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1956 unless (eval {
1888 prepare_random_map $exit 1957 $self->goto ($slaying, $hp, $sp);
1889 if $exit->slaying eq "/!";
1890
1891 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1892 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1893 1958
1894 1; 1959 1;
1895 }) { 1960 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1961 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "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. "
… …
1958 # get handled first 2023 # get handled first
1959 my $queue = delete $ns->{query_queue} 2024 my $queue = delete $ns->{query_queue}
1960 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
1961 2026
1962 (shift @$queue)->[1]->($msg); 2027 (shift @$queue)->[1]->($msg);
2028 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2029
1964 push @{ $ns->{query_queue} }, @$queue; 2030 push @{ $ns->{query_queue} }, @$queue;
1965 2031
1966 if (@{ $ns->{query_queue} } == @$queue) { 2032 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2033 if (@$queue) {
… …
2128The 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
2129using it, it should be unique. 2195using it, it should be unique.
2130 2196
2131=over 4 2197=over 4
2132 2198
2133=item $hashref = cf::db_get $family
2134
2135Return a hashref for use by the extension C<$family>, which can be
2136modified. After modifications, you have to call C<cf::db_dirty> or
2137C<cf::db_sync>.
2138
2139=item $value = cf::db_get $family => $key 2199=item $value = cf::db_get $family => $key
2140 2200
2141Returns a single value from the database 2201Returns a single value from the database.
2142
2143=item cf::db_put $family => $hashref
2144
2145Stores the given family hashref into the database. Updates are delayed, if
2146you want the data to be synced to disk immediately, use C<cf::db_sync>.
2147 2202
2148=item cf::db_put $family => $key => $value 2203=item cf::db_put $family => $key => $value
2149 2204
2150Stores the given C<$value> in the family hash. Updates are delayed, if you 2205Stores the given C<$value> in the family.
2151want the data to be synced to disk immediately, use C<cf::db_sync>.
2152
2153=item cf::db_dirty
2154
2155Marks the database as dirty, to be updated at a later time.
2156
2157=item cf::db_sync
2158
2159Immediately write the database to disk I<if it is dirty>.
2160 2206
2161=cut 2207=cut
2162 2208
2163our $DB; 2209our $DB;
2164 2210
2165{ 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
2166 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;
2167 2230
2168 sub db_load() { 2231 cf::db_put (board => data => $pst->{board});
2169 $DB = stat $path ? Storable::retrieve $path : { }; 2232 cf::db_put (guildrules => data => $pst->{guildrules});
2170 } 2233 cf::db_put (rent => balance => $pst->{rent}{balance});
2234 BDB::db_env_txn_checkpoint $DB_ENV;
2171 2235
2172 my $pid; 2236 unlink $path;
2173
2174 sub db_save() {
2175 waitpid $pid, 0 if $pid;
2176 if (0 == ($pid = fork)) {
2177 $DB->{_meta}{version} = 1;
2178 Storable::nstore $DB, "$path~";
2179 rename "$path~", $path;
2180 cf::_exit 0 if defined $pid;
2181 } 2237 };
2182 }
2183
2184 my $dirty;
2185
2186 sub db_sync() {
2187 db_save if $dirty;
2188 undef $dirty;
2189 }
2190
2191 my $idle = Event->idle (min => 10, max => 20, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2192 db_sync;
2193 });
2194
2195 sub db_dirty() {
2196 $dirty = 1;
2197 $idle->start;
2198 }
2199
2200 sub db_get($;$) {
2201 @_ >= 2
2202 ? $DB->{$_[0]}{$_[1]}
2203 : ($DB->{$_[0]} ||= { })
2204 }
2205
2206 sub db_put($$;$) {
2207 if (@_ >= 3) {
2208 $DB->{$_[0]}{$_[1]} = $_[2];
2209 } else {
2210 $DB->{$_[0]} = $_[1];
2211 }
2212 db_dirty;
2213 }
2214
2215 cf::global->attach (
2216 prio => 10000,
2217 on_cleanup => sub {
2218 db_sync;
2219 }, 2238 }
2220 ); 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 { };
2221} 2256}
2222 2257
2223############################################################################# 2258#############################################################################
2224# 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}
2225 2265
2226sub cfg_load { 2266sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2267 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2268 or return;
2229 2269
… …
2240 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2280 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2241 and die "WARNING: m(un)lockall failed: $!\n"; 2281 and die "WARNING: m(un)lockall failed: $!\n";
2242 }; 2282 };
2243 warn $@ if $@; 2283 warn $@ if $@;
2244 } 2284 }
2285}
2286
2287sub init {
2288 load_resources;
2245} 2289}
2246 2290
2247sub main { 2291sub main {
2248 # we must not ever block the main coroutine 2292 # we must not ever block the main coroutine
2249 local $Coro::idle = sub { 2293 local $Coro::idle = sub {
… …
2252 Event::one_event; 2296 Event::one_event;
2253 })->prio (Coro::PRIO_MAX); 2297 })->prio (Coro::PRIO_MAX);
2254 }; 2298 };
2255 2299
2256 cfg_load; 2300 cfg_load;
2257 db_load; 2301 db_init;
2258 load_extensions; 2302 load_extensions;
2259 2303
2260 $TICK_WATCHER->start; 2304 $TICK_WATCHER->start;
2261 Event::loop; 2305 Event::loop;
2262} 2306}
… …
2266 2310
2267# install some emergency cleanup handlers 2311# install some emergency cleanup handlers
2268BEGIN { 2312BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2313 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2314 Event->signal (
2315 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2316 data => WF_AUTOCANCEL,
2272 signal => $signal, 2317 signal => $signal,
2318 prio => 0,
2273 cb => sub { 2319 cb => sub {
2274 cf::cleanup "SIG$signal"; 2320 cf::cleanup "SIG$signal";
2275 }, 2321 },
2276 ); 2322 );
2277 } 2323 }
2278} 2324}
… …
2299 my $map = $cf::MAP{$path} or next; 2345 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2346 $map->valid or next;
2301 $map->save; 2347 $map->save;
2302 } 2348 }
2303 warn "end emergency map save\n"; 2349 warn "end emergency map save\n";
2350
2351 warn "begin emergency database checkpoint\n";
2352 BDB::db_env_txn_checkpoint $DB_ENV;
2353 warn "end emergency database checkpoint\n";
2304 }; 2354 };
2305 2355
2306 warn "leave emergency perl save\n"; 2356 warn "leave emergency perl save\n";
2357}
2358
2359sub post_cleanup {
2360 my ($make_core) = @_;
2361
2362 warn Carp::longmess "post_cleanup backtrace"
2363 if $make_core;
2307} 2364}
2308 2365
2309sub reload() { 2366sub reload() {
2310 # can/must only be called in main 2367 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2368 if ($Coro::current != $Coro::main) {
… …
2313 return; 2370 return;
2314 } 2371 }
2315 2372
2316 warn "reloading..."; 2373 warn "reloading...";
2317 2374
2318 warn "cancelling server ticker"; 2375 warn "entering sync_job";
2319 $TICK_WATCHER->cancel;
2320 2376
2377 cf::sync_job {
2378 cf::write_runtime; # external watchdog should not bark
2321 cf::emergency_save; 2379 cf::emergency_save;
2380 cf::write_runtime; # external watchdog should not bark
2322 2381
2323 eval { 2382 warn "syncing database to disk";
2383 BDB::db_env_txn_checkpoint $DB_ENV;
2384
2324 # if anything goes wrong in here, we should simply crash as we already saved 2385 # if anything goes wrong in here, we should simply crash as we already saved
2325
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328 2386
2329 warn "cancelling all WF_AUTOCANCEL watchers"; 2387 warn "cancelling all WF_AUTOCANCEL watchers";
2330 for (Event::all_watchers) { 2388 for (Event::all_watchers) {
2331 $_->cancel if $_->data & WF_AUTOCANCEL; 2389 $_->cancel if $_->data & WF_AUTOCANCEL;
2332 } 2390 }
2333 2391
2334 warn "flushing outstanding aio requests"; 2392 warn "flushing outstanding aio requests";
2335 for (;;) { 2393 for (;;) {
2394 BDB::flush;
2336 IO::AIO::flush; 2395 IO::AIO::flush;
2337 Coro::cede; 2396 Coro::cede;
2338 last unless IO::AIO::nreqs; 2397 last unless IO::AIO::nreqs || BDB::nreqs;
2339 warn "iterate..."; 2398 warn "iterate...";
2340 } 2399 }
2341 2400
2342 warn "cancelling all extension coros"; 2401 warn "cancelling all extension coros";
2343 $_->cancel for values %EXT_CORO; 2402 $_->cancel for values %EXT_CORO;
… …
2398 require cf; 2457 require cf;
2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2458 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400 2459
2401 warn "loading config and database again"; 2460 warn "loading config and database again";
2402 cf::cfg_load; 2461 cf::cfg_load;
2403 cf::db_load;
2404 2462
2405 warn "loading extensions"; 2463 warn "loading extensions";
2406 cf::load_extensions; 2464 cf::load_extensions;
2407 2465
2408 warn "reattaching attachments to objects/players"; 2466 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2467 _global_reattach;
2410 warn "reattaching attachments to maps"; 2468 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2469 reattach $_ for values %MAP;
2412 2470
2413 warn "restarting server ticker"; 2471 warn "loading reloadable resources";
2472 load_resources;
2414 2473
2415 $TICK_WATCHER->start; 2474 warn "leaving sync_job";
2416 };
2417 2475
2418 if ($@) { 2476 1
2477 } or do {
2419 warn $@; 2478 warn $@;
2420 warn "error while reloading, exiting."; 2479 warn "error while reloading, exiting.";
2421 exit 1; 2480 exit 1;
2422 } 2481 };
2423 2482
2424 warn "reloaded"; 2483 warn "reloaded";
2425}; 2484};
2426 2485
2427our $RELOAD_WATCHER; # used only during reload 2486our $RELOAD_WATCHER; # used only during reload
… …
2433 $who->message ("reloading server."); 2492 $who->message ("reloading server.");
2434 2493
2435 # doing reload synchronously and two reloads happen back-to-back, 2494 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2495 # coro crashes during coro_state_free->destroy here.
2437 2496
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2497 $RELOAD_WATCHER ||= Event->timer (
2498 reentrant => 0,
2499 after => 0,
2500 data => WF_AUTOCANCEL,
2501 cb => sub {
2439 reload; 2502 reload;
2440 undef $RELOAD_WATCHER; 2503 undef $RELOAD_WATCHER;
2504 },
2441 }); 2505 );
2442 } 2506 }
2443}; 2507};
2444 2508
2445unshift @INC, $LIBDIR; 2509unshift @INC, $LIBDIR;
2446 2510
… …
2463 2527
2464 cf::server_tick; # one server iteration 2528 cf::server_tick; # one server iteration
2465 $RUNTIME += $TICK; 2529 $RUNTIME += $TICK;
2466 $NEXT_TICK += $TICK; 2530 $NEXT_TICK += $TICK;
2467 2531
2532 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2533 $NEXT_RUNTIME_WRITE = $NOW + 10;
2534 Coro::async_pool {
2535 write_runtime
2536 or warn "ERROR: unable to write runtime file: $!";
2537 };
2538 }
2539
2540
2468 $WAIT_FOR_TICK->broadcast; 2541 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2542 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2543
2544# my $AFTER = Event::time;
2545# warn $AFTER - $NOW;#d#
2470 2546
2471 # if we are delayed by four ticks or more, skip them all 2547 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2548 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2549
2474 $TICK_WATCHER->at ($NEXT_TICK); 2550 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2551 $TICK_WATCHER->start;
2476 }, 2552 },
2477); 2553);
2478 2554
2555{
2556 BDB::max_poll_time $TICK * 0.1;
2557 $BDB_POLL_WATCHER = Event->io (
2558 reentrant => 0,
2559 fd => BDB::poll_fileno,
2560 poll => 'r',
2561 prio => 0,
2562 data => WF_AUTOCANCEL,
2563 cb => \&BDB::poll_cb,
2564 );
2565 BDB::min_parallel 8;
2566
2567 BDB::set_sync_prepare {
2568 my $status;
2569 my $current = $Coro::current;
2570 (
2571 sub {
2572 $status = $!;
2573 $current->ready; undef $current;
2574 },
2575 sub {
2576 Coro::schedule while defined $current;
2577 $! = $status;
2578 },
2579 )
2580 };
2581
2582 unless ($DB_ENV) {
2583 $DB_ENV = BDB::db_env_create;
2584
2585 cf::sync_job {
2586 eval {
2587 BDB::db_env_open
2588 $DB_ENV,
2589 $BDB_ENV_DIR,
2590 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2591 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2592 0666;
2593
2594 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2595
2596 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2597 $DB_ENV->set_lk_detect;
2598 };
2599
2600 cf::cleanup "db_env_open(db): $@" if $@;
2601 };
2602 }
2603}
2604
2605{
2606 IO::AIO::min_parallel 8;
2607
2608 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2609 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2610 $AIO_POLL_WATCHER = Event->io (
2482 fd => IO::AIO::poll_fileno, 2611 reentrant => 0,
2483 poll => 'r',
2484 prio => 5,
2485 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb,
2487);
2488
2489$WRITE_RUNTIME_WATCHER = Event->timer (
2490 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2491 after => 1, 2613 fd => IO::AIO::poll_fileno,
2492 interval => 10, 2614 poll => 'r',
2493 prio => 6, # keep it lowest so it acts like a watchdog 2615 prio => 6,
2494 cb => Coro::unblock_sub { 2616 cb => \&IO::AIO::poll_cb,
2495 write_runtime 2617 );
2496 or warn "ERROR: unable to write runtime file: $!"; 2618}
2497 },
2498);
2499 2619
2500END { cf::emergency_save } 2620END { cf::emergency_save }
2501 2621
25021 26221
2503 2623

Diff Legend

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