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.350 by root, Sat Sep 1 08:03:45 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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
… …
945# 971#
946 972
947sub _can_merge { 973sub _can_merge {
948 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
949 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
950 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
955} 986}
956 987
957sub reattach { 988sub reattach {
958 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 990 my ($obj) = @_;
… …
1007sub object_freezer_save { 1038sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1009 1040
1010 sync_job { 1041 sync_job {
1011 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
1014 1046
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1051 close $fh;
1020 1052
1021 if (@$objs) { 1053 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1059 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1061 }
… …
1037 } 1069 }
1038 } else { 1070 } else {
1039 aio_unlink $filename; 1071 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1041 } 1073 }
1042 } 1074 };
1043} 1075}
1044 1076
1045sub object_freezer_as_string { 1077sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1047 1079
… …
1059 or return; 1091 or return;
1060 1092
1061 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1095 or return;
1064 $av = eval { (Storable::thaw $av)->{objs} };
1065 }
1066 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1069 return ($data, $av); 1106 ($data, $av)
1070} 1107}
1071 1108
1072=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1073 1110
1074=over 4 1111=over 4
… …
1260 1297
1261=head3 cf::player 1298=head3 cf::player
1262 1299
1263=over 4 1300=over 4
1264 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1265=item cf::player::find $login 1316=item cf::player::find $login
1266 1317
1267Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1268 1319
1269=cut 1320=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1359
1309 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1312 } 1368 }
1313 } 1369 }
1314} 1370}
1315 1371
… …
1413 or return []; 1469 or return [];
1414 1470
1415 my @logins; 1471 my @logins;
1416 1472
1417 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1421 1482
1422 utf8::decode $login; 1483 utf8::decode $login;
1423 push @logins, $login; 1484 push @logins, $login;
1424 } 1485 }
1425 1486
… …
1463sub expand_cfpod { 1524sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1465 1526
1466 # escape & and < 1527 # escape & and <
1467 s/&/&amp;/g; 1528 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1469 1530
1470 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1471 1532
1472 1 while 1533 1 while
1473 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1539 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1480 }ge 1542 }ge
1481 # replace H<hint text> 1543 # replace H<hint text>
… …
1749 1811
1750sub load_header_from($) { 1812sub load_header_from($) {
1751 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1752 1814
1753 utf8::encode $path; 1815 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1759 1824
1760 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1761 1826
1762 1 1827 1
1763} 1828}
… …
1817sub find { 1882sub find {
1818 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1819 1884
1820 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1821 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1823 1889
1824 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1826 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1827 or return; 1895 or return;
1828 1896
1829 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1830 1898
… …
1832 or return; 1900 or return;
1833 1901
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1837 $map->reset; 1907 $map->reset;
1838 undef $guard;
1839 return find $path; 1908 return find $path;
1840 } 1909 }
1841 1910
1842 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1843 } 1912 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1853 1922
1854 my $path = $self->{path}; 1923 my $path = $self->{path};
1855 1924
1856 { 1925 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1927
1928 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1930
1862 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1863 1932
1864 $self->alloc; 1933 $self->alloc;
1865 1934
1866 $self->pre_load; 1935 $self->pre_load;
1867 cf::cede_to_tick; 1936 cf::cede_to_tick;
1868 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1870 or return; 1941 or return;
1871 1942
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1874 1945
1875 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1947 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1950 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1880 } 1954 }
1881 } 1955 }
1956
1957 $f->resolve_delayed_derefs;
1882 1958
1883 cf::cede_to_tick; 1959 cf::cede_to_tick;
1884 # now do the right thing for maps 1960 # now do the right thing for maps
1885 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2048 }
1973 2049
1974 $MAP_PREFETCH{$path} |= $load; 2050 $MAP_PREFETCH{$path} |= $load;
1975 2051
1976 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1977 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2057 if (my $map = find $k) {
1980 $map->load if $v; 2058 $map->load if $v;
1981 } 2059 }
… …
2007 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2008 2086
2009 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2010 2088
2011 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2013 }; 2092 };
2014 2093
2015 if ($uniq) { 2094 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2109
2031 return if $self->players; 2110 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2112 return if $self->{deny_save};
2034 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2118 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2119}
2038 2120
2039sub reset_at { 2121sub reset_at {
2040 my ($self) = @_; 2122 my ($self) = @_;
2041 2123
… …
2073 if $uniq; 2155 if $uniq;
2074 } 2156 }
2075 2157
2076 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
2077 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2162 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2163
2082 $self->unlink_save; 2164 $self->unlink_save;
2083 $self->destroy; 2165 $self->destroy;
2084} 2166}
2085 2167
… …
2090 2172
2091 { 2173 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2175
2094 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2177
2178 $self->unlink_save;
2095 2179
2096 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2185
2104 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2105 } 2187 }
2106 2188
2107 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
… …
2186 2268
2187sub inv_recursive { 2269sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2189} 2271}
2190 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2191package cf; 2301package cf;
2192 2302
2193=back 2303=back
2194 2304
2195=head3 cf::object::player 2305=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2464
2355 $self->enter_link; 2465 $self->enter_link;
2356 2466
2357 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2358 my $map = eval { 2489 my $map = eval {
2359 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2360 2491
2361 if ($map) { 2492 if ($map) {
2362 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2364 } else { 2495 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2497 }
2367 2498
2368 $map 2499 $map
2369 }; 2500 };
2370 2501
… …
2460 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2463 2594
2464 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2465 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2599 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2468 2601
2469 1; 2602 1;
… …
2506 2639
2507=cut 2640=cut
2508 2641
2509our %CHANNEL = ( 2642our %CHANNEL = (
2510 "c/identify" => { 2643 "c/identify" => {
2511 id => "identify", 2644 id => "infobox",
2512 title => "Identify", 2645 title => "Identify",
2513 reply => undef, 2646 reply => undef,
2514 tooltip => "Items recently identified", 2647 tooltip => "Items recently identified",
2515 }, 2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2516); 2661);
2517 2662
2518sub cf::client::send_msg { 2663sub cf::client::send_msg {
2519 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2520 2665
2521 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2522 2667
2523 $color &= cf::NDI_CLIENT_MASK; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524 2669
2525 # check predefined channels, for the benefit of C 2670 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2527 2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2528 if (ref $channel) { 2679 } elsif (ref $channel) {
2529 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel); 2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2533 } 2685 }
2534 2686
2535 $channel = $channel->{id}; 2687 $channel = $channel->{id};
2536 } 2688 }
2537 2689
… …
2749=pod 2901=pod
2750 2902
2751The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2752 2904
2753 cf::object 2905 cf::object
2754 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2755 insert remove name archname title slaying race decrease_ob_nr 2907 insert remove name archname title slaying race decrease_ob_nr
2756 2908
2757 cf::object::player 2909 cf::object::player
2758 player 2910 player
2759 2911
… …
2766=cut 2918=cut
2767 2919
2768for ( 2920for (
2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race 2922 insert remove inv name archname title slaying race
2771 decrease_ob_nr)], 2923 decrease_ob_nr destroy)],
2772 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2773 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2774 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2775) { 2927) {
2776 no strict 'refs'; 2928 no strict 'refs';
… …
3051sub main { 3203sub main {
3052 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
3053 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
3054 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3055 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
3056 Event::one_event; 3209 Event::one_event;
3057 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
3058 }; 3211 };
3059 3212
3060 reload_config; 3213 reload_config;
… …
3132 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3133 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3134 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3135 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3136 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3137 $pl->save; 3291 $pl->save;
3138 } 3292 }
3139 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3140 3294
3141 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
3304register_command "reload" => sub { 3458register_command "reload" => sub {
3305 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3306 3460
3307 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3308 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3309 async { reload_perl }; 3465 reload_perl;
3466 };
3310 } 3467 }
3311}; 3468};
3312 3469
3313unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3314 3471
… …
3333 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3334 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3335 $signal->wait; 3492 $signal->wait;
3336} 3493}
3337 3494
3338 my $min = 1e6;#d#
3339 my $avg = 10;
3340$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3341 reentrant => 0, 3496 reentrant => 0,
3342 parked => 1, 3497 parked => 1,
3343 prio => 0, 3498 prio => 0,
3344 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
… …
3352 3507
3353 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3354 3509
3355 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3356 3511
3357 0 && sync_job {#d#
3358 for(1..10) {
3359 my $t = Event::time;
3360 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3361 or die;
3362
3363 $map->width (50);
3364 $map->height (50);
3365 $map->alloc;
3366 $map->_load_objects ("/tmp/x.map", 1);
3367 my $t = Event::time - $t;
3368
3369 #next unless $t < 0.0013;#d#
3370 if ($t < $min) {
3371 $min = $t;
3372 }
3373 $avg = $avg * 0.99 + $t * 0.01;
3374 }
3375 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3376 exit 0;
3377 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3378 };
3379
3380 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3381 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3382 3514
3383 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3384 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3385 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3386 write_runtime 3519 write_runtime
3387 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3388 }; 3521 };
3389 } 3522 }
3390 3523
3391# my $AFTER = Event::time;
3392# warn $AFTER - $NOW;#d#
3393
3394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3395 $sig->send; 3525 $sig->send;
3396 } 3526 }
3397 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3398 $sig->send; 3528 $sig->send;
… …
3408 3538
3409 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3410 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3411 3541
3412 _post_tick; 3542 _post_tick;
3413
3414
3415 }, 3543 },
3416); 3544);
3417 3545
3418{ 3546{
3547 BDB::min_parallel 8;
3419 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3420 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3421 reentrant => 0, 3550 reentrant => 0,
3422 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3423 poll => 'r', 3552 poll => 'r',
3424 prio => 0, 3553 prio => 0,
3425 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3426 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3427 ); 3556 );
3428 BDB::min_parallel 8;
3429 3557
3430 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3431 my $status; 3559 my $status;
3432 my $current = $Coro::current; 3560 my $current = $Coro::current;
3433 ( 3561 (
… …
3442 ) 3570 )
3443 }; 3571 };
3444 3572
3445 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3446 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3447 3579
3448 cf::sync_job { 3580 cf::sync_job {
3449 eval { 3581 eval {
3450 BDB::db_env_open 3582 BDB::db_env_open
3451 $DB_ENV, 3583 $DB_ENV,
… …
3453 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3454 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3455 0666; 3587 0666;
3456 3588
3457 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3458
3459 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3460 $DB_ENV->set_lk_detect;
3461 }; 3590 };
3462 3591
3463 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3464 }; 3593 };
3465 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3466} 3626}
3467 3627
3468{ 3628{
3469 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3470 3630
… …
3473 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3474 reentrant => 0, 3634 reentrant => 0,
3475 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3476 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3477 poll => 'r', 3637 poll => 'r',
3478 prio => 6, 3638 prio => 0,
3479 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3480 ); 3640 );
3481} 3641}
3482 3642
3483my $_log_backtrace; 3643my $_log_backtrace;
… …
3489 3649
3490 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3491 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3492 ++$_log_backtrace; 3652 ++$_log_backtrace;
3493 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3494 my @bt = fork_call { 3656 my @bt = fork_call {
3495 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3496 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3497 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3498 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

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