ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.187 by root, Sat Jan 20 21:06:52 2007 UTC vs.
Revision 1.223 by root, Sun Mar 11 02:12: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
… …
39our @EXTS = (); # list of extension package names 43our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 44our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 45our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 46our %EXT_MAP = (); # pluggable maps
43 47
48our $RELOAD; # number of reloads so far
44our @EVENT; 49our @EVENT;
45our $LIBDIR = datadir . "/ext"; 50our $LIBDIR = datadir . "/ext";
46 51
47our $TICK = MAX_TIME * 1e-6; 52our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 53our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 54our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 55our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 56our $NEXT_TICK;
52our $NOW; 57our $NOW;
58our $USE_FSYNC = 1; # use fsync to write maps - default off
59
60our $BDB_POLL_WATCHER;
61our $DB_ENV;
53 62
54our %CFG; 63our %CFG;
55 64
56our $UPTIME; $UPTIME ||= time; 65our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 66our $RUNTIME;
58 67
59our %PLAYER; # all users 68our %PLAYER; # all users
60our %MAP; # all maps 69our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 70our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random"; 71our $RANDOM_MAPS = cf::localdir . "/random";
72our $BDB_ENV_DIR = cf::localdir . "/db";
63 73
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 74our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 75our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 76
67# used to convert map paths into valid unix filenames by replacing / by ∕ 77# used to convert map paths into valid unix filenames by replacing / by ∕
… …
80mkdir cf::localdir; 90mkdir cf::localdir;
81mkdir cf::localdir . "/" . cf::playerdir; 91mkdir cf::localdir . "/" . cf::playerdir;
82mkdir cf::localdir . "/" . cf::tmpdir; 92mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 93mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 94mkdir $RANDOM_MAPS;
95mkdir $BDB_ENV_DIR;
85 96
86our $EMERGENCY_POSITION; 97our $EMERGENCY_POSITION;
98
99sub cf::map::normalise;
87 100
88############################################################################# 101#############################################################################
89 102
90=head2 GLOBAL VARIABLES 103=head2 GLOBAL VARIABLES
91 104
… …
261sub freeze_mainloop { 274sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 275 return unless $TICK_WATCHER->is_active;
263 276
264 my $guard = Coro::guard { 277 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 278 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 279 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 280 $TICK_WATCHER->stop;
270 $guard 281 $guard
271} 282}
272 283
273=item cf::async { BLOCK } 284=item cf::async { BLOCK }
… …
344 355
345 $coro 356 $coro
346} 357}
347 358
348sub write_runtime { 359sub write_runtime {
360 my $guard = cf::lock_acquire "write_runtime";
361
349 my $runtime = cf::localdir . "/runtime"; 362 my $runtime = cf::localdir . "/runtime";
350 363
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 364 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
352 or return; 365 or return;
353 366
… …
356 # 60 allows for the watchdog to kill the server. 369 # 60 allows for the watchdog to kill the server.
357 370
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 371 (aio_write $fh, 0, (length $value), $value, 0) <= 0
359 and return; 372 and return;
360 373
374 # always fsync - this file is important
361 aio_fsync $fh 375 aio_fsync $fh
362 and return; 376 and return;
363 377
364 close $fh 378 close $fh
365 or return; 379 or return;
… …
750 $filename, length $$rdata, scalar @$objs; 764 $filename, length $$rdata, scalar @$objs;
751 765
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 766 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 767 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 768 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 769 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 770 close $fh;
757 771
758 if (@$objs) { 772 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 773 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 774 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 775 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 776 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 777 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 778 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 779 aio_rename "$filename.pst~", "$filename.pst";
766 } 780 }
767 } else { 781 } else {
768 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
… …
1017=cut 1031=cut
1018 1032
1019sub quit_character { 1033sub quit_character {
1020 my ($pl) = @_; 1034 my ($pl) = @_;
1021 1035
1036 my $name = $pl->ob->name;
1037
1022 $pl->{deny_save} = 1; 1038 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1039 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1040
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1041 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1026 $pl->deactivate; 1042 $pl->deactivate;
… …
1030 my $path = playerdir $pl; 1046 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1047 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1048 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1049 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1050 $pl->destroy;
1051
1052 my $prefix = qr<^~\Q$name\E/>;
1053
1054 # nuke player maps
1055 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1056
1035 IO::AIO::aio_rmtree $temp; 1057 IO::AIO::aio_rmtree $temp;
1058}
1059
1060=item $pl->kick
1061
1062Kicks a player out of the game. This destroys the connection.
1063
1064=cut
1065
1066sub kick {
1067 my ($pl, $kicker) = @_;
1068
1069 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1070 $pl->killer ("kicked");
1071 $pl->ns->destroy;
1036} 1072}
1037 1073
1038=item cf::player::list_logins 1074=item cf::player::list_logins
1039 1075
1040Returns am arrayref of all valid playernames in the system, can take a 1076Returns am arrayref of all valid playernames in the system, can take a
… …
1068=cut 1104=cut
1069 1105
1070sub maps($) { 1106sub maps($) {
1071 my ($pl) = @_; 1107 my ($pl) = @_;
1072 1108
1109 $pl = ref $pl ? $pl->ob->name : $pl;
1110
1073 my $files = aio_readdir playerdir $pl 1111 my $files = aio_readdir playerdir $pl
1074 or return; 1112 or return;
1075 1113
1076 my @paths; 1114 my @paths;
1077 1115
1078 for (@$files) { 1116 for (@$files) {
1079 utf8::decode $_; 1117 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1118 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1119 next unless /^$PATH_SEP/o;
1082 1120
1083 s/\.map$//; 1121 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1122 }
1086 1123
1087 \@paths 1124 \@paths
1088} 1125}
1089 1126
… …
1176} 1213}
1177 1214
1178sub normalise { 1215sub normalise {
1179 my ($path, $base) = @_; 1216 my ($path, $base) = @_;
1180 1217
1218 $path = "$path"; # make sure its a string
1219
1220 $path =~ s/\.map$//;
1221
1181 # map plan: 1222 # map plan:
1182 # 1223 #
1183 # /! non-realised random map exit (special hack!) 1224 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched 1225 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths 1226 # ?xxx/... are special absolute paths
… …
1221 $self->init; # pass $1 etc. 1262 $self->init; # pass $1 etc.
1222 return $self; 1263 return $self;
1223 } 1264 }
1224 } 1265 }
1225 1266
1226 Carp::carp "unable to resolve path '$path'."; 1267 Carp::carp "unable to resolve path '$path' (base '$base').";
1227 () 1268 ()
1228} 1269}
1229 1270
1230sub init { 1271sub init {
1231 my ($self) = @_; 1272 my ($self) = @_;
… …
1246 1287
1247# the original (read-only) location 1288# the original (read-only) location
1248sub load_path { 1289sub load_path {
1249 my ($self) = @_; 1290 my ($self) = @_;
1250 1291
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1292 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1252} 1293}
1253 1294
1254# the temporary/swap location 1295# the temporary/swap location
1255sub save_path { 1296sub save_path {
1256 my ($self) = @_; 1297 my ($self) = @_;
1257 1298
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1299 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1300 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1260} 1301}
1261 1302
1262# the unique path, undef == no special unique path 1303# the unique path, undef == no special unique path
1263sub uniq_path { 1304sub uniq_path {
1264 my ($self) = @_; 1305 my ($self) = @_;
… …
1286 1327
1287sub load_header_from($) { 1328sub load_header_from($) {
1288 my ($self, $path) = @_; 1329 my ($self, $path) = @_;
1289 1330
1290 utf8::encode $path; 1331 utf8::encode $path;
1291 aio_open $path, O_RDONLY, 0 1332 #aio_open $path, O_RDONLY, 0
1292 or return; 1333 # or return;
1293 1334
1294 $self->_load_header ($path) 1335 $self->_load_header ($path)
1295 or return; 1336 or return;
1296 1337
1297 $self->{load_path} = $path; 1338 $self->{load_path} = $path;
1298 1339
1299 1 1340 1
1300} 1341}
1301 1342
1302sub load_orig { 1343sub load_header_orig {
1303 my ($self) = @_; 1344 my ($self) = @_;
1304 1345
1305 $self->load_header_from ($self->load_path) 1346 $self->load_header_from ($self->load_path)
1306} 1347}
1307 1348
1308sub load_temp { 1349sub load_header_temp {
1309 my ($self) = @_; 1350 my ($self) = @_;
1310 1351
1311 $self->load_header_from ($self->save_path) 1352 $self->load_header_from ($self->save_path)
1353}
1354
1355sub prepare_temp {
1356 my ($self) = @_;
1357
1358 $self->last_access ((delete $self->{last_access})
1359 || $cf::RUNTIME); #d#
1360 # safety
1361 $self->{instantiate_time} = $cf::RUNTIME
1362 if $self->{instantiate_time} > $cf::RUNTIME;
1363}
1364
1365sub prepare_orig {
1366 my ($self) = @_;
1367
1368 $self->{load_original} = 1;
1369 $self->{instantiate_time} = $cf::RUNTIME;
1370 $self->last_access ($cf::RUNTIME);
1371 $self->instantiate;
1312} 1372}
1313 1373
1314sub load_header { 1374sub load_header {
1315 my ($self) = @_; 1375 my ($self) = @_;
1316 1376
1317 if ($self->load_temp) { 1377 if ($self->load_header_temp) {
1318 $self->last_access ((delete $self->{last_access}) 1378 $self->prepare_temp;
1319 || $cf::RUNTIME); #d#
1320 # safety
1321 $self->{instantiate_time} = $cf::RUNTIME
1322 if $self->{instantiate_time} > $cf::RUNTIME;
1323 } else { 1379 } else {
1324 $self->load_orig 1380 $self->load_header_orig
1325 or return; 1381 or return;
1326 1382 $self->prepare_orig;
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331 } 1383 }
1332 1384
1333 1 1385 1
1334} 1386}
1335 1387
… …
1349 $map->{last_save} = $cf::RUNTIME; 1401 $map->{last_save} = $cf::RUNTIME;
1350 1402
1351 $map->load_header 1403 $map->load_header
1352 or return; 1404 or return;
1353 1405
1354 if ($map->should_reset) { 1406 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?)
1355 # doing this can freeze the server in a sync job, obviously 1407 # doing this can freeze the server in a sync job, obviously
1356 #$cf::WAIT_FOR_TICK->wait; 1408 #$cf::WAIT_FOR_TICK->wait;
1357 $map->reset; 1409 $map->reset;
1358 undef $guard; 1410 undef $guard;
1359 $map = find $path 1411 return find $path;
1360 or return;
1361 } 1412 }
1362 1413
1363 $cf::MAP{$path} = $map 1414 $cf::MAP{$path} = $map
1364 } 1415 }
1365} 1416}
1417
1418sub pre_load { }
1419sub post_load { }
1366 1420
1367sub load { 1421sub load {
1368 my ($self) = @_; 1422 my ($self) = @_;
1369 1423
1424 local $self->{deny_reset} = 1; # loading can take a long time
1425
1370 my $path = $self->{path}; 1426 my $path = $self->{path};
1371 my $guard = cf::lock_acquire "map_load:$path"; 1427 my $guard = cf::lock_acquire "map_load:$path";
1372 1428
1373 return if $self->in_memory != cf::MAP_SWAPPED; 1429 return if $self->in_memory != cf::MAP_SWAPPED;
1374 1430
1375 $self->in_memory (cf::MAP_LOADING); 1431 $self->in_memory (cf::MAP_LOADING);
1376 1432
1377 $self->alloc; 1433 $self->alloc;
1434
1435 $self->pre_load;
1436
1378 $self->_load_objects ($self->{load_path}, 1) 1437 $self->_load_objects ($self->{load_path}, 1)
1379 or return; 1438 or return;
1380 1439
1381 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1440 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1382 if delete $self->{load_original}; 1441 if delete $self->{load_original};
… …
1404 unless $self->difficulty; 1463 unless $self->difficulty;
1405 Coro::cede; 1464 Coro::cede;
1406 $self->activate; 1465 $self->activate;
1407 } 1466 }
1408 1467
1468 $self->post_load;
1469
1409 $self->in_memory (cf::MAP_IN_MEMORY); 1470 $self->in_memory (cf::MAP_IN_MEMORY);
1410} 1471}
1411 1472
1412sub customise_for { 1473sub customise_for {
1413 my ($self, $ob) = @_; 1474 my ($self, $ob) = @_;
… …
1477 delete $MAP_PREFETCH{$path}; 1538 delete $MAP_PREFETCH{$path};
1478 } 1539 }
1479 } 1540 }
1480 undef $MAP_PREFETCHER; 1541 undef $MAP_PREFETCHER;
1481 }; 1542 };
1543 $MAP_PREFETCHER->prio (6);
1482 1544
1483 () 1545 ()
1484} 1546}
1485 1547
1486sub save { 1548sub save {
… …
1556 return if $self->players; 1618 return if $self->players;
1557 return if $self->isa ("ext::map_per_player");#d# 1619 return if $self->isa ("ext::map_per_player");#d#
1558 1620
1559 warn "resetting map ", $self->path;#d# 1621 warn "resetting map ", $self->path;#d#
1560 1622
1623 $self->in_memory (cf::MAP_SWAPPED);
1624
1625 # need to save uniques path
1626 unless ($self->{deny_save}) {
1627 my $uniq = $self->uniq_path; utf8::encode $uniq;
1628
1629 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1630 if $uniq;
1631 }
1632
1561 delete $cf::MAP{$self->path}; 1633 delete $cf::MAP{$self->path};
1562 1634
1563 $self->in_memory (cf::MAP_SWAPPED);
1564 $self->clear; 1635 $self->clear;
1565 1636
1566 $_->clear_links_to ($self) for values %cf::MAP; 1637 $_->clear_links_to ($self) for values %cf::MAP;
1567 1638
1568 $self->unlink_save; 1639 $self->unlink_save;
… …
1605 for (@$files) { 1676 for (@$files) {
1606 utf8::decode $_; 1677 utf8::decode $_;
1607 next if /\.pst$/; 1678 next if /\.pst$/;
1608 next unless /^$PATH_SEP/o; 1679 next unless /^$PATH_SEP/o;
1609 1680
1610 s/\.map$//; 1681 push @paths, cf::map::normalise $_;
1611 push @paths, $_;
1612 } 1682 }
1613 1683
1614 \@paths 1684 \@paths
1615} 1685}
1616 1686
… …
1710=cut 1780=cut
1711 1781
1712sub link_map { 1782sub link_map {
1713 unless ($LINK_MAP) { 1783 unless ($LINK_MAP) {
1714 $LINK_MAP = cf::map::find "{link}" 1784 $LINK_MAP = cf::map::find "{link}"
1715 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 1785 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1716 $LINK_MAP->load; 1786 $LINK_MAP->load;
1717 } 1787 }
1718 1788
1719 $LINK_MAP 1789 $LINK_MAP
1720} 1790}
… …
1727 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1797 return if UNIVERSAL::isa $self->map, "ext::map_link";
1728 1798
1729 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1730 if $self->map; 1800 if $self->map;
1731 1801
1732 $self->enter_map ($LINK_MAP || link_map, 20, 20); 1802 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1733} 1803}
1734 1804
1735sub cf::object::player::leave_link { 1805sub cf::object::player::leave_link {
1736 my ($self, $map, $x, $y) = @_; 1806 my ($self, $map, $x, $y) = @_;
1737 1807
… …
1759 $map->load; 1829 $map->load;
1760 $map->load_diag; 1830 $map->load_diag;
1761 1831
1762 return unless $self->contr->active; 1832 return unless $self->contr->active;
1763 $self->activate_recursive; 1833 $self->activate_recursive;
1834
1835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1764 $self->enter_map ($map, $x, $y); 1836 $self->enter_map ($map, $x, $y);
1765} 1837}
1766 1838
1767cf::player->attach ( 1839cf::player->attach (
1768 on_logout => sub { 1840 on_logout => sub {
… …
1781 # try to abort aborted map switching on player login :) 1853 # try to abort aborted map switching on player login :)
1782 # should happen only on crashes 1854 # should happen only on crashes
1783 if ($pl->ob->{_link_pos}) { 1855 if ($pl->ob->{_link_pos}) {
1784 $pl->ob->enter_link; 1856 $pl->ob->enter_link;
1785 (async { 1857 (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, 1858 $pl->ob->reply (undef,
1789 "There was an internal problem at your last logout, " 1859 "There was an internal problem at your last logout, "
1790 . "the server will try to bring you to your intended destination in a second.", 1860 . "the server will try to bring you to your intended destination in a second.",
1791 cf::NDI_RED); 1861 cf::NDI_RED);
1862 # we need this sleep as the login has a concurrent enter_exit running
1863 # and this sleep increases chances of the player not ending up in scorn
1792 Coro::Timer::sleep 1; 1864 Coro::Timer::sleep 1;
1793 $pl->ob->leave_link; 1865 $pl->ob->leave_link;
1794 })->prio (2); 1866 })->prio (2);
1795 } 1867 }
1796 }, 1868 },
… …
1804 my ($self, $path, $x, $y) = @_; 1876 my ($self, $path, $x, $y) = @_;
1805 1877
1806 $self->enter_link; 1878 $self->enter_link;
1807 1879
1808 (async { 1880 (async {
1881 my $map = eval {
1809 my $map = cf::map::find $path; 1882 my $map = cf::map::find $path;
1810 $map = $map->customise_for ($self) if $map; 1883 $map = $map->customise_for ($self) if $map;
1811 1884 $map
1812# warn "entering ", $map->path, " at ($x, $y)\n" 1885 } or
1813# if $map;
1814
1815 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1886 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1816 1887
1817 $self->leave_link ($map, $x, $y); 1888 $self->leave_link ($map, $x, $y);
1818 })->prio (1); 1889 })->prio (1);
1819} 1890}
1820 1891
… …
1851 # that depends on the exit object 1922 # that depends on the exit object
1852 1923
1853 my $rmp = parse_random_map_params $exit->msg; 1924 my $rmp = parse_random_map_params $exit->msg;
1854 1925
1855 if ($exit->map) { 1926 if ($exit->map) {
1856 $rmp->{region} = $exit->map->region_name; 1927 $rmp->{region} = $exit->region->name;
1857 $rmp->{origin_map} = $exit->map->path; 1928 $rmp->{origin_map} = $exit->map->path;
1858 $rmp->{origin_x} = $exit->x; 1929 $rmp->{origin_x} = $exit->x;
1859 $rmp->{origin_y} = $exit->y; 1930 $rmp->{origin_y} = $exit->y;
1860 } 1931 }
1861 1932
… …
1878sub cf::object::player::enter_exit { 1949sub cf::object::player::enter_exit {
1879 my ($self, $exit) = @_; 1950 my ($self, $exit) = @_;
1880 1951
1881 return unless $self->type == cf::PLAYER; 1952 return unless $self->type == cf::PLAYER;
1882 1953
1954 if ($exit->slaying eq "/!") {
1955 #TODO: this should de-fi-ni-te-ly not be a sync-job
1956 cf::sync_job { prepare_random_map $exit };
1957 }
1958
1959 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1960 my $hp = $exit->stats->hp;
1961 my $sp = $exit->stats->sp;
1962
1883 $self->enter_link; 1963 $self->enter_link;
1884 1964
1885 (async { 1965 (async {
1886 $self->deactivate_recursive; # just to be sure 1966 $self->deactivate_recursive; # just to be sure
1887 unless (eval { 1967 unless (eval {
1888 prepare_random_map $exit 1968 $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 1969
1894 1; 1970 1;
1895 }) { 1971 }) {
1896 $self->message ("Something went wrong deep within the crossfire server. " 1972 $self->message ("Something went wrong deep within the crossfire server. "
1897 . "I'll try to bring you back to the map you were before. " 1973 . "I'll try to bring you back to the map you were before. "
… …
1958 # get handled first 2034 # get handled first
1959 my $queue = delete $ns->{query_queue} 2035 my $queue = delete $ns->{query_queue}
1960 or return; # be conservative, not sure how that can happen, but we saw a crash here 2036 or return; # be conservative, not sure how that can happen, but we saw a crash here
1961 2037
1962 (shift @$queue)->[1]->($msg); 2038 (shift @$queue)->[1]->($msg);
2039 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1963 2040
1964 push @{ $ns->{query_queue} }, @$queue; 2041 push @{ $ns->{query_queue} }, @$queue;
1965 2042
1966 if (@{ $ns->{query_queue} } == @$queue) { 2043 if (@{ $ns->{query_queue} } == @$queue) {
1967 if (@$queue) { 2044 if (@$queue) {
… …
2128The parameter C<$family> should best start with the name of the extension 2205The parameter C<$family> should best start with the name of the extension
2129using it, it should be unique. 2206using it, it should be unique.
2130 2207
2131=over 4 2208=over 4
2132 2209
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 2210=item $value = cf::db_get $family => $key
2140 2211
2141Returns a single value from the database 2212Returns 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 2213
2148=item cf::db_put $family => $key => $value 2214=item cf::db_put $family => $key => $value
2149 2215
2150Stores the given C<$value> in the family hash. Updates are delayed, if you 2216Stores 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 2217
2161=cut 2218=cut
2162 2219
2163our $DB; 2220our $DB;
2164 2221
2165{ 2222sub db_init {
2223 unless ($DB) {
2224 $DB = BDB::db_create $DB_ENV;
2225
2226 cf::sync_job {
2227 eval {
2228 $DB->set_flags (BDB::CHKSUM);
2229
2230 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2231 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2232 cf::cleanup "db_open(db): $!" if $!;
2233 };
2234 cf::cleanup "db_open(db): $@" if $@;
2235 };
2236
2166 my $path = cf::localdir . "/database.pst"; 2237 my $path = cf::localdir . "/database.pst";
2238 if (stat $path) {
2239 cf::sync_job {
2240 my $pst = Storable::retrieve $path;
2167 2241
2168 sub db_load() { 2242 cf::db_put (board => data => $pst->{board});
2169 $DB = stat $path ? Storable::retrieve $path : { }; 2243 cf::db_put (guildrules => data => $pst->{guildrules});
2170 } 2244 cf::db_put (rent => balance => $pst->{rent}{balance});
2245 BDB::db_env_txn_checkpoint $DB_ENV;
2171 2246
2172 my $pid; 2247 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 } 2248 };
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 }, 2249 }
2220 ); 2250 }
2251}
2252
2253sub db_get($$) {
2254 my $key = "$_[0]/$_[1]";
2255
2256 cf::sync_job {
2257 BDB::db_get $DB, undef, $key, my $data;
2258
2259 $! ? ()
2260 : Compress::LZF::sthaw $data
2261 }
2262}
2263
2264sub db_put($$$) {
2265 BDB::dbreq_pri 4;
2266 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2221} 2267}
2222 2268
2223############################################################################# 2269#############################################################################
2224# the server's main() 2270# the server's init and main functions
2271
2272sub load_faces {
2273 my $path = sprintf "%s/faces", cf::datadir;
2274
2275 warn "loading faces from $path\n";
2276
2277 my $faces;
2278 0 < aio_load $path, $faces
2279 or die "$path: $!";
2280
2281 Coro::cede;
2282 $faces = Storable::thaw $faces;
2283 Coro::cede;
2284
2285 while (my ($face, $info) = each %$faces) {
2286 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2287 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2288 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2289 Coro::cede;
2290 }
2291
2292 1
2293}
2294
2295sub reload_resources {
2296 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2297 or die "unable to load regions file\n";#d#
2298 load_faces
2299 or die "unable to load faces\n";#d#
2300}
2301
2302sub init {
2303 reload_resources;
2304}
2225 2305
2226sub cfg_load { 2306sub cfg_load {
2227 open my $fh, "<:utf8", cf::confdir . "/config" 2307 open my $fh, "<:utf8", cf::confdir . "/config"
2228 or return; 2308 or return;
2229 2309
… …
2252 Event::one_event; 2332 Event::one_event;
2253 })->prio (Coro::PRIO_MAX); 2333 })->prio (Coro::PRIO_MAX);
2254 }; 2334 };
2255 2335
2256 cfg_load; 2336 cfg_load;
2257 db_load; 2337 db_init;
2258 load_extensions; 2338 load_extensions;
2259 2339
2260 $TICK_WATCHER->start; 2340 $TICK_WATCHER->start;
2261 Event::loop; 2341 Event::loop;
2262} 2342}
… …
2266 2346
2267# install some emergency cleanup handlers 2347# install some emergency cleanup handlers
2268BEGIN { 2348BEGIN {
2269 for my $signal (qw(INT HUP TERM)) { 2349 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal ( 2350 Event->signal (
2351 reentrant => 0,
2271 data => WF_AUTOCANCEL, 2352 data => WF_AUTOCANCEL,
2272 signal => $signal, 2353 signal => $signal,
2354 prio => 0,
2273 cb => sub { 2355 cb => sub {
2274 cf::cleanup "SIG$signal"; 2356 cf::cleanup "SIG$signal";
2275 }, 2357 },
2276 ); 2358 );
2277 } 2359 }
2278} 2360}
… …
2299 my $map = $cf::MAP{$path} or next; 2381 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next; 2382 $map->valid or next;
2301 $map->save; 2383 $map->save;
2302 } 2384 }
2303 warn "end emergency map save\n"; 2385 warn "end emergency map save\n";
2386
2387 warn "begin emergency database checkpoint\n";
2388 BDB::db_env_txn_checkpoint $DB_ENV;
2389 warn "end emergency database checkpoint\n";
2304 }; 2390 };
2305 2391
2306 warn "leave emergency perl save\n"; 2392 warn "leave emergency perl save\n";
2393}
2394
2395sub post_cleanup {
2396 my ($make_core) = @_;
2397
2398 warn Carp::longmess "post_cleanup backtrace"
2399 if $make_core;
2307} 2400}
2308 2401
2309sub reload() { 2402sub reload() {
2310 # can/must only be called in main 2403 # can/must only be called in main
2311 if ($Coro::current != $Coro::main) { 2404 if ($Coro::current != $Coro::main) {
… …
2313 return; 2406 return;
2314 } 2407 }
2315 2408
2316 warn "reloading..."; 2409 warn "reloading...";
2317 2410
2318 warn "cancelling server ticker"; 2411 warn "entering sync_job";
2319 $TICK_WATCHER->cancel;
2320 2412
2413 cf::sync_job {
2414 cf::write_runtime; # external watchdog should not bark
2321 cf::emergency_save; 2415 cf::emergency_save;
2416 cf::write_runtime; # external watchdog should not bark
2322 2417
2323 eval { 2418 warn "syncing database to disk";
2419 BDB::db_env_txn_checkpoint $DB_ENV;
2420
2324 # if anything goes wrong in here, we should simply crash as we already saved 2421 # 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 2422
2329 warn "cancelling all WF_AUTOCANCEL watchers"; 2423 warn "cancelling all WF_AUTOCANCEL watchers";
2330 for (Event::all_watchers) { 2424 for (Event::all_watchers) {
2331 $_->cancel if $_->data & WF_AUTOCANCEL; 2425 $_->cancel if $_->data & WF_AUTOCANCEL;
2332 } 2426 }
2333 2427
2334 warn "flushing outstanding aio requests"; 2428 warn "flushing outstanding aio requests";
2335 for (;;) { 2429 for (;;) {
2430 BDB::flush;
2336 IO::AIO::flush; 2431 IO::AIO::flush;
2337 Coro::cede; 2432 Coro::cede;
2338 last unless IO::AIO::nreqs; 2433 last unless IO::AIO::nreqs || BDB::nreqs;
2339 warn "iterate..."; 2434 warn "iterate...";
2340 } 2435 }
2436
2437 ++$RELOAD;
2341 2438
2342 warn "cancelling all extension coros"; 2439 warn "cancelling all extension coros";
2343 $_->cancel for values %EXT_CORO; 2440 $_->cancel for values %EXT_CORO;
2344 %EXT_CORO = (); 2441 %EXT_CORO = ();
2345 2442
… …
2398 require cf; 2495 require cf;
2399 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2496 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2400 2497
2401 warn "loading config and database again"; 2498 warn "loading config and database again";
2402 cf::cfg_load; 2499 cf::cfg_load;
2403 cf::db_load;
2404 2500
2405 warn "loading extensions"; 2501 warn "loading extensions";
2406 cf::load_extensions; 2502 cf::load_extensions;
2407 2503
2408 warn "reattaching attachments to objects/players"; 2504 warn "reattaching attachments to objects/players";
2409 _global_reattach; 2505 _global_reattach; # objects, sockets
2410 warn "reattaching attachments to maps"; 2506 warn "reattaching attachments to maps";
2411 reattach $_ for values %MAP; 2507 reattach $_ for values %MAP;
2508 warn "reattaching attachments to players";
2509 reattach $_ for values %PLAYER;
2412 2510
2413 warn "restarting server ticker"; 2511 warn "loading reloadable resources";
2512 reload_resources;
2414 2513
2415 $TICK_WATCHER->start; 2514 warn "leaving sync_job";
2416 };
2417 2515
2418 if ($@) { 2516 1
2517 } or do {
2419 warn $@; 2518 warn $@;
2420 warn "error while reloading, exiting."; 2519 warn "error while reloading, exiting.";
2421 exit 1; 2520 exit 1;
2422 } 2521 };
2423 2522
2424 warn "reloaded"; 2523 warn "reloaded";
2425}; 2524};
2426 2525
2427our $RELOAD_WATCHER; # used only during reload 2526our $RELOAD_WATCHER; # used only during reload
… …
2433 $who->message ("reloading server."); 2532 $who->message ("reloading server.");
2434 2533
2435 # doing reload synchronously and two reloads happen back-to-back, 2534 # doing reload synchronously and two reloads happen back-to-back,
2436 # coro crashes during coro_state_free->destroy here. 2535 # coro crashes during coro_state_free->destroy here.
2437 2536
2438 $RELOAD_WATCHER ||= Event->timer (after => 0, data => WF_AUTOCANCEL, cb => sub { 2537 $RELOAD_WATCHER ||= Event->timer (
2538 reentrant => 0,
2539 after => 0,
2540 data => WF_AUTOCANCEL,
2541 cb => sub {
2439 reload; 2542 reload;
2440 undef $RELOAD_WATCHER; 2543 undef $RELOAD_WATCHER;
2544 },
2441 }); 2545 );
2442 } 2546 }
2443}; 2547};
2444 2548
2445unshift @INC, $LIBDIR; 2549unshift @INC, $LIBDIR;
2446 2550
… …
2463 2567
2464 cf::server_tick; # one server iteration 2568 cf::server_tick; # one server iteration
2465 $RUNTIME += $TICK; 2569 $RUNTIME += $TICK;
2466 $NEXT_TICK += $TICK; 2570 $NEXT_TICK += $TICK;
2467 2571
2572 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2573 $NEXT_RUNTIME_WRITE = $NOW + 10;
2574 Coro::async_pool {
2575 write_runtime
2576 or warn "ERROR: unable to write runtime file: $!";
2577 };
2578 }
2579
2468 $WAIT_FOR_TICK->broadcast; 2580 $WAIT_FOR_TICK->broadcast;
2469 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2581 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2582
2583# my $AFTER = Event::time;
2584# warn $AFTER - $NOW;#d#
2470 2585
2471 # if we are delayed by four ticks or more, skip them all 2586 # if we are delayed by four ticks or more, skip them all
2472 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2587 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2473 2588
2474 $TICK_WATCHER->at ($NEXT_TICK); 2589 $TICK_WATCHER->at ($NEXT_TICK);
2475 $TICK_WATCHER->start; 2590 $TICK_WATCHER->start;
2476 }, 2591 },
2477); 2592);
2478 2593
2594{
2595 BDB::max_poll_time $TICK * 0.1;
2596 $BDB_POLL_WATCHER = Event->io (
2597 reentrant => 0,
2598 fd => BDB::poll_fileno,
2599 poll => 'r',
2600 prio => 0,
2601 data => WF_AUTOCANCEL,
2602 cb => \&BDB::poll_cb,
2603 );
2604 BDB::min_parallel 8;
2605
2606 BDB::set_sync_prepare {
2607 my $status;
2608 my $current = $Coro::current;
2609 (
2610 sub {
2611 $status = $!;
2612 $current->ready; undef $current;
2613 },
2614 sub {
2615 Coro::schedule while defined $current;
2616 $! = $status;
2617 },
2618 )
2619 };
2620
2621 unless ($DB_ENV) {
2622 $DB_ENV = BDB::db_env_create;
2623
2624 cf::sync_job {
2625 eval {
2626 BDB::db_env_open
2627 $DB_ENV,
2628 $BDB_ENV_DIR,
2629 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2630 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2631 0666;
2632
2633 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2634
2635 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2636 $DB_ENV->set_lk_detect;
2637 };
2638
2639 cf::cleanup "db_env_open(db): $@" if $@;
2640 };
2641 }
2642}
2643
2644{
2645 IO::AIO::min_parallel 8;
2646
2647 undef $Coro::AIO::WATCHER;
2479IO::AIO::max_poll_time $TICK * 0.2; 2648 IO::AIO::max_poll_time $TICK * 0.1;
2480
2481$AIO_POLL_WATCHER = Event->io ( 2649 $AIO_POLL_WATCHER = Event->io (
2482 fd => IO::AIO::poll_fileno, 2650 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, 2651 data => WF_AUTOCANCEL,
2491 after => 1, 2652 fd => IO::AIO::poll_fileno,
2492 interval => 10, 2653 poll => 'r',
2493 prio => 6, # keep it lowest so it acts like a watchdog 2654 prio => 6,
2494 cb => Coro::unblock_sub { 2655 cb => \&IO::AIO::poll_cb,
2495 write_runtime 2656 );
2496 or warn "ERROR: unable to write runtime file: $!"; 2657}
2497 },
2498);
2499 2658
2500END { cf::emergency_save } 2659END { cf::emergency_save }
2501 2660
25021 26611
2503 2662

Diff Legend

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