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.356 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.393 by root, Fri Oct 26 04:47:00 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;
… …
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"
… …
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) = @_;
… …
1005); 1066);
1006 1067
1007sub object_freezer_save { 1068sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1009 1070
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1071 sync_job {
1013 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1016 1076
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1021 close $fh; 1081 close $fh;
1022 1082
1023 if (@$objs) { 1083 if (@$objs) {
1024 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) {
1025 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1089 close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1091 }
… …
1040 } else { 1100 } else {
1041 aio_unlink $filename; 1101 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1043 } 1103 }
1044 }; 1104 };
1045
1046 undef $guard;
1047} 1105}
1048 1106
1049sub object_freezer_as_string { 1107sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1051 1109
… …
1056 1114
1057sub object_thawer_load { 1115sub object_thawer_load {
1058 my ($filename) = @_; 1116 my ($filename) = @_;
1059 1117
1060 my ($data, $av); 1118 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1119
1064 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1065 or return; 1121 or return;
1066 1122
1067 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1125 or return;
1070 1126
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1073 } 1129 }
1074 1130
1131 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1077 1134
1078 ($data, $av) 1135 ($data, $av)
1079} 1136}
1080 1137
1081=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
… …
1269 1326
1270=head3 cf::player 1327=head3 cf::player
1271 1328
1272=over 4 1329=over 4
1273 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
1274=item cf::player::find $login 1345=item cf::player::find $login
1275 1346
1276Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1277 1348
1278=cut 1349=cut
… …
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1388
1318 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1390 or return;
1320 1391
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1323 or return; 1393 or return;
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
1478 1548
1479Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1480 1550
1481=cut 1551=cut
1482 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1483sub expand_cfpod { 1564sub expand_cfpod {
1484 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1485 1566
1486 # escape & and < 1567 my $xml;
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489 1568
1490 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1491 1572
1492 1 while 1573 $group =~ s/&/&amp;/g;
1493 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1494 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1495 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1496 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1578 ([BCGHITU])
1498 # replace G<male|female> tags 1579 <
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1580 (?:
1500 $self->gender ? $2 : $1 1581 ([^<>]*) (?{ $group = $^N })
1501 }ge 1582 | < $interior >
1502 # replace H<hint text> 1583 )
1503 || s{H<([^\>]*)>} 1584 >
1585 %gcsx
1504 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1606 "")
1508 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1509 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1510 1618
1619 for ($xml) {
1511 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1513 1622
1514 # compress some whitespace 1623 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1519 1629
1520 $_ 1630 $xml
1521} 1631}
1632
1633no re 'eval';
1522 1634
1523sub hintmode { 1635sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1637 $_[0]{hintmode}
1526} 1638}
… …
1841sub find { 1953sub find {
1842 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1843 1955
1844 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1845 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1847 1960
1848 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1850 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1851 or return; 1966 or return;
1852 1967
1853 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1854 1969
… …
1856 or return; 1971 or return;
1857 1972
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1861 $map->reset; 1978 $map->reset;
1862 undef $guard;
1863 return find $path; 1979 return find $path;
1864 } 1980 }
1865 1981
1866 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1867 } 1983 }
… …
1876 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1877 1993
1878 my $path = $self->{path}; 1994 my $path = $self->{path};
1879 1995
1880 { 1996 {
1881 my $guard1 = cf::lock_acquire "map_data:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1882 my $guard2 = cf::lock_acquire "map_load:$path";
1883 1998
1999 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2001
1886 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1887 2003
1888 $self->alloc; 2004 $self->alloc;
1889 2005
… …
2003 } 2119 }
2004 2120
2005 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
2006 2122
2007 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2008 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2128 if (my $map = find $k) {
2011 $map->load if $v; 2129 $map->load if $v;
2012 } 2130 }
… …
2038 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2039 2157
2040 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2041 2159
2042 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2044 }; 2163 };
2045 2164
2046 if ($uniq) { 2165 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2061 2180
2062 return if $self->players; 2181 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2064 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2065 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2189 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2190}
2069 2191
2070sub reset_at { 2192sub reset_at {
2071 my ($self) = @_; 2193 my ($self) = @_;
2072 2194
… …
2104 if $uniq; 2226 if $uniq;
2105 } 2227 }
2106 2228
2107 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2108 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2233 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2234
2113 $self->unlink_save; 2235 $self->unlink_save;
2114 $self->destroy; 2236 $self->destroy;
2115} 2237}
2116 2238
… …
2231=cut 2353=cut
2232 2354
2233sub deref { 2355sub deref {
2234 my ($ref) = @_; 2356 my ($ref) = @_;
2235 2357
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2359 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2361 or return;
2243 $pl->ob->uuid eq $uuid 2362 $pl->ob->uuid eq $uuid
2244 or return; 2363 or return;
… …
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2535
2417 $self->enter_link; 2536 $self->enter_link;
2418 2537
2419 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2420 my $map = eval { 2560 my $map = eval {
2421 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2422 2562
2423 if ($map) { 2563 if ($map) {
2424 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2426 } else { 2566 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2568 }
2429 2569
2430 $map 2570 $map
2431 }; 2571 };
2432 2572
… …
2522 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2525 2665
2526 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2527 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2528 unless (eval { 2670 unless (eval {
2529 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2530 2672
2531 1; 2673 1;
… …
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2568 2710
2569=cut 2711=cut
2570 2712
2713# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2714our %CHANNEL = (
2572 "c/identify" => { 2715 "c/identify" => {
2573 id => "identify", 2716 id => "infobox",
2574 title => "Identify", 2717 title => "Identify",
2575 reply => undef, 2718 reply => undef,
2576 tooltip => "Items recently identified", 2719 tooltip => "Items recently identified",
2577 }, 2720 },
2578 "c/examine" => { 2721 "c/examine" => {
2579 id => "examine", 2722 id => "infobox",
2580 title => "Examine", 2723 title => "Examine",
2581 reply => undef, 2724 reply => undef,
2582 tooltip => "Signs and other items you examined", 2725 tooltip => "Signs and other items you examined",
2583 }, 2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2584); 2763);
2585 2764
2586sub cf::client::send_msg { 2765sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2767
2589 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2590 2769
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2771
2593 # check predefined channels, for the benefit of C 2772 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2595 2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2596 if (ref $channel) { 2781 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2785 $self->ext_msg (channel_info => $channel)
2601 if $self->can_msg; 2786 if $self->can_msg;
… …
2818=pod 3003=pod
2819 3004
2820The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2821 3006
2822 cf::object 3007 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2825 3010
2826 cf::object::player 3011 cf::object::player
2827 player 3012 player
2828 3013
… …
2835=cut 3020=cut
2836 3021
2837for ( 3022for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2840 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2841 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2843 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2844) { 3029) {
2845 no strict 'refs'; 3030 no strict 'refs';
… …
3120sub main { 3305sub main {
3121 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3125 Event::one_event; 3311 Event::one_event;
3126 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3127 }; 3313 };
3128 3314
3129 reload_config; 3315 reload_config;
… …
3201 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3203 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3393 $pl->save;
3207 } 3394 }
3208 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3209 3396
3210 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3258 3445
3259 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3260 for (;;) { 3447 for (;;) {
3261 BDB::flush; 3448 BDB::flush;
3262 IO::AIO::flush; 3449 IO::AIO::flush;
3263 Coro::cede; 3450 Coro::cede_notself;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3265 warn "iterate..."; 3452 warn "iterate...";
3266 } 3453 }
3267 3454
3268 ++$RELOAD; 3455 ++$RELOAD;
… …
3373register_command "reload" => sub { 3560register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3375 3562
3376 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3567 reload_perl;
3568 };
3379 } 3569 }
3380}; 3570};
3381 3571
3382unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3383 3573
… …
3402 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3594 $signal->wait;
3405} 3595}
3406 3596
3407 my $min = 1e6;#d#
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3410 reentrant => 0, 3598 reentrant => 0,
3411 parked => 1, 3599 parked => 1,
3412 prio => 0, 3600 prio => 0,
3413 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
… …
3421 3609
3422 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3423 3611
3424 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3425 3613
3426 0 && sync_job {#d#
3427 for(1..10) {
3428 my $t = Event::time;
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3430 or die;
3431
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 };
3448
3449 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3451 3616
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3455 write_runtime 3621 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3457 }; 3623 };
3458 } 3624 }
3459 3625
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3627 $sig->send;
3465 } 3628 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3630 $sig->send;
… …
3477 3640
3478 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3643
3481 _post_tick; 3644 _post_tick;
3482
3483
3484 }, 3645 },
3485); 3646);
3486 3647
3487{ 3648{
3649 BDB::min_parallel 8;
3488 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3489 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3490 reentrant => 0, 3652 reentrant => 0,
3491 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3492 poll => 'r', 3654 poll => 'r',
3493 prio => 0, 3655 prio => 0,
3494 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3496 ); 3658 );
3497 BDB::min_parallel 8;
3498 3659
3499 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3500 my $status; 3661 my $status;
3501 my $current = $Coro::current; 3662 my $current = $Coro::current;
3502 ( 3663 (
… …
3511 ) 3672 )
3512 }; 3673 };
3513 3674
3514 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3681
3517 cf::sync_job { 3682 cf::sync_job {
3518 eval { 3683 eval {
3519 BDB::db_env_open 3684 BDB::db_env_open
3520 $DB_ENV, 3685 $DB_ENV,
… …
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3689 0666;
3525 3690
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3692 };
3531 3693
3532 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3695 };
3534 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3535} 3728}
3536 3729
3537{ 3730{
3538 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3539 3732
… …
3542 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3543 reentrant => 0, 3736 reentrant => 0,
3544 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3546 poll => 'r', 3739 poll => 'r',
3547 prio => 6, 3740 prio => 0,
3548 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3549 ); 3742 );
3550} 3743}
3551 3744
3552my $_log_backtrace; 3745my $_log_backtrace;
… …
3558 3751
3559 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3754 ++$_log_backtrace;
3562 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3563 my @bt = fork_call { 3758 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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