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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.380 by root, Mon Oct 8 13:58:07 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
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 | logBacktrace, 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
… …
1007sub object_freezer_save { 1033sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1009 1035
1010 sync_job { 1036 sync_job {
1011 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1014 1041
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1046 close $fh;
1020 1047
1021 if (@$objs) { 1048 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1054 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1056 }
… …
1037 } 1064 }
1038 } else { 1065 } else {
1039 aio_unlink $filename; 1066 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1041 } 1068 }
1042 } 1069 };
1043} 1070}
1044 1071
1045sub object_freezer_as_string { 1072sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1047 1074
… …
1059 or return; 1086 or return;
1060 1087
1061 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1090 or return;
1064 $av = eval { (Storable::thaw $av)->{objs} };
1065 }
1066 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1069 return ($data, $av); 1101 ($data, $av)
1070} 1102}
1071 1103
1072=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1073 1105
1074=over 4 1106=over 4
… …
1260 1292
1261=head3 cf::player 1293=head3 cf::player
1262 1294
1263=over 4 1295=over 4
1264 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1265=item cf::player::find $login 1311=item cf::player::find $login
1266 1312
1267Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1268 1314
1269=cut 1315=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1354
1309 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1312 } 1363 }
1313 } 1364 }
1314} 1365}
1315 1366
… …
1413 or return []; 1464 or return [];
1414 1465
1415 my @logins; 1466 my @logins;
1416 1467
1417 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1421 1477
1422 utf8::decode $login; 1478 utf8::decode $login;
1423 push @logins, $login; 1479 push @logins, $login;
1424 } 1480 }
1425 1481
… …
1463sub expand_cfpod { 1519sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1465 1521
1466 # escape & and < 1522 # escape & and <
1467 s/&/&amp;/g; 1523 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1469 1525
1470 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1471 1527
1472 1 while 1528 1 while
1473 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1534 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1480 }ge 1537 }ge
1481 # replace H<hint text> 1538 # replace H<hint text>
… …
1749 1806
1750sub load_header_from($) { 1807sub load_header_from($) {
1751 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1752 1809
1753 utf8::encode $path; 1810 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1759 1819
1760 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1761 1821
1762 1 1822 1
1763} 1823}
… …
1817sub find { 1877sub find {
1818 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1819 1879
1820 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1821 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1823 1884
1824 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1826 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1827 or return; 1890 or return;
1828 1891
1829 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1830 1893
… …
1832 or return; 1895 or return;
1833 1896
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1837 $map->reset; 1902 $map->reset;
1838 undef $guard;
1839 return find $path; 1903 return find $path;
1840 } 1904 }
1841 1905
1842 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1843 } 1907 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1853 1917
1854 my $path = $self->{path}; 1918 my $path = $self->{path};
1855 1919
1856 { 1920 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1922
1923 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1925
1862 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1863 1927
1864 $self->alloc; 1928 $self->alloc;
1865 1929
1866 $self->pre_load; 1930 $self->pre_load;
1867 cf::cede_to_tick; 1931 cf::cede_to_tick;
1868 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1870 or return; 1936 or return;
1871 1937
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1874 1940
1875 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1942 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1945 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1880 } 1949 }
1881 } 1950 }
1951
1952 $f->resolve_delayed_derefs;
1882 1953
1883 cf::cede_to_tick; 1954 cf::cede_to_tick;
1884 # now do the right thing for maps 1955 # now do the right thing for maps
1885 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2043 }
1973 2044
1974 $MAP_PREFETCH{$path} |= $load; 2045 $MAP_PREFETCH{$path} |= $load;
1975 2046
1976 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1977 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2052 if (my $map = find $k) {
1980 $map->load if $v; 2053 $map->load if $v;
1981 } 2054 }
… …
2007 return if $self->{deny_save}; 2080 return if $self->{deny_save};
2008 2081
2009 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
2010 2083
2011 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
2013 }; 2087 };
2014 2088
2015 if ($uniq) { 2089 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2104
2031 return if $self->players; 2105 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2107 return if $self->{deny_save};
2034 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2113 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2114}
2038 2115
2039sub reset_at { 2116sub reset_at {
2040 my ($self) = @_; 2117 my ($self) = @_;
2041 2118
… …
2073 if $uniq; 2150 if $uniq;
2074 } 2151 }
2075 2152
2076 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
2077 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2157 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2158
2082 $self->unlink_save; 2159 $self->unlink_save;
2083 $self->destroy; 2160 $self->destroy;
2084} 2161}
2085 2162
… …
2090 2167
2091 { 2168 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2170
2094 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
2172
2173 $self->unlink_save;
2095 2174
2096 bless $self, "cf::map"; 2175 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2180
2104 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2105 } 2182 }
2106 2183
2107 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
… …
2186 2263
2187sub inv_recursive { 2264sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2189} 2266}
2190 2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2191package cf; 2296package cf;
2192 2297
2193=back 2298=back
2194 2299
2195=head3 cf::object::player 2300=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2459
2355 $self->enter_link; 2460 $self->enter_link;
2356 2461
2357 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
2358 my $map = eval { 2484 my $map = eval {
2359 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2360 2486
2361 if ($map) { 2487 if ($map) {
2362 $map = $map->customise_for ($self); 2488 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2489 $map = $check->($map) if $check && $map;
2364 } else { 2490 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2492 }
2367 2493
2368 $map 2494 $map
2369 }; 2495 };
2370 2496
… …
2460 # if exit is damned, update players death & WoR home-position 2586 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2587 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2588 if $exit->flag (FLAG_DAMNED);
2463 2589
2464 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2465 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2594 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2468 2596
2469 1; 2597 1;
… …
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2632the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2633the message unless the client supports the msg packet.
2506 2634
2507=cut 2635=cut
2508 2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2509sub cf::client::send_msg { 2658sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2659 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2660
2512 $msg = $self->pl->expand_cfpod ($msg); 2661 $msg = $self->pl->expand_cfpod ($msg);
2513 2662
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2515 2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2516 if (ref $channel) { 2674 } elsif (ref $channel) {
2517 # send meta info to client, if not yet sent 2675 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2676 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2677 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2521 } 2680 }
2522 2681
2523 $channel = $channel->{id}; 2682 $channel = $channel->{id};
2524 } 2683 }
2525 2684
… …
3039sub main { 3198sub main {
3040 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
3041 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
3042 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3043 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
3044 Event::one_event; 3204 Event::one_event;
3045 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
3046 }; 3206 };
3047 3207
3048 reload_config; 3208 reload_config;
… …
3292register_command "reload" => sub { 3452register_command "reload" => sub {
3293 my ($who, $arg) = @_; 3453 my ($who, $arg) = @_;
3294 3454
3295 if ($who->flag (FLAG_WIZ)) { 3455 if ($who->flag (FLAG_WIZ)) {
3296 $who->message ("reloading server."); 3456 $who->message ("reloading server.");
3457 async {
3458 $Coro::current->{desc} = "perl_reload";
3297 async { reload_perl }; 3459 reload_perl;
3460 };
3298 } 3461 }
3299}; 3462};
3300 3463
3301unshift @INC, $LIBDIR; 3464unshift @INC, $LIBDIR;
3302 3465
… …
3321 my $signal = new Coro::Signal; 3484 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3485 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3486 $signal->wait;
3324} 3487}
3325 3488
3326 my $min = 1e6;#d#
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer ( 3489$TICK_WATCHER = Event->timer (
3329 reentrant => 0, 3490 reentrant => 0,
3330 parked => 1, 3491 parked => 1,
3331 prio => 0, 3492 prio => 0,
3332 at => $NEXT_TICK || $TICK, 3493 at => $NEXT_TICK || $TICK,
… …
3340 3501
3341 $NOW = $tick_start = Event::time; 3502 $NOW = $tick_start = Event::time;
3342 3503
3343 cf::server_tick; # one server iteration 3504 cf::server_tick; # one server iteration
3344 3505
3345 0 && sync_job {#d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 };
3367
3368 $RUNTIME += $TICK; 3506 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK; 3507 $NEXT_TICK += $TICK;
3370 3508
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3509 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10; 3510 $NEXT_RUNTIME_WRITE = $NOW + 10;
3373 Coro::async_pool { 3511 Coro::async_pool {
3512 $Coro::current->{desc} = "runtime saver";
3374 write_runtime 3513 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!"; 3514 or warn "ERROR: unable to write runtime file: $!";
3376 }; 3515 };
3377 } 3516 }
3378 3517
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3518 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3519 $sig->send;
3384 } 3520 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3521 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3522 $sig->send;
… …
3396 3532
3397 $LOAD = ($NOW - $tick_start) / $TICK; 3533 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3534 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3535
3400 _post_tick; 3536 _post_tick;
3401
3402
3403 }, 3537 },
3404); 3538);
3405 3539
3406{ 3540{
3541 BDB::min_parallel 8;
3407 BDB::max_poll_time $TICK * 0.1; 3542 BDB::max_poll_time $TICK * 0.1;
3408 $BDB_POLL_WATCHER = Event->io ( 3543 $BDB_POLL_WATCHER = Event->io (
3409 reentrant => 0, 3544 reentrant => 0,
3410 fd => BDB::poll_fileno, 3545 fd => BDB::poll_fileno,
3411 poll => 'r', 3546 poll => 'r',
3412 prio => 0, 3547 prio => 0,
3413 data => WF_AUTOCANCEL, 3548 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb, 3549 cb => \&BDB::poll_cb,
3415 ); 3550 );
3416 BDB::min_parallel 8;
3417 3551
3418 BDB::set_sync_prepare { 3552 BDB::set_sync_prepare {
3419 my $status; 3553 my $status;
3420 my $current = $Coro::current; 3554 my $current = $Coro::current;
3421 ( 3555 (
… …
3430 ) 3564 )
3431 }; 3565 };
3432 3566
3433 unless ($DB_ENV) { 3567 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3568 $DB_ENV = BDB::db_env_create;
3569 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3570 | BDB::LOG_AUTOREMOVE, 1);
3571 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3572 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 3573
3436 cf::sync_job { 3574 cf::sync_job {
3437 eval { 3575 eval {
3438 BDB::db_env_open 3576 BDB::db_env_open
3439 $DB_ENV, 3577 $DB_ENV,
… …
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3579 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3580 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 3581 0666;
3444 3582
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3583 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 3584 };
3450 3585
3451 cf::cleanup "db_env_open(db): $@" if $@; 3586 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 3587 };
3453 } 3588 }
3589
3590 $BDB_DEADLOCK_WATCHER = Event->timer (
3591 after => 3,
3592 interval => 1,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3598 },
3599 );
3600 $BDB_CHECKPOINT_WATCHER = Event->timer (
3601 after => 11,
3602 interval => 60,
3603 hard => 1,
3604 prio => 0,
3605 data => WF_AUTOCANCEL,
3606 cb => sub {
3607 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3608 },
3609 );
3610 $BDB_TRICKLE_WATCHER = Event->timer (
3611 after => 5,
3612 interval => 10,
3613 hard => 1,
3614 prio => 0,
3615 data => WF_AUTOCANCEL,
3616 cb => sub {
3617 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3618 },
3619 );
3454} 3620}
3455 3621
3456{ 3622{
3457 IO::AIO::min_parallel 8; 3623 IO::AIO::min_parallel 8;
3458 3624
… …
3461 $AIO_POLL_WATCHER = Event->io ( 3627 $AIO_POLL_WATCHER = Event->io (
3462 reentrant => 0, 3628 reentrant => 0,
3463 data => WF_AUTOCANCEL, 3629 data => WF_AUTOCANCEL,
3464 fd => IO::AIO::poll_fileno, 3630 fd => IO::AIO::poll_fileno,
3465 poll => 'r', 3631 poll => 'r',
3466 prio => 6, 3632 prio => 0,
3467 cb => \&IO::AIO::poll_cb, 3633 cb => \&IO::AIO::poll_cb,
3468 ); 3634 );
3469} 3635}
3470 3636
3471my $_log_backtrace; 3637my $_log_backtrace;
… …
3477 3643
3478 # limit the # of concurrent backtraces 3644 # limit the # of concurrent backtraces
3479 if ($_log_backtrace < 2) { 3645 if ($_log_backtrace < 2) {
3480 ++$_log_backtrace; 3646 ++$_log_backtrace;
3481 async { 3647 async {
3648 $Coro::current->{desc} = "abt $msg";
3649
3482 my @bt = fork_call { 3650 my @bt = fork_call {
3483 @addr = map { sprintf "%x", $_ } @addr; 3651 @addr = map { sprintf "%x", $_ } @addr;
3484 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3652 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3485 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3653 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3486 or die "addr2line: $!"; 3654 or die "addr2line: $!";

Diff Legend

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