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.225 by root, Wed Mar 14 00:04:58 2007 UTC

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

Diff Legend

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