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.211 by root, Tue Feb 13 16:23:32 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
… …
344 356
345 $coro 357 $coro
346} 358}
347 359
348sub write_runtime { 360sub write_runtime {
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362
349 my $runtime = cf::localdir . "/runtime"; 363 my $runtime = cf::localdir . "/runtime";
350 364
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 366 or return;
353 367
… …
356 # 60 allows for the watchdog to kill the server. 370 # 60 allows for the watchdog to kill the server.
357 371
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 372 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 373 and return;
360 374
375 # always fsync - this file is important
361 aio_fsync $fh 376 aio_fsync $fh
362 and return; 377 and return;
363 378
364 close $fh 379 close $fh
365 or return; 380 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 765 $filename, length $$rdata, scalar @$objs;
751 766
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 767 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 768 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 769 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 770 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 771 close $fh;
757 772
758 if (@$objs) { 773 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 774 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 775 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 776 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 777 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 778 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 779 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 780 aio_rename "$filename.pst~", "$filename.pst";
766 } 781 }
767 } else { 782 } else {
768 aio_unlink "$filename.pst"; 783 aio_unlink "$filename.pst";
… …
774 } 789 }
775 } else { 790 } else {
776 aio_unlink $filename; 791 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 792 aio_unlink "$filename.pst";
778 } 793 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
779 } 800 }
780} 801}
781 802
782sub object_freezer_as_string { 803sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 804 my ($rdata, $objs) = @_;
… …
789 810
790sub object_thawer_load { 811sub object_thawer_load {
791 my ($filename) = @_; 812 my ($filename) = @_;
792 813
793 my ($data, $av); 814 my ($data, $av);
815
816 #d#TODO remove .map if file does not exist
817 aio_stat $filename and $filename =~ s/\.map$//;
794 818
795 (aio_load $filename, $data) >= 0 819 (aio_load $filename, $data) >= 0
796 or return; 820 or return;
797 821
798 unless (aio_stat "$filename.pst") { 822 unless (aio_stat "$filename.pst") {
… …
1068=cut 1092=cut
1069 1093
1070sub maps($) { 1094sub maps($) {
1071 my ($pl) = @_; 1095 my ($pl) = @_;
1072 1096
1097 $pl = ref $pl ? $pl->ob->name : $pl;
1098
1073 my $files = aio_readdir playerdir $pl 1099 my $files = aio_readdir playerdir $pl
1074 or return; 1100 or return;
1075 1101
1076 my @paths; 1102 my @paths;
1077 1103
1078 for (@$files) { 1104 for (@$files) {
1079 utf8::decode $_; 1105 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1106 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1107 next unless /^$PATH_SEP/o;
1082 1108
1083 s/\.map$//; 1109 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1110 }
1086 1111
1087 \@paths 1112 \@paths
1088} 1113}
1089 1114
… …
1176} 1201}
1177 1202
1178sub normalise { 1203sub normalise {
1179 my ($path, $base) = @_; 1204 my ($path, $base) = @_;
1180 1205
1206 $path = "$path"; # make sure its a string
1207
1208 $path =~ s/\.map$//;
1209
1181 # map plan: 1210 # map plan:
1182 # 1211 #
1183 # /! non-realised random map exit (special hack!) 1212 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1213 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1214 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1250 $self->init; # pass $1 etc.
1222 return $self; 1251 return $self;
1223 } 1252 }
1224 } 1253 }
1225 1254
1226 Carp::carp "unable to resolve path '$path'."; 1255 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1256 ()
1228} 1257}
1229 1258
1230sub init { 1259sub init {
1231 my ($self) = @_; 1260 my ($self) = @_;
… …
1246 1275
1247# the original (read-only) location 1276# the original (read-only) location
1248sub load_path { 1277sub load_path {
1249 my ($self) = @_; 1278 my ($self) = @_;
1250 1279
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1281}
1253 1282
1254# the temporary/swap location 1283# the temporary/swap location
1255sub save_path { 1284sub save_path {
1256 my ($self) = @_; 1285 my ($self) = @_;
1257 1286
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1289}
1261 1290
1262# the unique path, undef == no special unique path 1291# the unique path, undef == no special unique path
1263sub uniq_path { 1292sub uniq_path {
1264 my ($self) = @_; 1293 my ($self) = @_;
… …
1280 my ($self) = @_; 1309 my ($self) = @_;
1281 1310
1282 utf8::encode (my $save = $self->save_path); 1311 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1285} 1319}
1286 1320
1287sub load_header_from($) { 1321sub load_header_from($) {
1288 my ($self, $path) = @_; 1322 my ($self, $path) = @_;
1289 1323
1290 utf8::encode $path; 1324 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1325 #aio_open $path, O_RDONLY, 0
1292 or return; 1326 # or return;
1293 1327
1294 $self->_load_header ($path) 1328 $self->_load_header ($path)
1295 or return; 1329 or return;
1296 1330
1297 $self->{load_path} = $path; 1331 $self->{load_path} = $path;
1298 1332
1299 1 1333 1
1300} 1334}
1301 1335
1302sub load_orig { 1336sub load_header_orig {
1303 my ($self) = @_; 1337 my ($self) = @_;
1304 1338
1305 $self->load_header_from ($self->load_path) 1339 $self->load_header_from ($self->load_path)
1306} 1340}
1307 1341
1308sub load_temp { 1342sub load_header_temp {
1309 my ($self) = @_; 1343 my ($self) = @_;
1310 1344
1311 $self->load_header_from ($self->save_path) 1345 $self->load_header_from ($self->save_path)
1346}
1347
1348sub prepare_temp {
1349 my ($self) = @_;
1350
1351 $self->last_access ((delete $self->{last_access})
1352 || $cf::RUNTIME); #d#
1353 # safety
1354 $self->{instantiate_time} = $cf::RUNTIME
1355 if $self->{instantiate_time} > $cf::RUNTIME;
1356}
1357
1358sub prepare_orig {
1359 my ($self) = @_;
1360
1361 $self->{load_original} = 1;
1362 $self->{instantiate_time} = $cf::RUNTIME;
1363 $self->last_access ($cf::RUNTIME);
1364 $self->instantiate;
1312} 1365}
1313 1366
1314sub load_header { 1367sub load_header {
1315 my ($self) = @_; 1368 my ($self) = @_;
1316 1369
1317 if ($self->load_temp) { 1370 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1371 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1372 } else {
1324 $self->load_orig 1373 $self->load_header_orig
1325 or return; 1374 or return;
1326 1375 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1376 }
1332 1377
1333 1 1378 1
1334} 1379}
1335 1380
… …
1349 $map->{last_save} = $cf::RUNTIME; 1394 $map->{last_save} = $cf::RUNTIME;
1350 1395
1351 $map->load_header 1396 $map->load_header
1352 or return; 1397 or return;
1353 1398
1354 if ($map->should_reset) { 1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1400 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1401 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1402 $map->reset;
1358 undef $guard; 1403 undef $guard;
1359 $map = find $path 1404 return find $path;
1360 or return;
1361 } 1405 }
1362 1406
1363 $cf::MAP{$path} = $map 1407 $cf::MAP{$path} = $map
1364 } 1408 }
1365} 1409}
1410
1411sub pre_load { }
1412sub post_load { }
1366 1413
1367sub load { 1414sub load {
1368 my ($self) = @_; 1415 my ($self) = @_;
1369 1416
1417 local $self->{deny_reset} = 1; # loading can take a long time
1418
1370 my $path = $self->{path}; 1419 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1420 my $guard = cf::lock_acquire "map_load:$path";
1372 1421
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1422 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1423
1375 $self->in_memory (cf::MAP_LOADING); 1424 $self->in_memory (cf::MAP_LOADING);
1376 1425
1377 $self->alloc; 1426 $self->alloc;
1427
1428 $self->pre_load;
1429
1378 $self->_load_objects ($self->{load_path}, 1) 1430 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1431 or return;
1380 1432
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1434 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1456 unless $self->difficulty;
1405 Coro::cede; 1457 Coro::cede;
1406 $self->activate; 1458 $self->activate;
1407 } 1459 }
1408 1460
1461 $self->post_load;
1462
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1463 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1464}
1411 1465
1412sub customise_for { 1466sub customise_for {
1413 my ($self, $ob) = @_; 1467 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1531 delete $MAP_PREFETCH{$path};
1478 } 1532 }
1479 } 1533 }
1480 undef $MAP_PREFETCHER; 1534 undef $MAP_PREFETCHER;
1481 }; 1535 };
1536 $MAP_PREFETCHER->prio (6);
1482 1537
1483 () 1538 ()
1484} 1539}
1485 1540
1486sub save { 1541sub save {
… …
1556 return if $self->players; 1611 return if $self->players;
1557 return if $self->isa ("ext::map_per_player");#d# 1612 return if $self->isa ("ext::map_per_player");#d#
1558 1613
1559 warn "resetting map ", $self->path;#d# 1614 warn "resetting map ", $self->path;#d#
1560 1615
1616 $self->in_memory (cf::MAP_SWAPPED);
1617
1618 # need to save uniques path
1619 unless ($self->{deny_save}) {
1620 my $uniq = $self->uniq_path; utf8::encode $uniq;
1621
1622 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1623 if $uniq;
1624 }
1625
1561 delete $cf::MAP{$self->path}; 1626 delete $cf::MAP{$self->path};
1562 1627
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear; 1628 $self->clear;
1565 1629
1566 $_->clear_links_to ($self) for values %cf::MAP; 1630 $_->clear_links_to ($self) for values %cf::MAP;
1567 1631
1568 $self->unlink_save; 1632 $self->unlink_save;
… …
1605 for (@$files) { 1669 for (@$files) {
1606 utf8::decode $_; 1670 utf8::decode $_;
1607 next if /\.pst$/; 1671 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1672 next unless /^$PATH_SEP/o;
1609 1673
1610 s/\.map$//; 1674 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1675 }
1613 1676
1614 \@paths 1677 \@paths
1615} 1678}
1616 1679
… …
1710=cut 1773=cut
1711 1774
1712sub link_map { 1775sub link_map {
1713 unless ($LINK_MAP) { 1776 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1777 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1778 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1779 $LINK_MAP->load;
1717 } 1780 }
1718 1781
1719 $LINK_MAP 1782 $LINK_MAP
1720} 1783}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1790 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1791
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1793 if $self->map;
1731 1794
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1795 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1796}
1734 1797
1735sub cf::object::player::leave_link { 1798sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1799 my ($self, $map, $x, $y) = @_;
1737 1800
… …
1804 my ($self, $path, $x, $y) = @_; 1867 my ($self, $path, $x, $y) = @_;
1805 1868
1806 $self->enter_link; 1869 $self->enter_link;
1807 1870
1808 (async { 1871 (async {
1872 my $map = eval {
1809 my $map = cf::map::find $path; 1873 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1874 $map = $map->customise_for ($self) if $map;
1811 1875 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1876 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1878
1817 $self->leave_link ($map, $x, $y); 1879 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1880 })->prio (1);
1819} 1881}
1820 1882
… …
1851 # that depends on the exit object 1913 # that depends on the exit object
1852 1914
1853 my $rmp = parse_random_map_params $exit->msg; 1915 my $rmp = parse_random_map_params $exit->msg;
1854 1916
1855 if ($exit->map) { 1917 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1918 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1919 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1920 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1921 $rmp->{origin_y} = $exit->y;
1860 } 1922 }
1861 1923
… …
1878sub cf::object::player::enter_exit { 1940sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1941 my ($self, $exit) = @_;
1880 1942
1881 return unless $self->type == cf::PLAYER; 1943 return unless $self->type == cf::PLAYER;
1882 1944
1945 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job
1947 cf::sync_job { prepare_random_map $exit };
1948 }
1949
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp;
1953
1883 $self->enter_link; 1954 $self->enter_link;
1884 1955
1885 (async { 1956 (async {
1886 $self->deactivate_recursive; # just to be sure 1957 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1958 unless (eval {
1888 prepare_random_map $exit 1959 $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 1960
1894 1; 1961 1;
1895 }) { 1962 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1963 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1964 . "I'll try to bring you back to the map you were before. "
… …
1958 # get handled first 2025 # get handled first
1959 my $queue = delete $ns->{query_queue} 2026 my $queue = delete $ns->{query_queue}
1960 or return; # be conservative, not sure how that can happen, but we saw a crash here 2027 or return; # be conservative, not sure how that can happen, but we saw a crash here
1961 2028
1962 (shift @$queue)->[1]->($msg); 2029 (shift @$queue)->[1]->($msg);
2030 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2031
1964 push @{ $ns->{query_queue} }, @$queue; 2032 push @{ $ns->{query_queue} }, @$queue;
1965 2033
1966 if (@{ $ns->{query_queue} } == @$queue) { 2034 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2035 if (@$queue) {
… …
2128The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2129using it, it should be unique. 2197using it, it should be unique.
2130 2198
2131=over 4 2199=over 4
2132 2200
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 2201=item $value = cf::db_get $family => $key
2140 2202
2141Returns a single value from the database 2203Returns 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 2204
2148=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2149 2206
2150Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores 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 2208
2161=cut 2209=cut
2162 2210
2163our $DB; 2211our $DB;
2164 2212
2165{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2166 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2167 2232
2168 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2169 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2170 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2171 2237
2172 my $pid; 2238 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 } 2239 };
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 }, 2240 }
2220 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2221} 2258}
2222 2259
2223############################################################################# 2260#############################################################################
2224# the server's main() 2261# the server's init and main functions
2262
2263sub load_resources {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2265 or die "unable to load regions file\n";#d#
2266}
2225 2267
2226sub cfg_load { 2268sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2269 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2270 or return;
2229 2271
… …
2240 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2241 and die "WARNING: m(un)lockall failed: $!\n"; 2283 and die "WARNING: m(un)lockall failed: $!\n";
2242 }; 2284 };
2243 warn $@ if $@; 2285 warn $@ if $@;
2244 } 2286 }
2287}
2288
2289sub init {
2290 load_resources;
2245} 2291}
2246 2292
2247sub main { 2293sub main {
2248 # we must not ever block the main coroutine 2294 # we must not ever block the main coroutine
2249 local $Coro::idle = sub { 2295 local $Coro::idle = sub {
… …
2252 Event::one_event; 2298 Event::one_event;
2253 })->prio (Coro::PRIO_MAX); 2299 })->prio (Coro::PRIO_MAX);
2254 }; 2300 };
2255 2301
2256 cfg_load; 2302 cfg_load;
2257 db_load; 2303 db_init;
2258 load_extensions; 2304 load_extensions;
2259 2305
2260 $TICK_WATCHER->start; 2306 $TICK_WATCHER->start;
2261 Event::loop; 2307 Event::loop;
2262} 2308}
… …
2266 2312
2267# install some emergency cleanup handlers 2313# install some emergency cleanup handlers
2268BEGIN { 2314BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2315 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2316 Event->signal (
2317 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2318 data => WF_AUTOCANCEL,
2272 signal => $signal, 2319 signal => $signal,
2320 prio => 0,
2273 cb => sub { 2321 cb => sub {
2274 cf::cleanup "SIG$signal"; 2322 cf::cleanup "SIG$signal";
2275 }, 2323 },
2276 ); 2324 );
2277 } 2325 }
2278} 2326}
… …
2299 my $map = $cf::MAP{$path} or next; 2347 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2348 $map->valid or next;
2301 $map->save; 2349 $map->save;
2302 } 2350 }
2303 warn "end emergency map save\n"; 2351 warn "end emergency map save\n";
2352
2353 warn "begin emergency database checkpoint\n";
2354 BDB::db_env_txn_checkpoint $DB_ENV;
2355 warn "end emergency database checkpoint\n";
2304 }; 2356 };
2305 2357
2306 warn "leave emergency perl save\n"; 2358 warn "leave emergency perl save\n";
2359}
2360
2361sub post_cleanup {
2362 my ($make_core) = @_;
2363
2364 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core;
2307} 2366}
2308 2367
2309sub reload() { 2368sub reload() {
2310 # can/must only be called in main 2369 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2370 if ($Coro::current != $Coro::main) {
… …
2321 cf::emergency_save; 2380 cf::emergency_save;
2322 2381
2323 eval { 2382 eval {
2324 # if anything goes wrong in here, we should simply crash as we already saved 2383 # if anything goes wrong in here, we should simply crash as we already saved
2325 2384
2326 warn "syncing database to disk";
2327 cf::db_sync;
2328
2329 warn "cancelling all WF_AUTOCANCEL watchers"; 2385 warn "cancelling all WF_AUTOCANCEL watchers";
2330 for (Event::all_watchers) { 2386 for (Event::all_watchers) {
2331 $_->cancel if $_->data & WF_AUTOCANCEL; 2387 $_->cancel if $_->data & WF_AUTOCANCEL;
2332 } 2388 }
2333 2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392
2334 warn "flushing outstanding aio requests"; 2393 warn "flushing outstanding aio requests";
2335 for (;;) { 2394 for (;;) {
2395 BDB::flush;
2336 IO::AIO::flush; 2396 IO::AIO::flush;
2337 Coro::cede; 2397 Coro::cede;
2338 last unless IO::AIO::nreqs; 2398 last unless IO::AIO::nreqs || BDB::nreqs;
2339 warn "iterate..."; 2399 warn "iterate...";
2340 } 2400 }
2341 2401
2342 warn "cancelling all extension coros"; 2402 warn "cancelling all extension coros";
2343 $_->cancel for values %EXT_CORO; 2403 $_->cancel for values %EXT_CORO;
… …
2398 require cf; 2458 require cf;
2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400 2460
2401 warn "loading config and database again"; 2461 warn "loading config and database again";
2402 cf::cfg_load; 2462 cf::cfg_load;
2403 cf::db_load;
2404 2463
2405 warn "loading extensions"; 2464 warn "loading extensions";
2406 cf::load_extensions; 2465 cf::load_extensions;
2407 2466
2408 warn "reattaching attachments to objects/players"; 2467 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2468 _global_reattach;
2410 warn "reattaching attachments to maps"; 2469 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2470 reattach $_ for values %MAP;
2412 2471
2472 warn "loading reloadable resources";
2473 load_resources;
2474
2413 warn "restarting server ticker"; 2475 warn "restarting server ticker";
2414 2476
2415 $TICK_WATCHER->start; 2477 $TICK_WATCHER->start;
2416 }; 2478 };
2417 2479
… …
2433 $who->message ("reloading server."); 2495 $who->message ("reloading server.");
2434 2496
2435 # doing reload synchronously and two reloads happen back-to-back, 2497 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2498 # coro crashes during coro_state_free->destroy here.
2437 2499
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2439 reload; 2505 reload;
2440 undef $RELOAD_WATCHER; 2506 undef $RELOAD_WATCHER;
2507 },
2441 }); 2508 );
2442 } 2509 }
2443}; 2510};
2444 2511
2445unshift @INC, $LIBDIR; 2512unshift @INC, $LIBDIR;
2446 2513
… …
2466 $NEXT_TICK += $TICK; 2533 $NEXT_TICK += $TICK;
2467 2534
2468 $WAIT_FOR_TICK->broadcast; 2535 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2470 2537
2538 Event::sweep;
2539 Coro::cede_notself;
2540
2541# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d#
2543
2471 # if we are delayed by four ticks or more, skip them all 2544 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2546
2474 $TICK_WATCHER->at ($NEXT_TICK); 2547 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2548 $TICK_WATCHER->start;
2476 }, 2549 },
2477); 2550);
2478 2551
2552{
2553 BDB::max_poll_time $TICK * 0.1;
2554 $BDB_POLL_WATCHER = Event->io (
2555 reentrant => 0,
2556 fd => BDB::poll_fileno,
2557 poll => 'r',
2558 prio => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => \&BDB::poll_cb,
2561 );
2562 BDB::min_parallel 8;
2563
2564 BDB::set_sync_prepare {
2565 my $status;
2566 my $current = $Coro::current;
2567 (
2568 sub {
2569 $status = $!;
2570 $current->ready; undef $current;
2571 },
2572 sub {
2573 Coro::schedule while defined $current;
2574 $! = $status;
2575 },
2576 )
2577 };
2578
2579 unless ($DB_ENV) {
2580 $DB_ENV = BDB::db_env_create;
2581
2582 cf::sync_job {
2583 eval {
2584 BDB::db_env_open
2585 $DB_ENV,
2586 $BDB_ENV_DIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666;
2590
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2592
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect;
2595 };
2596
2597 cf::cleanup "db_env_open(db): $@" if $@;
2598 };
2599 }
2600}
2601
2602{
2603 IO::AIO::min_parallel 8;
2604
2605 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2606 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2607 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0,
2482 fd => IO::AIO::poll_fileno, 2609 fd => IO::AIO::poll_fileno,
2483 poll => 'r', 2610 poll => 'r',
2484 prio => 5, 2611 prio => 6,
2485 data => WF_AUTOCANCEL, 2612 data => WF_AUTOCANCEL,
2486 cb => \&IO::AIO::poll_cb, 2613 cb => \&IO::AIO::poll_cb,
2487); 2614 );
2615}
2488 2616
2489$WRITE_RUNTIME_WATCHER = Event->timer ( 2617$WRITE_RUNTIME_WATCHER = Event->timer (
2618 reentrant => 0,
2490 data => WF_AUTOCANCEL, 2619 data => WF_AUTOCANCEL,
2491 after => 1, 2620 after => 1,
2492 interval => 10, 2621 interval => 10,
2493 prio => 6, # keep it lowest so it acts like a watchdog 2622 prio => 6, # keep it lowest so it acts like a watchdog
2494 cb => Coro::unblock_sub { 2623 cb => Coro::unblock_sub {
2495 write_runtime 2624 write_runtime
2496 or warn "ERROR: unable to write runtime file: $!"; 2625 or warn "ERROR: unable to write runtime file: $!";
2497 }, 2626 },
2498); 2627);
2499 2628

Diff Legend

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