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.219 by root, Sat Feb 17 03:19:44 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 }
… …
344 354
345 $coro 355 $coro
346} 356}
347 357
348sub write_runtime { 358sub write_runtime {
359 my $guard = cf::lock_acquire "write_runtime";
360
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
… …
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";
… …
1068=cut 1081=cut
1069 1082
1070sub maps($) { 1083sub maps($) {
1071 my ($pl) = @_; 1084 my ($pl) = @_;
1072 1085
1086 $pl = ref $pl ? $pl->ob->name : $pl;
1087
1073 my $files = aio_readdir playerdir $pl 1088 my $files = aio_readdir playerdir $pl
1074 or return; 1089 or return;
1075 1090
1076 my @paths; 1091 my @paths;
1077 1092
1078 for (@$files) { 1093 for (@$files) {
1079 utf8::decode $_; 1094 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1095 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1096 next unless /^$PATH_SEP/o;
1082 1097
1083 s/\.map$//; 1098 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1099 }
1086 1100
1087 \@paths 1101 \@paths
1088} 1102}
1089 1103
… …
1176} 1190}
1177 1191
1178sub normalise { 1192sub normalise {
1179 my ($path, $base) = @_; 1193 my ($path, $base) = @_;
1180 1194
1195 $path = "$path"; # make sure its a string
1196
1197 $path =~ s/\.map$//;
1198
1181 # map plan: 1199 # map plan:
1182 # 1200 #
1183 # /! non-realised random map exit (special hack!) 1201 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1202 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1203 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1239 $self->init; # pass $1 etc.
1222 return $self; 1240 return $self;
1223 } 1241 }
1224 } 1242 }
1225 1243
1226 Carp::carp "unable to resolve path '$path'."; 1244 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1245 ()
1228} 1246}
1229 1247
1230sub init { 1248sub init {
1231 my ($self) = @_; 1249 my ($self) = @_;
… …
1246 1264
1247# the original (read-only) location 1265# the original (read-only) location
1248sub load_path { 1266sub load_path {
1249 my ($self) = @_; 1267 my ($self) = @_;
1250 1268
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1270}
1253 1271
1254# the temporary/swap location 1272# the temporary/swap location
1255sub save_path { 1273sub save_path {
1256 my ($self) = @_; 1274 my ($self) = @_;
1257 1275
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1278}
1261 1279
1262# the unique path, undef == no special unique path 1280# the unique path, undef == no special unique path
1263sub uniq_path { 1281sub uniq_path {
1264 my ($self) = @_; 1282 my ($self) = @_;
… …
1286 1304
1287sub load_header_from($) { 1305sub load_header_from($) {
1288 my ($self, $path) = @_; 1306 my ($self, $path) = @_;
1289 1307
1290 utf8::encode $path; 1308 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1309 #aio_open $path, O_RDONLY, 0
1292 or return; 1310 # or return;
1293 1311
1294 $self->_load_header ($path) 1312 $self->_load_header ($path)
1295 or return; 1313 or return;
1296 1314
1297 $self->{load_path} = $path; 1315 $self->{load_path} = $path;
1298 1316
1299 1 1317 1
1300} 1318}
1301 1319
1302sub load_orig { 1320sub load_header_orig {
1303 my ($self) = @_; 1321 my ($self) = @_;
1304 1322
1305 $self->load_header_from ($self->load_path) 1323 $self->load_header_from ($self->load_path)
1306} 1324}
1307 1325
1308sub load_temp { 1326sub load_header_temp {
1309 my ($self) = @_; 1327 my ($self) = @_;
1310 1328
1311 $self->load_header_from ($self->save_path) 1329 $self->load_header_from ($self->save_path)
1330}
1331
1332sub prepare_temp {
1333 my ($self) = @_;
1334
1335 $self->last_access ((delete $self->{last_access})
1336 || $cf::RUNTIME); #d#
1337 # safety
1338 $self->{instantiate_time} = $cf::RUNTIME
1339 if $self->{instantiate_time} > $cf::RUNTIME;
1340}
1341
1342sub prepare_orig {
1343 my ($self) = @_;
1344
1345 $self->{load_original} = 1;
1346 $self->{instantiate_time} = $cf::RUNTIME;
1347 $self->last_access ($cf::RUNTIME);
1348 $self->instantiate;
1312} 1349}
1313 1350
1314sub load_header { 1351sub load_header {
1315 my ($self) = @_; 1352 my ($self) = @_;
1316 1353
1317 if ($self->load_temp) { 1354 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1355 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1356 } else {
1324 $self->load_orig 1357 $self->load_header_orig
1325 or return; 1358 or return;
1326 1359 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1360 }
1332 1361
1333 1 1362 1
1334} 1363}
1335 1364
… …
1349 $map->{last_save} = $cf::RUNTIME; 1378 $map->{last_save} = $cf::RUNTIME;
1350 1379
1351 $map->load_header 1380 $map->load_header
1352 or return; 1381 or return;
1353 1382
1354 if ($map->should_reset) { 1383 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1384 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1385 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1386 $map->reset;
1358 undef $guard; 1387 undef $guard;
1359 $map = find $path 1388 return find $path;
1360 or return;
1361 } 1389 }
1362 1390
1363 $cf::MAP{$path} = $map 1391 $cf::MAP{$path} = $map
1364 } 1392 }
1365} 1393}
1394
1395sub pre_load { }
1396sub post_load { }
1366 1397
1367sub load { 1398sub load {
1368 my ($self) = @_; 1399 my ($self) = @_;
1369 1400
1401 local $self->{deny_reset} = 1; # loading can take a long time
1402
1370 my $path = $self->{path}; 1403 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1404 my $guard = cf::lock_acquire "map_load:$path";
1372 1405
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1406 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1407
1375 $self->in_memory (cf::MAP_LOADING); 1408 $self->in_memory (cf::MAP_LOADING);
1376 1409
1377 $self->alloc; 1410 $self->alloc;
1411
1412 $self->pre_load;
1413
1378 $self->_load_objects ($self->{load_path}, 1) 1414 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1415 or return;
1380 1416
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1417 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1418 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1440 unless $self->difficulty;
1405 Coro::cede; 1441 Coro::cede;
1406 $self->activate; 1442 $self->activate;
1407 } 1443 }
1408 1444
1445 $self->post_load;
1446
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1447 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1448}
1411 1449
1412sub customise_for { 1450sub customise_for {
1413 my ($self, $ob) = @_; 1451 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1515 delete $MAP_PREFETCH{$path};
1478 } 1516 }
1479 } 1517 }
1480 undef $MAP_PREFETCHER; 1518 undef $MAP_PREFETCHER;
1481 }; 1519 };
1520 $MAP_PREFETCHER->prio (6);
1482 1521
1483 () 1522 ()
1484} 1523}
1485 1524
1486sub save { 1525sub save {
… …
1556 return if $self->players; 1595 return if $self->players;
1557 return if $self->isa ("ext::map_per_player");#d# 1596 return if $self->isa ("ext::map_per_player");#d#
1558 1597
1559 warn "resetting map ", $self->path;#d# 1598 warn "resetting map ", $self->path;#d#
1560 1599
1600 $self->in_memory (cf::MAP_SWAPPED);
1601
1602 # need to save uniques path
1603 unless ($self->{deny_save}) {
1604 my $uniq = $self->uniq_path; utf8::encode $uniq;
1605
1606 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1607 if $uniq;
1608 }
1609
1561 delete $cf::MAP{$self->path}; 1610 delete $cf::MAP{$self->path};
1562 1611
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear; 1612 $self->clear;
1565 1613
1566 $_->clear_links_to ($self) for values %cf::MAP; 1614 $_->clear_links_to ($self) for values %cf::MAP;
1567 1615
1568 $self->unlink_save; 1616 $self->unlink_save;
… …
1605 for (@$files) { 1653 for (@$files) {
1606 utf8::decode $_; 1654 utf8::decode $_;
1607 next if /\.pst$/; 1655 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1656 next unless /^$PATH_SEP/o;
1609 1657
1610 s/\.map$//; 1658 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1659 }
1613 1660
1614 \@paths 1661 \@paths
1615} 1662}
1616 1663
… …
1710=cut 1757=cut
1711 1758
1712sub link_map { 1759sub link_map {
1713 unless ($LINK_MAP) { 1760 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1761 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1762 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1763 $LINK_MAP->load;
1717 } 1764 }
1718 1765
1719 $LINK_MAP 1766 $LINK_MAP
1720} 1767}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1774 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1775
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1776 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1777 if $self->map;
1731 1778
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1779 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1780}
1734 1781
1735sub cf::object::player::leave_link { 1782sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1783 my ($self, $map, $x, $y) = @_;
1737 1784
… …
1759 $map->load; 1806 $map->load;
1760 $map->load_diag; 1807 $map->load_diag;
1761 1808
1762 return unless $self->contr->active; 1809 return unless $self->contr->active;
1763 $self->activate_recursive; 1810 $self->activate_recursive;
1811
1812 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1764 $self->enter_map ($map, $x, $y); 1813 $self->enter_map ($map, $x, $y);
1765} 1814}
1766 1815
1767cf::player->attach ( 1816cf::player->attach (
1768 on_logout => sub { 1817 on_logout => sub {
… …
1781 # try to abort aborted map switching on player login :) 1830 # try to abort aborted map switching on player login :)
1782 # should happen only on crashes 1831 # should happen only on crashes
1783 if ($pl->ob->{_link_pos}) { 1832 if ($pl->ob->{_link_pos}) {
1784 $pl->ob->enter_link; 1833 $pl->ob->enter_link;
1785 (async { 1834 (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, 1835 $pl->ob->reply (undef,
1789 "There was an internal problem at your last logout, " 1836 "There was an internal problem at your last logout, "
1790 . "the server will try to bring you to your intended destination in a second.", 1837 . "the server will try to bring you to your intended destination in a second.",
1791 cf::NDI_RED); 1838 cf::NDI_RED);
1839 # we need this sleep as the login has a concurrent enter_exit running
1840 # and this sleep increases chances of the player not ending up in scorn
1792 Coro::Timer::sleep 1; 1841 Coro::Timer::sleep 1;
1793 $pl->ob->leave_link; 1842 $pl->ob->leave_link;
1794 })->prio (2); 1843 })->prio (2);
1795 } 1844 }
1796 }, 1845 },
… …
1804 my ($self, $path, $x, $y) = @_; 1853 my ($self, $path, $x, $y) = @_;
1805 1854
1806 $self->enter_link; 1855 $self->enter_link;
1807 1856
1808 (async { 1857 (async {
1858 my $map = eval {
1809 my $map = cf::map::find $path; 1859 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1860 $map = $map->customise_for ($self) if $map;
1811 1861 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1862 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1863 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1864
1817 $self->leave_link ($map, $x, $y); 1865 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1866 })->prio (1);
1819} 1867}
1820 1868
… …
1851 # that depends on the exit object 1899 # that depends on the exit object
1852 1900
1853 my $rmp = parse_random_map_params $exit->msg; 1901 my $rmp = parse_random_map_params $exit->msg;
1854 1902
1855 if ($exit->map) { 1903 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1904 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1905 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1906 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1907 $rmp->{origin_y} = $exit->y;
1860 } 1908 }
1861 1909
… …
1878sub cf::object::player::enter_exit { 1926sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1927 my ($self, $exit) = @_;
1880 1928
1881 return unless $self->type == cf::PLAYER; 1929 return unless $self->type == cf::PLAYER;
1882 1930
1931 if ($exit->slaying eq "/!") {
1932 #TODO: this should de-fi-ni-te-ly not be a sync-job
1933 cf::sync_job { prepare_random_map $exit };
1934 }
1935
1936 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1937 my $hp = $exit->stats->hp;
1938 my $sp = $exit->stats->sp;
1939
1883 $self->enter_link; 1940 $self->enter_link;
1884 1941
1885 (async { 1942 (async {
1886 $self->deactivate_recursive; # just to be sure 1943 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1944 unless (eval {
1888 prepare_random_map $exit 1945 $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 1946
1894 1; 1947 1;
1895 }) { 1948 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1949 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1950 . "I'll try to bring you back to the map you were before. "
… …
1958 # get handled first 2011 # get handled first
1959 my $queue = delete $ns->{query_queue} 2012 my $queue = delete $ns->{query_queue}
1960 or return; # be conservative, not sure how that can happen, but we saw a crash here 2013 or return; # be conservative, not sure how that can happen, but we saw a crash here
1961 2014
1962 (shift @$queue)->[1]->($msg); 2015 (shift @$queue)->[1]->($msg);
2016 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2017
1964 push @{ $ns->{query_queue} }, @$queue; 2018 push @{ $ns->{query_queue} }, @$queue;
1965 2019
1966 if (@{ $ns->{query_queue} } == @$queue) { 2020 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2021 if (@$queue) {
… …
2128The parameter C<$family> should best start with the name of the extension 2182The parameter C<$family> should best start with the name of the extension
2129using it, it should be unique. 2183using it, it should be unique.
2130 2184
2131=over 4 2185=over 4
2132 2186
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 2187=item $value = cf::db_get $family => $key
2140 2188
2141Returns a single value from the database 2189Returns 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 2190
2148=item cf::db_put $family => $key => $value 2191=item cf::db_put $family => $key => $value
2149 2192
2150Stores the given C<$value> in the family hash. Updates are delayed, if you 2193Stores 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 2194
2161=cut 2195=cut
2162 2196
2163our $DB; 2197our $DB;
2164 2198
2165{ 2199sub db_init {
2200 unless ($DB) {
2201 $DB = BDB::db_create $DB_ENV;
2202
2203 cf::sync_job {
2204 eval {
2205 $DB->set_flags (BDB::CHKSUM);
2206
2207 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2208 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2209 cf::cleanup "db_open(db): $!" if $!;
2210 };
2211 cf::cleanup "db_open(db): $@" if $@;
2212 };
2213
2166 my $path = cf::localdir . "/database.pst"; 2214 my $path = cf::localdir . "/database.pst";
2215 if (stat $path) {
2216 cf::sync_job {
2217 my $pst = Storable::retrieve $path;
2167 2218
2168 sub db_load() { 2219 cf::db_put (board => data => $pst->{board});
2169 $DB = stat $path ? Storable::retrieve $path : { }; 2220 cf::db_put (guildrules => data => $pst->{guildrules});
2170 } 2221 cf::db_put (rent => balance => $pst->{rent}{balance});
2222 BDB::db_env_txn_checkpoint $DB_ENV;
2171 2223
2172 my $pid; 2224 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 } 2225 };
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 }, 2226 }
2220 ); 2227 }
2228}
2229
2230sub db_get($$) {
2231 my $key = "$_[0]/$_[1]";
2232
2233 cf::sync_job {
2234 BDB::db_get $DB, undef, $key, my $data;
2235
2236 $! ? ()
2237 : Compress::LZF::sthaw $data
2238 }
2239}
2240
2241sub db_put($$$) {
2242 BDB::dbreq_pri 4;
2243 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2221} 2244}
2222 2245
2223############################################################################# 2246#############################################################################
2224# the server's main() 2247# the server's init and main functions
2248
2249sub init_resources {
2250 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2251 or die "unable to load regions file\n";#d#
2252}
2225 2253
2226sub cfg_load { 2254sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2255 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2256 or return;
2229 2257
… …
2240 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2268 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2241 and die "WARNING: m(un)lockall failed: $!\n"; 2269 and die "WARNING: m(un)lockall failed: $!\n";
2242 }; 2270 };
2243 warn $@ if $@; 2271 warn $@ if $@;
2244 } 2272 }
2273}
2274
2275sub init {
2276 init_resources;
2245} 2277}
2246 2278
2247sub main { 2279sub main {
2248 # we must not ever block the main coroutine 2280 # we must not ever block the main coroutine
2249 local $Coro::idle = sub { 2281 local $Coro::idle = sub {
… …
2252 Event::one_event; 2284 Event::one_event;
2253 })->prio (Coro::PRIO_MAX); 2285 })->prio (Coro::PRIO_MAX);
2254 }; 2286 };
2255 2287
2256 cfg_load; 2288 cfg_load;
2257 db_load; 2289 db_init;
2258 load_extensions; 2290 load_extensions;
2259 2291
2260 $TICK_WATCHER->start; 2292 $TICK_WATCHER->start;
2261 Event::loop; 2293 Event::loop;
2262} 2294}
… …
2266 2298
2267# install some emergency cleanup handlers 2299# install some emergency cleanup handlers
2268BEGIN { 2300BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2301 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2302 Event->signal (
2303 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2304 data => WF_AUTOCANCEL,
2272 signal => $signal, 2305 signal => $signal,
2306 prio => 0,
2273 cb => sub { 2307 cb => sub {
2274 cf::cleanup "SIG$signal"; 2308 cf::cleanup "SIG$signal";
2275 }, 2309 },
2276 ); 2310 );
2277 } 2311 }
2278} 2312}
… …
2299 my $map = $cf::MAP{$path} or next; 2333 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2334 $map->valid or next;
2301 $map->save; 2335 $map->save;
2302 } 2336 }
2303 warn "end emergency map save\n"; 2337 warn "end emergency map save\n";
2338
2339 warn "begin emergency database checkpoint\n";
2340 BDB::db_env_txn_checkpoint $DB_ENV;
2341 warn "end emergency database checkpoint\n";
2304 }; 2342 };
2305 2343
2306 warn "leave emergency perl save\n"; 2344 warn "leave emergency perl save\n";
2345}
2346
2347sub post_cleanup {
2348 my ($make_core) = @_;
2349
2350 warn Carp::longmess "post_cleanup backtrace"
2351 if $make_core;
2307} 2352}
2308 2353
2309sub reload() { 2354sub reload() {
2310 # can/must only be called in main 2355 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2356 if ($Coro::current != $Coro::main) {
… …
2313 return; 2358 return;
2314 } 2359 }
2315 2360
2316 warn "reloading..."; 2361 warn "reloading...";
2317 2362
2318 warn "cancelling server ticker"; 2363 warn "entering sync_job";
2319 $TICK_WATCHER->cancel;
2320 2364
2365 cf::sync_job {
2366 cf::write_runtime; # external watchdog should not bark
2321 cf::emergency_save; 2367 cf::emergency_save;
2368 cf::write_runtime; # external watchdog should not bark
2322 2369
2323 eval { 2370 warn "syncing database to disk";
2371 BDB::db_env_txn_checkpoint $DB_ENV;
2372
2324 # if anything goes wrong in here, we should simply crash as we already saved 2373 # 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 2374
2329 warn "cancelling all WF_AUTOCANCEL watchers"; 2375 warn "cancelling all WF_AUTOCANCEL watchers";
2330 for (Event::all_watchers) { 2376 for (Event::all_watchers) {
2331 $_->cancel if $_->data & WF_AUTOCANCEL; 2377 $_->cancel if $_->data & WF_AUTOCANCEL;
2332 } 2378 }
2333 2379
2334 warn "flushing outstanding aio requests"; 2380 warn "flushing outstanding aio requests";
2335 for (;;) { 2381 for (;;) {
2382 BDB::flush;
2336 IO::AIO::flush; 2383 IO::AIO::flush;
2337 Coro::cede; 2384 Coro::cede;
2338 last unless IO::AIO::nreqs; 2385 last unless IO::AIO::nreqs || BDB::nreqs;
2339 warn "iterate..."; 2386 warn "iterate...";
2340 } 2387 }
2341 2388
2342 warn "cancelling all extension coros"; 2389 warn "cancelling all extension coros";
2343 $_->cancel for values %EXT_CORO; 2390 $_->cancel for values %EXT_CORO;
… …
2398 require cf; 2445 require cf;
2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2446 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400 2447
2401 warn "loading config and database again"; 2448 warn "loading config and database again";
2402 cf::cfg_load; 2449 cf::cfg_load;
2403 cf::db_load;
2404 2450
2405 warn "loading extensions"; 2451 warn "loading extensions";
2406 cf::load_extensions; 2452 cf::load_extensions;
2407 2453
2408 warn "reattaching attachments to objects/players"; 2454 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2455 _global_reattach;
2410 warn "reattaching attachments to maps"; 2456 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2457 reattach $_ for values %MAP;
2412 2458
2413 warn "restarting server ticker"; 2459 warn "loading reloadable resources";
2460 init_resources;
2414 2461
2415 $TICK_WATCHER->start; 2462 warn "leaving sync_job";
2416 };
2417 2463
2418 if ($@) { 2464 1
2465 } or do {
2419 warn $@; 2466 warn $@;
2420 warn "error while reloading, exiting."; 2467 warn "error while reloading, exiting.";
2421 exit 1; 2468 exit 1;
2422 } 2469 };
2423 2470
2424 warn "reloaded"; 2471 warn "reloaded";
2425}; 2472};
2426 2473
2427our $RELOAD_WATCHER; # used only during reload 2474our $RELOAD_WATCHER; # used only during reload
… …
2433 $who->message ("reloading server."); 2480 $who->message ("reloading server.");
2434 2481
2435 # doing reload synchronously and two reloads happen back-to-back, 2482 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2483 # coro crashes during coro_state_free->destroy here.
2437 2484
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2485 $RELOAD_WATCHER ||= Event->timer (
2486 reentrant => 0,
2487 after => 0,
2488 data => WF_AUTOCANCEL,
2489 cb => sub {
2439 reload; 2490 reload;
2440 undef $RELOAD_WATCHER; 2491 undef $RELOAD_WATCHER;
2492 },
2441 }); 2493 );
2442 } 2494 }
2443}; 2495};
2444 2496
2445unshift @INC, $LIBDIR; 2497unshift @INC, $LIBDIR;
2446 2498
… …
2463 2515
2464 cf::server_tick; # one server iteration 2516 cf::server_tick; # one server iteration
2465 $RUNTIME += $TICK; 2517 $RUNTIME += $TICK;
2466 $NEXT_TICK += $TICK; 2518 $NEXT_TICK += $TICK;
2467 2519
2520 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2521 $NEXT_RUNTIME_WRITE = $NOW + 10;
2522 Coro::async_pool {
2523 write_runtime
2524 or warn "ERROR: unable to write runtime file: $!";
2525 };
2526 }
2527
2468 $WAIT_FOR_TICK->broadcast; 2528 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2529 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2530
2531# my $AFTER = Event::time;
2532# warn $AFTER - $NOW;#d#
2470 2533
2471 # if we are delayed by four ticks or more, skip them all 2534 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2535 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2536
2474 $TICK_WATCHER->at ($NEXT_TICK); 2537 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2538 $TICK_WATCHER->start;
2476 }, 2539 },
2477); 2540);
2478 2541
2542{
2543 BDB::max_poll_time $TICK * 0.1;
2544 $BDB_POLL_WATCHER = Event->io (
2545 reentrant => 0,
2546 fd => BDB::poll_fileno,
2547 poll => 'r',
2548 prio => 0,
2549 data => WF_AUTOCANCEL,
2550 cb => \&BDB::poll_cb,
2551 );
2552 BDB::min_parallel 8;
2553
2554 BDB::set_sync_prepare {
2555 my $status;
2556 my $current = $Coro::current;
2557 (
2558 sub {
2559 $status = $!;
2560 $current->ready; undef $current;
2561 },
2562 sub {
2563 Coro::schedule while defined $current;
2564 $! = $status;
2565 },
2566 )
2567 };
2568
2569 unless ($DB_ENV) {
2570 $DB_ENV = BDB::db_env_create;
2571
2572 cf::sync_job {
2573 eval {
2574 BDB::db_env_open
2575 $DB_ENV,
2576 $BDB_ENV_DIR,
2577 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2579 0666;
2580
2581 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2582
2583 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2584 $DB_ENV->set_lk_detect;
2585 };
2586
2587 cf::cleanup "db_env_open(db): $@" if $@;
2588 };
2589 }
2590}
2591
2592{
2593 IO::AIO::min_parallel 8;
2594
2595 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2596 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2597 $AIO_POLL_WATCHER = Event->io (
2482 fd => IO::AIO::poll_fileno, 2598 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, 2599 data => WF_AUTOCANCEL,
2491 after => 1, 2600 fd => IO::AIO::poll_fileno,
2492 interval => 10, 2601 poll => 'r',
2493 prio => 6, # keep it lowest so it acts like a watchdog 2602 prio => 6,
2494 cb => Coro::unblock_sub { 2603 cb => \&IO::AIO::poll_cb,
2495 write_runtime 2604 );
2496 or warn "ERROR: unable to write runtime file: $!"; 2605}
2497 },
2498);
2499 2606
2500END { cf::emergency_save } 2607END { cf::emergency_save }
2501 2608
25021 26091
2503 2610

Diff Legend

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