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.352 by root, Sun Sep 2 04:57:14 2007 UTC vs.
Revision 1.387 by root, Mon Oct 15 23:49:10 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::blocking_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;
1064 $av = eval { (Storable::thaw $av)->{objs} };
1065 }
1066 1126
1127 my $st = eval { Coro::Storable::thaw $av }
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs};
1130 }
1131
1132 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1133 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1134 $decname, length $data, scalar @{$av || []};
1135
1069 return ($data, $av); 1136 ($data, $av)
1070} 1137}
1071 1138
1072=head2 COMMAND CALLBACKS 1139=head2 COMMAND CALLBACKS
1073 1140
1074=over 4 1141=over 4
… …
1260 1327
1261=head3 cf::player 1328=head3 cf::player
1262 1329
1263=over 4 1330=over 4
1264 1331
1332=item cf::player::num_playing
1333
1334Returns the official number of playing players, as per the Crossfire metaserver rules.
1335
1336=cut
1337
1338sub num_playing {
1339 scalar grep
1340 $_->ob->map
1341 && !$_->hidden
1342 && !$_->ob->flag (cf::FLAG_WIZ),
1343 cf::player::list
1344}
1345
1265=item cf::player::find $login 1346=item cf::player::find $login
1266 1347
1267Returns the given player object, loading it if necessary (might block). 1348Returns the given player object, loading it if necessary (might block).
1268 1349
1269=cut 1350=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1385 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1386 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1387 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1388 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1389
1309 my $pl = load_pl path $login 1390 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1391 or return;
1392
1393 my $pl = cf::player::load_pl $f
1394 or return;
1395 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1397 $cf::PLAYER{$login} = $pl
1312 } 1398 }
1313 } 1399 }
1314} 1400}
1315 1401
… …
1413 or return []; 1499 or return [];
1414 1500
1415 my @logins; 1501 my @logins;
1416 1502
1417 for my $login (@$dirs) { 1503 for my $login (@$dirs) {
1504 my $path = path $login;
1505
1506 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1509 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1510 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 }
1421 1512
1422 utf8::decode $login; 1513 utf8::decode $login;
1423 push @logins, $login; 1514 push @logins, $login;
1424 } 1515 }
1425 1516
… …
1750 1841
1751sub load_header_from($) { 1842sub load_header_from($) {
1752 my ($self, $path) = @_; 1843 my ($self, $path) = @_;
1753 1844
1754 utf8::encode $path; 1845 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1846 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1847 or return;
1848
1849 $self->_load_header ($f)
1850 or return;
1851
1852 local $MAP_LOADING{$self->{path}} = $self;
1853 $f->resolve_delayed_derefs;
1760 1854
1761 $self->{load_path} = $path; 1855 $self->{load_path} = $path;
1762 1856
1763 1 1857 1
1764} 1858}
… …
1818sub find { 1912sub find {
1819 my ($path, $origin) = @_; 1913 my ($path, $origin) = @_;
1820 1914
1821 $path = normalise $path, $origin && $origin->path; 1915 $path = normalise $path, $origin && $origin->path;
1822 1916
1917 cf::lock_wait "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1918 cf::lock_wait "map_find:$path";
1824 1919
1825 $cf::MAP{$path} || do { 1920 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path"; 1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1827 my $map = new_from_path cf::map $path 1924 my $map = new_from_path cf::map $path
1828 or return; 1925 or return;
1829 1926
1830 $map->{last_save} = $cf::RUNTIME; 1927 $map->{last_save} = $cf::RUNTIME;
1831 1928
… …
1833 or return; 1930 or return;
1834 1931
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 1933 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 1934 #$cf::WAIT_FOR_TICK->wait;
1935 undef $guard1;
1936 undef $guard2;
1838 $map->reset; 1937 $map->reset;
1839 undef $guard;
1840 return find $path; 1938 return find $path;
1841 } 1939 }
1842 1940
1843 $cf::MAP{$path} = $map 1941 $cf::MAP{$path} = $map
1844 } 1942 }
… …
1853 local $self->{deny_reset} = 1; # loading can take a long time 1951 local $self->{deny_reset} = 1; # loading can take a long time
1854 1952
1855 my $path = $self->{path}; 1953 my $path = $self->{path};
1856 1954
1857 { 1955 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 1956 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 1957
1958 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 1959 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 1960
1863 $self->in_memory (cf::MAP_LOADING); 1961 $self->in_memory (cf::MAP_LOADING);
1864 1962
1865 $self->alloc; 1963 $self->alloc;
1866 1964
1867 $self->pre_load; 1965 $self->pre_load;
1868 cf::cede_to_tick; 1966 cf::cede_to_tick;
1869 1967
1968 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 1970 $self->_load_objects ($f)
1871 or return; 1971 or return;
1872 1972
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1874 if delete $self->{load_original}; 1974 if delete $self->{load_original};
1875 1975
1876 if (my $uniq = $self->uniq_path) { 1976 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 1977 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 1978 unless (aio_stat $uniq) {
1979 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 1980 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 1981 $self->_load_objects ($f);
1982 $f->resolve_delayed_derefs;
1983 }
1881 } 1984 }
1882 } 1985 }
1986
1987 $f->resolve_delayed_derefs;
1883 1988
1884 cf::cede_to_tick; 1989 cf::cede_to_tick;
1885 # now do the right thing for maps 1990 # now do the right thing for maps
1886 $self->link_multipart_objects; 1991 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 1992 $self->difficulty ($self->estimate_difficulty)
… …
1973 } 2078 }
1974 2079
1975 $MAP_PREFETCH{$path} |= $load; 2080 $MAP_PREFETCH{$path} |= $load;
1976 2081
1977 $MAP_PREFETCHER ||= cf::async { 2082 $MAP_PREFETCHER ||= cf::async {
2083 $Coro::current->{desc} = "map prefetcher";
2084
1978 while (%MAP_PREFETCH) { 2085 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2086 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2087 if (my $map = find $k) {
1981 $map->load if $v; 2088 $map->load if $v;
1982 } 2089 }
… …
2008 return if $self->{deny_save}; 2115 return if $self->{deny_save};
2009 2116
2010 local $self->{last_access} = $self->last_access;#d# 2117 local $self->{last_access} = $self->last_access;#d#
2011 2118
2012 cf::async { 2119 cf::async {
2120 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2121 $_->contr->save for $self->players;
2014 }; 2122 };
2015 2123
2016 if ($uniq) { 2124 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2031 2139
2032 return if $self->players; 2140 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2141 return if $self->in_memory != cf::MAP_IN_MEMORY;
2034 return if $self->{deny_save}; 2142 return if $self->{deny_save};
2035 2143
2144 $self->in_memory (cf::MAP_SWAPPED);
2145
2146 $self->deactivate;
2147 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2148 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2149}
2039 2150
2040sub reset_at { 2151sub reset_at {
2041 my ($self) = @_; 2152 my ($self) = @_;
2042 2153
… …
2074 if $uniq; 2185 if $uniq;
2075 } 2186 }
2076 2187
2077 delete $cf::MAP{$self->path}; 2188 delete $cf::MAP{$self->path};
2078 2189
2190 $self->deactivate;
2191 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2192 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2193
2083 $self->unlink_save; 2194 $self->unlink_save;
2084 $self->destroy; 2195 $self->destroy;
2085} 2196}
2086 2197
… …
2187 2298
2188sub inv_recursive { 2299sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2300 inv_recursive_ inv $_[0]
2190} 2301}
2191 2302
2303=item $ref = $ob->ref
2304
2305creates and returns a persistent reference to an objetc that can be stored as a string.
2306
2307=item $ob = cf::object::deref ($refstring)
2308
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block.
2311
2312=cut
2313
2314sub deref {
2315 my ($ref) = @_;
2316
2317 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2318 my ($uuid, $name) = ($1, $2);
2319 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2320 or return;
2321 $pl->ob->uuid eq $uuid
2322 or return;
2323
2324 $pl->ob
2325 } else {
2326 warn "$ref: cannot resolve object reference\n";
2327 undef
2328 }
2329}
2330
2192package cf; 2331package cf;
2193 2332
2194=back 2333=back
2195 2334
2196=head3 cf::object::player 2335=head3 cf::object::player
… …
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2493 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2494
2356 $self->enter_link; 2495 $self->enter_link;
2357 2496
2358 (async { 2497 (async {
2498 $Coro::current->{desc} = "player::goto $path $x $y";
2499
2500 # *tag paths override both path and x|y
2501 if ($path =~ /^\*(.*)$/) {
2502 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2503 my $ob = $obs[rand @obs];
2504
2505 # see if we actually can go there
2506 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2507 $ob = $obs[rand @obs];
2508 } else {
2509 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2510 }
2511 # else put us there anyways for now #d#
2512
2513 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2514 } else {
2515 ($path, $x, $y) = (undef, undef, undef);
2516 }
2517 }
2518
2359 my $map = eval { 2519 my $map = eval {
2360 my $map = cf::map::find $path; 2520 my $map = defined $path ? cf::map::find $path : undef;
2361 2521
2362 if ($map) { 2522 if ($map) {
2363 $map = $map->customise_for ($self); 2523 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2524 $map = $check->($map) if $check && $map;
2365 } else { 2525 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2526 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2527 }
2368 2528
2369 $map 2529 $map
2370 }; 2530 };
2371 2531
… …
2461 # if exit is damned, update players death & WoR home-position 2621 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp) 2622 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED); 2623 if $exit->flag (FLAG_DAMNED);
2464 2624
2465 (async { 2625 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2627
2466 $self->deactivate_recursive; # just to be sure 2628 $self->deactivate_recursive; # just to be sure
2467 unless (eval { 2629 unless (eval {
2468 $self->goto ($slaying, $hp, $sp); 2630 $self->goto ($slaying, $hp, $sp);
2469 2631
2470 1; 2632 1;
… …
2507 2669
2508=cut 2670=cut
2509 2671
2510our %CHANNEL = ( 2672our %CHANNEL = (
2511 "c/identify" => { 2673 "c/identify" => {
2512 id => "identify", 2674 id => "infobox",
2513 title => "Identify", 2675 title => "Identify",
2514 reply => undef, 2676 reply => undef,
2515 tooltip => "Items recently identified", 2677 tooltip => "Items recently identified",
2516 }, 2678 },
2517 "c/examine" => { 2679 "c/examine" => {
2518 id => "examine", 2680 id => "infobox",
2519 title => "Examine", 2681 title => "Examine",
2520 reply => undef, 2682 reply => undef,
2521 tooltip => "Signs and other items you examined", 2683 tooltip => "Signs and other items you examined",
2522 }, 2684 },
2685 "c/lookat" => {
2686 id => "infobox",
2687 title => "Look",
2688 reply => undef,
2689 tooltip => "What you saw there",
2690 },
2523); 2691);
2524 2692
2525sub cf::client::send_msg { 2693sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2694 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2695
2528 $msg = $self->pl->expand_cfpod ($msg); 2696 $msg = $self->pl->expand_cfpod ($msg);
2529 2697
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2698 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2699
2532 # check predefined channels, for the benefit of C 2700 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2701 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel};
2534 2703
2704 $self->ext_msg (channel_info => $channel)
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id};
2708
2535 if (ref $channel) { 2709 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2710 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2711 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2712 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel); 2713 $self->ext_msg (channel_info => $channel)
2714 if $self->can_msg;
2540 } 2715 }
2541 2716
2542 $channel = $channel->{id}; 2717 $channel = $channel->{id};
2543 } 2718 }
2544 2719
… …
2756=pod 2931=pod
2757 2932
2758The following functions and methods are available within a safe environment: 2933The following functions and methods are available within a safe environment:
2759 2934
2760 cf::object 2935 cf::object
2761 contr pay_amount pay_player map x y force_find force_add 2936 contr pay_amount pay_player map x y force_find force_add destroy
2762 insert remove name archname title slaying race decrease_ob_nr 2937 insert remove name archname title slaying race decrease_ob_nr
2763 2938
2764 cf::object::player 2939 cf::object::player
2765 player 2940 player
2766 2941
… …
2773=cut 2948=cut
2774 2949
2775for ( 2950for (
2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race 2952 insert remove inv name archname title slaying race
2778 decrease_ob_nr)], 2953 decrease_ob_nr destroy)],
2779 ["cf::object::player" => qw(player)], 2954 ["cf::object::player" => qw(player)],
2780 ["cf::player" => qw(peaceful)], 2955 ["cf::player" => qw(peaceful)],
2781 ["cf::map" => qw(trigger)], 2956 ["cf::map" => qw(trigger)],
2782) { 2957) {
2783 no strict 'refs'; 2958 no strict 'refs';
… …
3058sub main { 3233sub main {
3059 # we must not ever block the main coroutine 3234 # we must not ever block the main coroutine
3060 local $Coro::idle = sub { 3235 local $Coro::idle = sub {
3061 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3062 (async { 3237 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER";
3063 Event::one_event; 3239 Event::one_event;
3064 })->prio (Coro::PRIO_MAX); 3240 })->prio (Coro::PRIO_MAX);
3065 }; 3241 };
3066 3242
3067 reload_config; 3243 reload_config;
… …
3139 # and maps saved/destroyed asynchronously. 3315 # and maps saved/destroyed asynchronously.
3140 warn "begin emergency player save\n"; 3316 warn "begin emergency player save\n";
3141 for my $login (keys %cf::PLAYER) { 3317 for my $login (keys %cf::PLAYER) {
3142 my $pl = $cf::PLAYER{$login} or next; 3318 my $pl = $cf::PLAYER{$login} or next;
3143 $pl->valid or next; 3319 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3144 $pl->save; 3321 $pl->save;
3145 } 3322 }
3146 warn "end emergency player save\n"; 3323 warn "end emergency player save\n";
3147 3324
3148 warn "begin emergency map save\n"; 3325 warn "begin emergency map save\n";
… …
3196 3373
3197 warn "flushing outstanding aio requests"; 3374 warn "flushing outstanding aio requests";
3198 for (;;) { 3375 for (;;) {
3199 BDB::flush; 3376 BDB::flush;
3200 IO::AIO::flush; 3377 IO::AIO::flush;
3201 Coro::cede; 3378 Coro::cede_notself;
3202 last unless IO::AIO::nreqs || BDB::nreqs; 3379 last unless IO::AIO::nreqs || BDB::nreqs;
3203 warn "iterate..."; 3380 warn "iterate...";
3204 } 3381 }
3205 3382
3206 ++$RELOAD; 3383 ++$RELOAD;
… …
3311register_command "reload" => sub { 3488register_command "reload" => sub {
3312 my ($who, $arg) = @_; 3489 my ($who, $arg) = @_;
3313 3490
3314 if ($who->flag (FLAG_WIZ)) { 3491 if ($who->flag (FLAG_WIZ)) {
3315 $who->message ("reloading server."); 3492 $who->message ("reloading server.");
3493 async {
3494 $Coro::current->{desc} = "perl_reload";
3316 async { reload_perl }; 3495 reload_perl;
3496 };
3317 } 3497 }
3318}; 3498};
3319 3499
3320unshift @INC, $LIBDIR; 3500unshift @INC, $LIBDIR;
3321 3501
… …
3340 my $signal = new Coro::Signal; 3520 my $signal = new Coro::Signal;
3341 push @WAIT_FOR_TICK_BEGIN, $signal; 3521 push @WAIT_FOR_TICK_BEGIN, $signal;
3342 $signal->wait; 3522 $signal->wait;
3343} 3523}
3344 3524
3345 my $min = 1e6;#d#
3346 my $avg = 10;
3347$TICK_WATCHER = Event->timer ( 3525$TICK_WATCHER = Event->timer (
3348 reentrant => 0, 3526 reentrant => 0,
3349 parked => 1, 3527 parked => 1,
3350 prio => 0, 3528 prio => 0,
3351 at => $NEXT_TICK || $TICK, 3529 at => $NEXT_TICK || $TICK,
… …
3359 3537
3360 $NOW = $tick_start = Event::time; 3538 $NOW = $tick_start = Event::time;
3361 3539
3362 cf::server_tick; # one server iteration 3540 cf::server_tick; # one server iteration
3363 3541
3364 0 && sync_job {#d#
3365 for(1..10) {
3366 my $t = Event::time;
3367 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3368 or die;
3369
3370 $map->width (50);
3371 $map->height (50);
3372 $map->alloc;
3373 $map->_load_objects ("/tmp/x.map", 1);
3374 my $t = Event::time - $t;
3375
3376 #next unless $t < 0.0013;#d#
3377 if ($t < $min) {
3378 $min = $t;
3379 }
3380 $avg = $avg * 0.99 + $t * 0.01;
3381 }
3382 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3383 exit 0;
3384 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3385 };
3386
3387 $RUNTIME += $TICK; 3542 $RUNTIME += $TICK;
3388 $NEXT_TICK += $TICK; 3543 $NEXT_TICK += $TICK;
3389 3544
3390 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3545 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3391 $NEXT_RUNTIME_WRITE = $NOW + 10; 3546 $NEXT_RUNTIME_WRITE = $NOW + 10;
3392 Coro::async_pool { 3547 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver";
3393 write_runtime 3549 write_runtime
3394 or warn "ERROR: unable to write runtime file: $!"; 3550 or warn "ERROR: unable to write runtime file: $!";
3395 }; 3551 };
3396 } 3552 }
3397 3553
3398# my $AFTER = Event::time;
3399# warn $AFTER - $NOW;#d#
3400
3401 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3402 $sig->send; 3555 $sig->send;
3403 } 3556 }
3404 while (my $sig = shift @WAIT_FOR_TICK) { 3557 while (my $sig = shift @WAIT_FOR_TICK) {
3405 $sig->send; 3558 $sig->send;
… …
3415 3568
3416 $LOAD = ($NOW - $tick_start) / $TICK; 3569 $LOAD = ($NOW - $tick_start) / $TICK;
3417 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3418 3571
3419 _post_tick; 3572 _post_tick;
3420
3421
3422 }, 3573 },
3423); 3574);
3424 3575
3425{ 3576{
3577 BDB::min_parallel 8;
3426 BDB::max_poll_time $TICK * 0.1; 3578 BDB::max_poll_time $TICK * 0.1;
3427 $BDB_POLL_WATCHER = Event->io ( 3579 $BDB_POLL_WATCHER = Event->io (
3428 reentrant => 0, 3580 reentrant => 0,
3429 fd => BDB::poll_fileno, 3581 fd => BDB::poll_fileno,
3430 poll => 'r', 3582 poll => 'r',
3431 prio => 0, 3583 prio => 0,
3432 data => WF_AUTOCANCEL, 3584 data => WF_AUTOCANCEL,
3433 cb => \&BDB::poll_cb, 3585 cb => \&BDB::poll_cb,
3434 ); 3586 );
3435 BDB::min_parallel 8;
3436 3587
3437 BDB::set_sync_prepare { 3588 BDB::set_sync_prepare {
3438 my $status; 3589 my $status;
3439 my $current = $Coro::current; 3590 my $current = $Coro::current;
3440 ( 3591 (
… …
3449 ) 3600 )
3450 }; 3601 };
3451 3602
3452 unless ($DB_ENV) { 3603 unless ($DB_ENV) {
3453 $DB_ENV = BDB::db_env_create; 3604 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1);
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3454 3609
3455 cf::sync_job { 3610 cf::sync_job {
3456 eval { 3611 eval {
3457 BDB::db_env_open 3612 BDB::db_env_open
3458 $DB_ENV, 3613 $DB_ENV,
… …
3460 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3615 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3461 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3616 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3462 0666; 3617 0666;
3463 3618
3464 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3619 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3465
3466 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3467 $DB_ENV->set_lk_detect;
3468 }; 3620 };
3469 3621
3470 cf::cleanup "db_env_open(db): $@" if $@; 3622 cf::cleanup "db_env_open(db): $@" if $@;
3471 }; 3623 };
3472 } 3624 }
3625
3626 $BDB_DEADLOCK_WATCHER = Event->timer (
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 );
3636 $BDB_CHECKPOINT_WATCHER = Event->timer (
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 );
3646 $BDB_TRICKLE_WATCHER = Event->timer (
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 );
3473} 3656}
3474 3657
3475{ 3658{
3476 IO::AIO::min_parallel 8; 3659 IO::AIO::min_parallel 8;
3477 3660
… …
3480 $AIO_POLL_WATCHER = Event->io ( 3663 $AIO_POLL_WATCHER = Event->io (
3481 reentrant => 0, 3664 reentrant => 0,
3482 data => WF_AUTOCANCEL, 3665 data => WF_AUTOCANCEL,
3483 fd => IO::AIO::poll_fileno, 3666 fd => IO::AIO::poll_fileno,
3484 poll => 'r', 3667 poll => 'r',
3485 prio => 6, 3668 prio => 0,
3486 cb => \&IO::AIO::poll_cb, 3669 cb => \&IO::AIO::poll_cb,
3487 ); 3670 );
3488} 3671}
3489 3672
3490my $_log_backtrace; 3673my $_log_backtrace;
… …
3496 3679
3497 # limit the # of concurrent backtraces 3680 # limit the # of concurrent backtraces
3498 if ($_log_backtrace < 2) { 3681 if ($_log_backtrace < 2) {
3499 ++$_log_backtrace; 3682 ++$_log_backtrace;
3500 async { 3683 async {
3684 $Coro::current->{desc} = "abt $msg";
3685
3501 my @bt = fork_call { 3686 my @bt = fork_call {
3502 @addr = map { sprintf "%x", $_ } @addr; 3687 @addr = map { sprintf "%x", $_ } @addr;
3503 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3688 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3504 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3689 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3505 or die "addr2line: $!"; 3690 or die "addr2line: $!";

Diff Legend

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