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.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $SLOT_QUEUE;
346 356
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
349 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
350 362
351 while () { 363 while () {
352 next_job: 364 next_job:
353 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
361 } 373 }
362 } 374 }
363 } 375 }
364 376
365 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 380 $signal->wait;
369 } else { 381 } else {
370 Coro::schedule; 382 Coro::schedule;
371 } 383 }
… …
415 my $time = Event::time; 427 my $time = Event::time;
416 428
417 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
419 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
420 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 435 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
423 437
424 my $busy = 1; 438 my $busy = 1;
425 my @res; 439 my @res;
426 440
427 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 443 @res = eval { $job->() };
429 warn $@ if $@; 444 warn $@ if $@;
430 undef $busy; 445 undef $busy;
431 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
432 447
… …
481sub fork_call(&@) { 496sub fork_call(&@) {
482 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
483 498
484 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
487 502
488 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
489 reset_signals; 504 reset_signals;
490 &$cb 505 &$cb
491 }, @args; 506 }, @args;
… …
500=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
501 516
502Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
505=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
506 543
507our $DB; 544our $DB;
508 545
509sub db_init { 546sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 547 cf::sync_job {
514 eval { 548 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 549 };
524} 550}
525 551
526sub db_get($$) { 552sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
528 554
… …
940 966
941=cut 967=cut
942 968
943############################################################################# 969#############################################################################
944# object support 970# object support
945#
946 971
972sub _object_equal($$);
973sub _object_equal($$) {
974 my ($a, $b) = @_;
975
976 return 0 unless (ref $a) eq (ref $b);
977
978 if ("HASH" eq ref $a) {
979 my @ka = keys %$a;
980 my @kb = keys %$b;
981
982 return 0 if @ka != @kb;
983
984 for (0 .. $#ka) {
985 return 0 unless $ka[$_] eq $kb[$_];
986 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
987 }
988
989 } elsif ("ARRAY" eq ref $a) {
990
991 return 0 if @$a != @$b;
992
993 for (0 .. $#$a) {
994 return 0 unless _object_equal $a->[$_], $b->[$_];
995 }
996
997 } elsif ($a ne $b) {
998 return 0;
999 }
1000
1001 1
1002}
1003
1004our $SLOW_MERGES;#d#
947sub _can_merge { 1005sub _can_merge {
948 my ($ob1, $ob2) = @_; 1006 my ($ob1, $ob2) = @_;
949 1007
950 local $Storable::canonical = 1; 1008 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1009
954 $fob1 eq $fob2 1010 # we do the slow way here
1011 return _object_equal $ob1, $ob2
955} 1012}
956 1013
957sub reattach { 1014sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1015 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1016 my ($obj) = @_;
… …
1007sub object_freezer_save { 1064sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1065 my ($filename, $rdata, $objs) = @_;
1009 1066
1010 sync_job { 1067 sync_job {
1011 if (length $$rdata) { 1068 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1070 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1071 $decname, length $$rdata, scalar @$objs;
1014 1072
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1074 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1076 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1077 close $fh;
1020 1078
1021 if (@$objs) { 1079 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1081 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1083 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1084 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1085 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1086 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1087 }
… …
1037 } 1095 }
1038 } else { 1096 } else {
1039 aio_unlink $filename; 1097 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1098 aio_unlink "$filename.pst";
1041 } 1099 }
1042 } 1100 };
1043} 1101}
1044 1102
1045sub object_freezer_as_string { 1103sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1104 my ($rdata, $objs) = @_;
1047 1105
… …
1059 or return; 1117 or return;
1060 1118
1061 unless (aio_stat "$filename.pst") { 1119 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1120 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1121 or return;
1064 $av = eval { (Storable::thaw $av)->{objs} };
1065 }
1066 1122
1123 my $st = eval { Coro::Storable::thaw $av }
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs};
1126 }
1127
1128 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1129 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1130 $decname, length $data, scalar @{$av || []};
1131
1069 return ($data, $av); 1132 ($data, $av)
1070} 1133}
1071 1134
1072=head2 COMMAND CALLBACKS 1135=head2 COMMAND CALLBACKS
1073 1136
1074=over 4 1137=over 4
… …
1260 1323
1261=head3 cf::player 1324=head3 cf::player
1262 1325
1263=over 4 1326=over 4
1264 1327
1328=item cf::player::num_playing
1329
1330Returns the official number of playing players, as per the Crossfire metaserver rules.
1331
1332=cut
1333
1334sub num_playing {
1335 scalar grep
1336 $_->ob->map
1337 && !$_->hidden
1338 && !$_->ob->flag (cf::FLAG_WIZ),
1339 cf::player::list
1340}
1341
1265=item cf::player::find $login 1342=item cf::player::find $login
1266 1343
1267Returns the given player object, loading it if necessary (might block). 1344Returns the given player object, loading it if necessary (might block).
1268 1345
1269=cut 1346=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1381 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1382 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1383 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1384 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1385
1309 my $pl = load_pl path $login 1386 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1387 or return;
1388
1389 my $pl = cf::player::load_pl $f
1390 or return;
1391 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1393 $cf::PLAYER{$login} = $pl
1312 } 1394 }
1313 } 1395 }
1314} 1396}
1315 1397
… …
1413 or return []; 1495 or return [];
1414 1496
1415 my @logins; 1497 my @logins;
1416 1498
1417 for my $login (@$dirs) { 1499 for my $login (@$dirs) {
1500 my $path = path $login;
1501
1502 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1505 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1506 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 }
1421 1508
1422 utf8::decode $login; 1509 utf8::decode $login;
1423 push @logins, $login; 1510 push @logins, $login;
1424 } 1511 }
1425 1512
… …
1463sub expand_cfpod { 1550sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1551 ((my $self), (local $_)) = @_;
1465 1552
1466 # escape & and < 1553 # escape & and <
1467 s/&/&amp;/g; 1554 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1555 s/(?<![BIUGHT])</&lt;/g;
1469 1556
1470 # this is buggy, it needs to properly take care of nested <'s 1557 # this is buggy, it needs to properly take care of nested <'s
1471 1558
1472 1 while 1559 1 while
1473 # replace B<>, I<>, U<> etc. 1560 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1561 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1565 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1566 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1567 $self->gender ? $2 : $1
1480 }ge 1568 }ge
1481 # replace H<hint text> 1569 # replace H<hint text>
… …
1749 1837
1750sub load_header_from($) { 1838sub load_header_from($) {
1751 my ($self, $path) = @_; 1839 my ($self, $path) = @_;
1752 1840
1753 utf8::encode $path; 1841 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1842 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1843 or return;
1844
1845 $self->_load_header ($f)
1846 or return;
1847
1848 local $MAP_LOADING{$self->{path}} = $self;
1849 $f->resolve_delayed_derefs;
1759 1850
1760 $self->{load_path} = $path; 1851 $self->{load_path} = $path;
1761 1852
1762 1 1853 1
1763} 1854}
… …
1817sub find { 1908sub find {
1818 my ($path, $origin) = @_; 1909 my ($path, $origin) = @_;
1819 1910
1820 $path = normalise $path, $origin && $origin->path; 1911 $path = normalise $path, $origin && $origin->path;
1821 1912
1913 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1914 cf::lock_wait "map_find:$path";
1823 1915
1824 $cf::MAP{$path} || do { 1916 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1826 my $map = new_from_path cf::map $path 1920 my $map = new_from_path cf::map $path
1827 or return; 1921 or return;
1828 1922
1829 $map->{last_save} = $cf::RUNTIME; 1923 $map->{last_save} = $cf::RUNTIME;
1830 1924
… …
1832 or return; 1926 or return;
1833 1927
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1929 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1930 #$cf::WAIT_FOR_TICK->wait;
1931 undef $guard1;
1932 undef $guard2;
1837 $map->reset; 1933 $map->reset;
1838 undef $guard;
1839 return find $path; 1934 return find $path;
1840 } 1935 }
1841 1936
1842 $cf::MAP{$path} = $map 1937 $cf::MAP{$path} = $map
1843 } 1938 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1947 local $self->{deny_reset} = 1; # loading can take a long time
1853 1948
1854 my $path = $self->{path}; 1949 my $path = $self->{path};
1855 1950
1856 { 1951 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1952 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1953
1954 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1955 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1956
1862 $self->in_memory (cf::MAP_LOADING); 1957 $self->in_memory (cf::MAP_LOADING);
1863 1958
1864 $self->alloc; 1959 $self->alloc;
1865 1960
1866 $self->pre_load; 1961 $self->pre_load;
1867 cf::cede_to_tick; 1962 cf::cede_to_tick;
1868 1963
1964 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1966 $self->_load_objects ($f)
1870 or return; 1967 or return;
1871 1968
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1970 if delete $self->{load_original};
1874 1971
1875 if (my $uniq = $self->uniq_path) { 1972 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1973 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1974 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1976 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1977 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs;
1979 }
1880 } 1980 }
1881 } 1981 }
1982
1983 $f->resolve_delayed_derefs;
1882 1984
1883 cf::cede_to_tick; 1985 cf::cede_to_tick;
1884 # now do the right thing for maps 1986 # now do the right thing for maps
1885 $self->link_multipart_objects; 1987 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1988 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2074 }
1973 2075
1974 $MAP_PREFETCH{$path} |= $load; 2076 $MAP_PREFETCH{$path} |= $load;
1975 2077
1976 $MAP_PREFETCHER ||= cf::async { 2078 $MAP_PREFETCHER ||= cf::async {
2079 $Coro::current->{desc} = "map prefetcher";
2080
1977 while (%MAP_PREFETCH) { 2081 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2082 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2083 if (my $map = find $k) {
1980 $map->load if $v; 2084 $map->load if $v;
1981 } 2085 }
… …
2007 return if $self->{deny_save}; 2111 return if $self->{deny_save};
2008 2112
2009 local $self->{last_access} = $self->last_access;#d# 2113 local $self->{last_access} = $self->last_access;#d#
2010 2114
2011 cf::async { 2115 cf::async {
2116 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2117 $_->contr->save for $self->players;
2013 }; 2118 };
2014 2119
2015 if ($uniq) { 2120 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2135
2031 return if $self->players; 2136 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2137 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2138 return if $self->{deny_save};
2034 2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2144 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2145}
2038 2146
2039sub reset_at { 2147sub reset_at {
2040 my ($self) = @_; 2148 my ($self) = @_;
2041 2149
… …
2073 if $uniq; 2181 if $uniq;
2074 } 2182 }
2075 2183
2076 delete $cf::MAP{$self->path}; 2184 delete $cf::MAP{$self->path};
2077 2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2188 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2189
2082 $self->unlink_save; 2190 $self->unlink_save;
2083 $self->destroy; 2191 $self->destroy;
2084} 2192}
2085 2193
2086my $nuke_counter = "aaaa"; 2194my $nuke_counter = "aaaa";
2087 2195
2088sub nuke { 2196sub nuke {
2089 my ($self) = @_; 2197 my ($self) = @_;
2090 2198
2199 {
2200 my $lock = cf::lock_acquire "map_data:$self->{path}";
2201
2091 delete $cf::MAP{$self->path}; 2202 delete $cf::MAP{$self->path};
2092 2203
2093 $self->unlink_save; 2204 $self->unlink_save;
2094 2205
2095 bless $self, "cf::map"; 2206 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2207 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2208 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2209 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2211
2101 $cf::MAP{$self->path} = $self; 2212 $cf::MAP{$self->path} = $self;
2213 }
2102 2214
2103 $self->reset; # polite request, might not happen 2215 $self->reset; # polite request, might not happen
2104} 2216}
2105 2217
2106=item $maps = cf::map::tmp_maps 2218=item $maps = cf::map::tmp_maps
… …
2182 2294
2183sub inv_recursive { 2295sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2296 inv_recursive_ inv $_[0]
2185} 2297}
2186 2298
2299=item $ref = $ob->ref
2300
2301creates and returns a persistent reference to an objetc that can be stored as a string.
2302
2303=item $ob = cf::object::deref ($refstring)
2304
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block.
2307
2308=cut
2309
2310sub deref {
2311 my ($ref) = @_;
2312
2313 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2314 my ($uuid, $name) = ($1, $2);
2315 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2316 or return;
2317 $pl->ob->uuid eq $uuid
2318 or return;
2319
2320 $pl->ob
2321 } else {
2322 warn "$ref: cannot resolve object reference\n";
2323 undef
2324 }
2325}
2326
2187package cf; 2327package cf;
2188 2328
2189=back 2329=back
2190 2330
2191=head3 cf::object::player 2331=head3 cf::object::player
… …
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2490
2351 $self->enter_link; 2491 $self->enter_link;
2352 2492
2353 (async { 2493 (async {
2494 $Coro::current->{desc} = "player::goto $path $x $y";
2495
2496 # *tag paths override both path and x|y
2497 if ($path =~ /^\*(.*)$/) {
2498 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2499 my $ob = $obs[rand @obs];
2500
2501 # see if we actually can go there
2502 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2503 $ob = $obs[rand @obs];
2504 } else {
2505 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2506 }
2507 # else put us there anyways for now #d#
2508
2509 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2510 } else {
2511 ($path, $x, $y) = (undef, undef, undef);
2512 }
2513 }
2514
2354 my $map = eval { 2515 my $map = eval {
2355 my $map = cf::map::find $path; 2516 my $map = defined $path ? cf::map::find $path : undef;
2356 2517
2357 if ($map) { 2518 if ($map) {
2358 $map = $map->customise_for ($self); 2519 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2520 $map = $check->($map) if $check && $map;
2360 } else { 2521 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2523 }
2363 2524
2364 $map 2525 $map
2365 }; 2526 };
2366 2527
… …
2456 # if exit is damned, update players death & WoR home-position 2617 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp) 2618 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED); 2619 if $exit->flag (FLAG_DAMNED);
2459 2620
2460 (async { 2621 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2623
2461 $self->deactivate_recursive; # just to be sure 2624 $self->deactivate_recursive; # just to be sure
2462 unless (eval { 2625 unless (eval {
2463 $self->goto ($slaying, $hp, $sp); 2626 $self->goto ($slaying, $hp, $sp);
2464 2627
2465 1; 2628 1;
… …
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2663the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2664the message unless the client supports the msg packet.
2502 2665
2503=cut 2666=cut
2504 2667
2668our %CHANNEL = (
2669 "c/identify" => {
2670 id => "infobox",
2671 title => "Identify",
2672 reply => undef,
2673 tooltip => "Items recently identified",
2674 },
2675 "c/examine" => {
2676 id => "infobox",
2677 title => "Examine",
2678 reply => undef,
2679 tooltip => "Signs and other items you examined",
2680 },
2681 "c/lookat" => {
2682 id => "infobox",
2683 title => "Look",
2684 reply => undef,
2685 tooltip => "What you saw there",
2686 },
2687);
2688
2505sub cf::client::send_msg { 2689sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2690 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2691
2508 $msg = $self->pl->expand_cfpod ($msg); 2692 $msg = $self->pl->expand_cfpod ($msg);
2509 2693
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2694 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2695
2696 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel};
2699
2700 $self->ext_msg (channel_info => $channel)
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id};
2704
2512 if (ref $channel) { 2705 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2706 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2707 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2708 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2517 } 2711 }
2518 2712
2519 $channel = $channel->{id}; 2713 $channel = $channel->{id};
2520 } 2714 }
2521 2715
… …
2733=pod 2927=pod
2734 2928
2735The following functions and methods are available within a safe environment: 2929The following functions and methods are available within a safe environment:
2736 2930
2737 cf::object 2931 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 2932 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 2933 insert remove name archname title slaying race decrease_ob_nr
2740 2934
2741 cf::object::player 2935 cf::object::player
2742 player 2936 player
2743 2937
… …
2750=cut 2944=cut
2751 2945
2752for ( 2946for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 2948 insert remove inv name archname title slaying race
2755 decrease_ob_nr)], 2949 decrease_ob_nr destroy)],
2756 ["cf::object::player" => qw(player)], 2950 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 2951 ["cf::player" => qw(peaceful)],
2758 ["cf::map" => qw(trigger)], 2952 ["cf::map" => qw(trigger)],
2759) { 2953) {
2760 no strict 'refs'; 2954 no strict 'refs';
… …
3035sub main { 3229sub main {
3036 # we must not ever block the main coroutine 3230 # we must not ever block the main coroutine
3037 local $Coro::idle = sub { 3231 local $Coro::idle = sub {
3038 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3039 (async { 3233 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER";
3040 Event::one_event; 3235 Event::one_event;
3041 })->prio (Coro::PRIO_MAX); 3236 })->prio (Coro::PRIO_MAX);
3042 }; 3237 };
3043 3238
3044 reload_config; 3239 reload_config;
… …
3116 # and maps saved/destroyed asynchronously. 3311 # and maps saved/destroyed asynchronously.
3117 warn "begin emergency player save\n"; 3312 warn "begin emergency player save\n";
3118 for my $login (keys %cf::PLAYER) { 3313 for my $login (keys %cf::PLAYER) {
3119 my $pl = $cf::PLAYER{$login} or next; 3314 my $pl = $cf::PLAYER{$login} or next;
3120 $pl->valid or next; 3315 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3121 $pl->save; 3317 $pl->save;
3122 } 3318 }
3123 warn "end emergency player save\n"; 3319 warn "end emergency player save\n";
3124 3320
3125 warn "begin emergency map save\n"; 3321 warn "begin emergency map save\n";
… …
3288register_command "reload" => sub { 3484register_command "reload" => sub {
3289 my ($who, $arg) = @_; 3485 my ($who, $arg) = @_;
3290 3486
3291 if ($who->flag (FLAG_WIZ)) { 3487 if ($who->flag (FLAG_WIZ)) {
3292 $who->message ("reloading server."); 3488 $who->message ("reloading server.");
3489 async {
3490 $Coro::current->{desc} = "perl_reload";
3293 async { reload_perl }; 3491 reload_perl;
3492 };
3294 } 3493 }
3295}; 3494};
3296 3495
3297unshift @INC, $LIBDIR; 3496unshift @INC, $LIBDIR;
3298 3497
… …
3317 my $signal = new Coro::Signal; 3516 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal; 3517 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait; 3518 $signal->wait;
3320} 3519}
3321 3520
3322 my $min = 1e6;#d#
3323 my $avg = 10;
3324$TICK_WATCHER = Event->timer ( 3521$TICK_WATCHER = Event->timer (
3325 reentrant => 0, 3522 reentrant => 0,
3326 parked => 1, 3523 parked => 1,
3327 prio => 0, 3524 prio => 0,
3328 at => $NEXT_TICK || $TICK, 3525 at => $NEXT_TICK || $TICK,
… …
3336 3533
3337 $NOW = $tick_start = Event::time; 3534 $NOW = $tick_start = Event::time;
3338 3535
3339 cf::server_tick; # one server iteration 3536 cf::server_tick; # one server iteration
3340 3537
3341 0 && sync_job {#d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 };
3363
3364 $RUNTIME += $TICK; 3538 $RUNTIME += $TICK;
3365 $NEXT_TICK += $TICK; 3539 $NEXT_TICK += $TICK;
3366 3540
3367 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3541 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368 $NEXT_RUNTIME_WRITE = $NOW + 10; 3542 $NEXT_RUNTIME_WRITE = $NOW + 10;
3369 Coro::async_pool { 3543 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver";
3370 write_runtime 3545 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!"; 3546 or warn "ERROR: unable to write runtime file: $!";
3372 }; 3547 };
3373 } 3548 }
3374 3549
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send; 3551 $sig->send;
3380 } 3552 }
3381 while (my $sig = shift @WAIT_FOR_TICK) { 3553 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send; 3554 $sig->send;
… …
3392 3564
3393 $LOAD = ($NOW - $tick_start) / $TICK; 3565 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395 3567
3396 _post_tick; 3568 _post_tick;
3397
3398
3399 }, 3569 },
3400); 3570);
3401 3571
3402{ 3572{
3573 BDB::min_parallel 8;
3403 BDB::max_poll_time $TICK * 0.1; 3574 BDB::max_poll_time $TICK * 0.1;
3404 $BDB_POLL_WATCHER = Event->io ( 3575 $BDB_POLL_WATCHER = Event->io (
3405 reentrant => 0, 3576 reentrant => 0,
3406 fd => BDB::poll_fileno, 3577 fd => BDB::poll_fileno,
3407 poll => 'r', 3578 poll => 'r',
3408 prio => 0, 3579 prio => 0,
3409 data => WF_AUTOCANCEL, 3580 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb, 3581 cb => \&BDB::poll_cb,
3411 ); 3582 );
3412 BDB::min_parallel 8;
3413 3583
3414 BDB::set_sync_prepare { 3584 BDB::set_sync_prepare {
3415 my $status; 3585 my $status;
3416 my $current = $Coro::current; 3586 my $current = $Coro::current;
3417 ( 3587 (
… …
3426 ) 3596 )
3427 }; 3597 };
3428 3598
3429 unless ($DB_ENV) { 3599 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create; 3600 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3602 | BDB::LOG_AUTOREMOVE, 1);
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3431 3605
3432 cf::sync_job { 3606 cf::sync_job {
3433 eval { 3607 eval {
3434 BDB::db_env_open 3608 BDB::db_env_open
3435 $DB_ENV, 3609 $DB_ENV,
… …
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3611 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3612 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666; 3613 0666;
3440 3614
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3615 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 }; 3616 };
3446 3617
3447 cf::cleanup "db_env_open(db): $@" if $@; 3618 cf::cleanup "db_env_open(db): $@" if $@;
3448 }; 3619 };
3449 } 3620 }
3621
3622 $BDB_DEADLOCK_WATCHER = Event->timer (
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 );
3632 $BDB_CHECKPOINT_WATCHER = Event->timer (
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 );
3642 $BDB_TRICKLE_WATCHER = Event->timer (
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 );
3450} 3652}
3451 3653
3452{ 3654{
3453 IO::AIO::min_parallel 8; 3655 IO::AIO::min_parallel 8;
3454 3656
… …
3457 $AIO_POLL_WATCHER = Event->io ( 3659 $AIO_POLL_WATCHER = Event->io (
3458 reentrant => 0, 3660 reentrant => 0,
3459 data => WF_AUTOCANCEL, 3661 data => WF_AUTOCANCEL,
3460 fd => IO::AIO::poll_fileno, 3662 fd => IO::AIO::poll_fileno,
3461 poll => 'r', 3663 poll => 'r',
3462 prio => 6, 3664 prio => 0,
3463 cb => \&IO::AIO::poll_cb, 3665 cb => \&IO::AIO::poll_cb,
3464 ); 3666 );
3465} 3667}
3466 3668
3467my $_log_backtrace; 3669my $_log_backtrace;
… …
3473 3675
3474 # limit the # of concurrent backtraces 3676 # limit the # of concurrent backtraces
3475 if ($_log_backtrace < 2) { 3677 if ($_log_backtrace < 2) {
3476 ++$_log_backtrace; 3678 ++$_log_backtrace;
3477 async { 3679 async {
3680 $Coro::current->{desc} = "abt $msg";
3681
3478 my @bt = fork_call { 3682 my @bt = fork_call {
3479 @addr = map { sprintf "%x", $_ } @addr; 3683 @addr = map { sprintf "%x", $_ } @addr;
3480 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3684 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3481 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3685 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3482 or die "addr2line: $!"; 3686 or die "addr2line: $!";

Diff Legend

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