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.351 by root, Sun Sep 2 00:57:38 2007 UTC vs.
Revision 1.389 by root, Sat Oct 20 04:39:57 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
433 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
434 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
435 } 454 }
436 455
437 $time = Event::time - $time; 456 $time = Event::time - $time;
438 457
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
481sub fork_call(&@) { 500sub fork_call(&@) {
482 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
483 502
484 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
487 506
488 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
489 reset_signals; 508 reset_signals;
490 &$cb 509 &$cb
491 }, @args; 510 }, @args;
… …
500=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
501 520
502Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
505=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
506 547
507our $DB; 548our $DB;
508 549
509sub db_init { 550sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 551 cf::sync_job {
514 eval { 552 $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 } 553 };
524} 554}
525 555
526sub db_get($$) { 556sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
528 558
… …
940 970
941=cut 971=cut
942 972
943############################################################################# 973#############################################################################
944# object support 974# object support
945#
946 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
947sub _can_merge { 1009sub _can_merge {
948 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
949 1011
950 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1013
954 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
955} 1016}
956 1017
957sub reattach { 1018sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1007sub object_freezer_save { 1068sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1009 1070
1010 sync_job { 1071 sync_job {
1011 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1014 1076
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1081 close $fh;
1020 1082
1021 if (@$objs) { 1083 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1089 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1091 }
… …
1037 } 1099 }
1038 } else { 1100 } else {
1039 aio_unlink $filename; 1101 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1041 } 1103 }
1042 } 1104 };
1043} 1105}
1044 1106
1045sub object_freezer_as_string { 1107sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1047 1109
… …
1059 or return; 1121 or return;
1060 1122
1061 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1125 or return;
1126
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1065 } 1129 }
1066 1130
1131 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1069 return ($data, $av); 1135 ($data, $av)
1070} 1136}
1071 1137
1072=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1073 1139
1074=over 4 1140=over 4
… …
1260 1326
1261=head3 cf::player 1327=head3 cf::player
1262 1328
1263=over 4 1329=over 4
1264 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1265=item cf::player::find $login 1345=item cf::player::find $login
1266 1346
1267Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1268 1348
1269=cut 1349=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1388
1309 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1312 } 1397 }
1313 } 1398 }
1314} 1399}
1315 1400
… …
1413 or return []; 1498 or return [];
1414 1499
1415 my @logins; 1500 my @logins;
1416 1501
1417 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1421 1511
1422 utf8::decode $login; 1512 utf8::decode $login;
1423 push @logins, $login; 1513 push @logins, $login;
1424 } 1514 }
1425 1515
… …
1463sub expand_cfpod { 1553sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1554 ((my $self), (local $_)) = @_;
1465 1555
1466 # escape & and < 1556 # escape & and <
1467 s/&/&amp;/g; 1557 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1558 s/(?<![BIUGHT])</&lt;/g;
1469 1559
1470 # this is buggy, it needs to properly take care of nested <'s 1560 # this is buggy, it needs to properly take care of nested <'s
1471 1561
1472 1 while 1562 1 while
1473 # replace B<>, I<>, U<> etc. 1563 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1564 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1568 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1569 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1570 $self->gender ? $2 : $1
1480 }ge 1571 }ge
1481 # replace H<hint text> 1572 # replace H<hint text>
… …
1749 1840
1750sub load_header_from($) { 1841sub load_header_from($) {
1751 my ($self, $path) = @_; 1842 my ($self, $path) = @_;
1752 1843
1753 utf8::encode $path; 1844 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1845 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1846 or return;
1847
1848 $self->_load_header ($f)
1849 or return;
1850
1851 local $MAP_LOADING{$self->{path}} = $self;
1852 $f->resolve_delayed_derefs;
1759 1853
1760 $self->{load_path} = $path; 1854 $self->{load_path} = $path;
1761 1855
1762 1 1856 1
1763} 1857}
… …
1817sub find { 1911sub find {
1818 my ($path, $origin) = @_; 1912 my ($path, $origin) = @_;
1819 1913
1820 $path = normalise $path, $origin && $origin->path; 1914 $path = normalise $path, $origin && $origin->path;
1821 1915
1916 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1917 cf::lock_wait "map_find:$path";
1823 1918
1824 $cf::MAP{$path} || do { 1919 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1826 my $map = new_from_path cf::map $path 1923 my $map = new_from_path cf::map $path
1827 or return; 1924 or return;
1828 1925
1829 $map->{last_save} = $cf::RUNTIME; 1926 $map->{last_save} = $cf::RUNTIME;
1830 1927
… …
1832 or return; 1929 or return;
1833 1930
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1932 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1933 #$cf::WAIT_FOR_TICK->wait;
1934 undef $guard1;
1935 undef $guard2;
1837 $map->reset; 1936 $map->reset;
1838 undef $guard;
1839 return find $path; 1937 return find $path;
1840 } 1938 }
1841 1939
1842 $cf::MAP{$path} = $map 1940 $cf::MAP{$path} = $map
1843 } 1941 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1950 local $self->{deny_reset} = 1; # loading can take a long time
1853 1951
1854 my $path = $self->{path}; 1952 my $path = $self->{path};
1855 1953
1856 { 1954 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1955 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1956
1957 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1958 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1959
1862 $self->in_memory (cf::MAP_LOADING); 1960 $self->in_memory (cf::MAP_LOADING);
1863 1961
1864 $self->alloc; 1962 $self->alloc;
1865 1963
1866 $self->pre_load; 1964 $self->pre_load;
1867 cf::cede_to_tick; 1965 cf::cede_to_tick;
1868 1966
1967 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1969 $self->_load_objects ($f)
1870 or return; 1970 or return;
1871 1971
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1973 if delete $self->{load_original};
1874 1974
1875 if (my $uniq = $self->uniq_path) { 1975 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1976 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1977 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1979 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1980 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs;
1982 }
1880 } 1983 }
1881 } 1984 }
1985
1986 $f->resolve_delayed_derefs;
1882 1987
1883 cf::cede_to_tick; 1988 cf::cede_to_tick;
1884 # now do the right thing for maps 1989 # now do the right thing for maps
1885 $self->link_multipart_objects; 1990 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1991 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2077 }
1973 2078
1974 $MAP_PREFETCH{$path} |= $load; 2079 $MAP_PREFETCH{$path} |= $load;
1975 2080
1976 $MAP_PREFETCHER ||= cf::async { 2081 $MAP_PREFETCHER ||= cf::async {
2082 $Coro::current->{desc} = "map prefetcher";
2083
1977 while (%MAP_PREFETCH) { 2084 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2085 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2086 if (my $map = find $k) {
1980 $map->load if $v; 2087 $map->load if $v;
1981 } 2088 }
… …
2007 return if $self->{deny_save}; 2114 return if $self->{deny_save};
2008 2115
2009 local $self->{last_access} = $self->last_access;#d# 2116 local $self->{last_access} = $self->last_access;#d#
2010 2117
2011 cf::async { 2118 cf::async {
2119 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2120 $_->contr->save for $self->players;
2013 }; 2121 };
2014 2122
2015 if ($uniq) { 2123 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2138
2031 return if $self->players; 2139 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2140 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2141 return if $self->{deny_save};
2034 2142
2143 $self->in_memory (cf::MAP_SWAPPED);
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2147 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2148}
2038 2149
2039sub reset_at { 2150sub reset_at {
2040 my ($self) = @_; 2151 my ($self) = @_;
2041 2152
… …
2073 if $uniq; 2184 if $uniq;
2074 } 2185 }
2075 2186
2076 delete $cf::MAP{$self->path}; 2187 delete $cf::MAP{$self->path};
2077 2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2191 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2192
2082 $self->unlink_save; 2193 $self->unlink_save;
2083 $self->destroy; 2194 $self->destroy;
2084} 2195}
2085 2196
… …
2186 2297
2187sub inv_recursive { 2298sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2299 inv_recursive_ inv $_[0]
2189} 2300}
2190 2301
2302=item $ref = $ob->ref
2303
2304creates and returns a persistent reference to an objetc that can be stored as a string.
2305
2306=item $ob = cf::object::deref ($refstring)
2307
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block.
2310
2311=cut
2312
2313sub deref {
2314 my ($ref) = @_;
2315
2316 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2317 my ($uuid, $name) = ($1, $2);
2318 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2319 or return;
2320 $pl->ob->uuid eq $uuid
2321 or return;
2322
2323 $pl->ob
2324 } else {
2325 warn "$ref: cannot resolve object reference\n";
2326 undef
2327 }
2328}
2329
2191package cf; 2330package cf;
2192 2331
2193=back 2332=back
2194 2333
2195=head3 cf::object::player 2334=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2493
2355 $self->enter_link; 2494 $self->enter_link;
2356 2495
2357 (async { 2496 (async {
2497 $Coro::current->{desc} = "player::goto $path $x $y";
2498
2499 # *tag paths override both path and x|y
2500 if ($path =~ /^\*(.*)$/) {
2501 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2502 my $ob = $obs[rand @obs];
2503
2504 # see if we actually can go there
2505 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2506 $ob = $obs[rand @obs];
2507 } else {
2508 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2509 }
2510 # else put us there anyways for now #d#
2511
2512 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2513 } else {
2514 ($path, $x, $y) = (undef, undef, undef);
2515 }
2516 }
2517
2358 my $map = eval { 2518 my $map = eval {
2359 my $map = cf::map::find $path; 2519 my $map = defined $path ? cf::map::find $path : undef;
2360 2520
2361 if ($map) { 2521 if ($map) {
2362 $map = $map->customise_for ($self); 2522 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2523 $map = $check->($map) if $check && $map;
2364 } else { 2524 } else {
2365 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2366 } 2526 }
2367 2527
2368 $map 2528 $map
2369 }; 2529 };
2370 2530
… …
2460 # if exit is damned, update players death & WoR home-position 2620 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2621 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2622 if $exit->flag (FLAG_DAMNED);
2463 2623
2464 (async { 2624 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2626
2465 $self->deactivate_recursive; # just to be sure 2627 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2628 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2629 $self->goto ($slaying, $hp, $sp);
2468 2630
2469 1; 2631 1;
… …
2506 2668
2507=cut 2669=cut
2508 2670
2509our %CHANNEL = ( 2671our %CHANNEL = (
2510 "c/identify" => { 2672 "c/identify" => {
2511 id => "identify", 2673 id => "infobox",
2512 title => "Identify", 2674 title => "Identify",
2513 reply => undef, 2675 reply => undef,
2514 tooltip => "Items recently identified", 2676 tooltip => "Items recently identified",
2515 }, 2677 },
2678 "c/examine" => {
2679 id => "infobox",
2680 title => "Examine",
2681 reply => undef,
2682 tooltip => "Signs and other items you examined",
2683 },
2684 "c/book" => {
2685 id => "infobox",
2686 title => "Book",
2687 reply => undef,
2688 tooltip => "The contents of a note or book",
2689 },
2690 "c/lookat" => {
2691 id => "infobox",
2692 title => "Look",
2693 reply => undef,
2694 tooltip => "What you saw there",
2695 },
2516); 2696);
2517 2697
2518sub cf::client::send_msg { 2698sub cf::client::send_msg {
2519 my ($self, $channel, $msg, $color, @extra) = @_; 2699 my ($self, $channel, $msg, $color, @extra) = @_;
2520 2700
2521 $msg = $self->pl->expand_cfpod ($msg); 2701 $msg = $self->pl->expand_cfpod ($msg);
2522 2702
2523 $color &= cf::NDI_CLIENT_MASK; # just in case... 2703 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524 2704
2525 # check predefined channels, for the benefit of C 2705 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2706 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel};
2527 2708
2709 $self->ext_msg (channel_info => $channel)
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id};
2713
2528 if (ref $channel) { 2714 } elsif (ref $channel) {
2529 # send meta info to client, if not yet sent 2715 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) { 2716 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel; 2717 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel); 2718 $self->ext_msg (channel_info => $channel)
2719 if $self->can_msg;
2533 } 2720 }
2534 2721
2535 $channel = $channel->{id}; 2722 $channel = $channel->{id};
2536 } 2723 }
2537 2724
… …
2749=pod 2936=pod
2750 2937
2751The following functions and methods are available within a safe environment: 2938The following functions and methods are available within a safe environment:
2752 2939
2753 cf::object 2940 cf::object
2754 contr pay_amount pay_player map x y force_find force_add 2941 contr pay_amount pay_player map x y force_find force_add destroy
2755 insert remove name archname title slaying race decrease_ob_nr 2942 insert remove name archname title slaying race decrease_ob_nr
2756 2943
2757 cf::object::player 2944 cf::object::player
2758 player 2945 player
2759 2946
… …
2766=cut 2953=cut
2767 2954
2768for ( 2955for (
2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race 2957 insert remove inv name archname title slaying race
2771 decrease_ob_nr)], 2958 decrease_ob_nr destroy)],
2772 ["cf::object::player" => qw(player)], 2959 ["cf::object::player" => qw(player)],
2773 ["cf::player" => qw(peaceful)], 2960 ["cf::player" => qw(peaceful)],
2774 ["cf::map" => qw(trigger)], 2961 ["cf::map" => qw(trigger)],
2775) { 2962) {
2776 no strict 'refs'; 2963 no strict 'refs';
… …
3051sub main { 3238sub main {
3052 # we must not ever block the main coroutine 3239 # we must not ever block the main coroutine
3053 local $Coro::idle = sub { 3240 local $Coro::idle = sub {
3054 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3055 (async { 3242 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER";
3056 Event::one_event; 3244 Event::one_event;
3057 })->prio (Coro::PRIO_MAX); 3245 })->prio (Coro::PRIO_MAX);
3058 }; 3246 };
3059 3247
3060 reload_config; 3248 reload_config;
… …
3132 # and maps saved/destroyed asynchronously. 3320 # and maps saved/destroyed asynchronously.
3133 warn "begin emergency player save\n"; 3321 warn "begin emergency player save\n";
3134 for my $login (keys %cf::PLAYER) { 3322 for my $login (keys %cf::PLAYER) {
3135 my $pl = $cf::PLAYER{$login} or next; 3323 my $pl = $cf::PLAYER{$login} or next;
3136 $pl->valid or next; 3324 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3137 $pl->save; 3326 $pl->save;
3138 } 3327 }
3139 warn "end emergency player save\n"; 3328 warn "end emergency player save\n";
3140 3329
3141 warn "begin emergency map save\n"; 3330 warn "begin emergency map save\n";
… …
3189 3378
3190 warn "flushing outstanding aio requests"; 3379 warn "flushing outstanding aio requests";
3191 for (;;) { 3380 for (;;) {
3192 BDB::flush; 3381 BDB::flush;
3193 IO::AIO::flush; 3382 IO::AIO::flush;
3194 Coro::cede; 3383 Coro::cede_notself;
3195 last unless IO::AIO::nreqs || BDB::nreqs; 3384 last unless IO::AIO::nreqs || BDB::nreqs;
3196 warn "iterate..."; 3385 warn "iterate...";
3197 } 3386 }
3198 3387
3199 ++$RELOAD; 3388 ++$RELOAD;
… …
3304register_command "reload" => sub { 3493register_command "reload" => sub {
3305 my ($who, $arg) = @_; 3494 my ($who, $arg) = @_;
3306 3495
3307 if ($who->flag (FLAG_WIZ)) { 3496 if ($who->flag (FLAG_WIZ)) {
3308 $who->message ("reloading server."); 3497 $who->message ("reloading server.");
3498 async {
3499 $Coro::current->{desc} = "perl_reload";
3309 async { reload_perl }; 3500 reload_perl;
3501 };
3310 } 3502 }
3311}; 3503};
3312 3504
3313unshift @INC, $LIBDIR; 3505unshift @INC, $LIBDIR;
3314 3506
… …
3333 my $signal = new Coro::Signal; 3525 my $signal = new Coro::Signal;
3334 push @WAIT_FOR_TICK_BEGIN, $signal; 3526 push @WAIT_FOR_TICK_BEGIN, $signal;
3335 $signal->wait; 3527 $signal->wait;
3336} 3528}
3337 3529
3338 my $min = 1e6;#d#
3339 my $avg = 10;
3340$TICK_WATCHER = Event->timer ( 3530$TICK_WATCHER = Event->timer (
3341 reentrant => 0, 3531 reentrant => 0,
3342 parked => 1, 3532 parked => 1,
3343 prio => 0, 3533 prio => 0,
3344 at => $NEXT_TICK || $TICK, 3534 at => $NEXT_TICK || $TICK,
… …
3352 3542
3353 $NOW = $tick_start = Event::time; 3543 $NOW = $tick_start = Event::time;
3354 3544
3355 cf::server_tick; # one server iteration 3545 cf::server_tick; # one server iteration
3356 3546
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; 3547 $RUNTIME += $TICK;
3381 $NEXT_TICK += $TICK; 3548 $NEXT_TICK += $TICK;
3382 3549
3383 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3550 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3384 $NEXT_RUNTIME_WRITE = $NOW + 10; 3551 $NEXT_RUNTIME_WRITE = $NOW + 10;
3385 Coro::async_pool { 3552 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver";
3386 write_runtime 3554 write_runtime
3387 or warn "ERROR: unable to write runtime file: $!"; 3555 or warn "ERROR: unable to write runtime file: $!";
3388 }; 3556 };
3389 } 3557 }
3390 3558
3391# my $AFTER = Event::time;
3392# warn $AFTER - $NOW;#d#
3393
3394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3395 $sig->send; 3560 $sig->send;
3396 } 3561 }
3397 while (my $sig = shift @WAIT_FOR_TICK) { 3562 while (my $sig = shift @WAIT_FOR_TICK) {
3398 $sig->send; 3563 $sig->send;
… …
3408 3573
3409 $LOAD = ($NOW - $tick_start) / $TICK; 3574 $LOAD = ($NOW - $tick_start) / $TICK;
3410 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3411 3576
3412 _post_tick; 3577 _post_tick;
3413
3414
3415 }, 3578 },
3416); 3579);
3417 3580
3418{ 3581{
3582 BDB::min_parallel 8;
3419 BDB::max_poll_time $TICK * 0.1; 3583 BDB::max_poll_time $TICK * 0.1;
3420 $BDB_POLL_WATCHER = Event->io ( 3584 $BDB_POLL_WATCHER = Event->io (
3421 reentrant => 0, 3585 reentrant => 0,
3422 fd => BDB::poll_fileno, 3586 fd => BDB::poll_fileno,
3423 poll => 'r', 3587 poll => 'r',
3424 prio => 0, 3588 prio => 0,
3425 data => WF_AUTOCANCEL, 3589 data => WF_AUTOCANCEL,
3426 cb => \&BDB::poll_cb, 3590 cb => \&BDB::poll_cb,
3427 ); 3591 );
3428 BDB::min_parallel 8;
3429 3592
3430 BDB::set_sync_prepare { 3593 BDB::set_sync_prepare {
3431 my $status; 3594 my $status;
3432 my $current = $Coro::current; 3595 my $current = $Coro::current;
3433 ( 3596 (
… …
3442 ) 3605 )
3443 }; 3606 };
3444 3607
3445 unless ($DB_ENV) { 3608 unless ($DB_ENV) {
3446 $DB_ENV = BDB::db_env_create; 3609 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1);
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3447 3614
3448 cf::sync_job { 3615 cf::sync_job {
3449 eval { 3616 eval {
3450 BDB::db_env_open 3617 BDB::db_env_open
3451 $DB_ENV, 3618 $DB_ENV,
… …
3453 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3620 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3454 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3621 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3455 0666; 3622 0666;
3456 3623
3457 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3624 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 }; 3625 };
3462 3626
3463 cf::cleanup "db_env_open(db): $@" if $@; 3627 cf::cleanup "db_env_open(db): $@" if $@;
3464 }; 3628 };
3465 } 3629 }
3630
3631 $BDB_DEADLOCK_WATCHER = Event->timer (
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 );
3641 $BDB_CHECKPOINT_WATCHER = Event->timer (
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 );
3651 $BDB_TRICKLE_WATCHER = Event->timer (
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 );
3466} 3661}
3467 3662
3468{ 3663{
3469 IO::AIO::min_parallel 8; 3664 IO::AIO::min_parallel 8;
3470 3665
… …
3473 $AIO_POLL_WATCHER = Event->io ( 3668 $AIO_POLL_WATCHER = Event->io (
3474 reentrant => 0, 3669 reentrant => 0,
3475 data => WF_AUTOCANCEL, 3670 data => WF_AUTOCANCEL,
3476 fd => IO::AIO::poll_fileno, 3671 fd => IO::AIO::poll_fileno,
3477 poll => 'r', 3672 poll => 'r',
3478 prio => 6, 3673 prio => 0,
3479 cb => \&IO::AIO::poll_cb, 3674 cb => \&IO::AIO::poll_cb,
3480 ); 3675 );
3481} 3676}
3482 3677
3483my $_log_backtrace; 3678my $_log_backtrace;
… …
3489 3684
3490 # limit the # of concurrent backtraces 3685 # limit the # of concurrent backtraces
3491 if ($_log_backtrace < 2) { 3686 if ($_log_backtrace < 2) {
3492 ++$_log_backtrace; 3687 ++$_log_backtrace;
3493 async { 3688 async {
3689 $Coro::current->{desc} = "abt $msg";
3690
3494 my @bt = fork_call { 3691 my @bt = fork_call {
3495 @addr = map { sprintf "%x", $_ } @addr; 3692 @addr = map { sprintf "%x", $_ } @addr;
3496 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3693 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3497 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3694 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3498 or die "addr2line: $!"; 3695 or die "addr2line: $!";

Diff Legend

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