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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.394 by root, Thu Nov 8 19:43:25 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;
85our $BDB_CHECKPOINT_WATCHER; 86our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 87our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 88our $DB_ENV;
88 89
89our %CFG; 90our %CFG;
… …
353our @SLOT_QUEUE; 354our @SLOT_QUEUE;
354our $SLOT_QUEUE; 355our $SLOT_QUEUE;
355 356
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
358 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
359 362
360 while () { 363 while () {
361 next_job: 364 next_job:
362 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
370 } 373 }
371 } 374 }
372 } 375 }
373 376
374 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 380 $signal->wait;
378 } else { 381 } else {
379 Coro::schedule; 382 Coro::schedule;
380 } 383 }
… …
403 406
404BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
405 408
406=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
407 410
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 412is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 414acceptable.
412 415
413If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
… …
424 my $time = Event::time; 427 my $time = Event::time;
425 428
426 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
428 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
429 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 435 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
432 437
433 my $busy = 1; 438 my $busy = 1;
434 my @res; 439 my @res;
435 440
436 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 443 @res = eval { $job->() };
438 warn $@ if $@; 444 warn $@ if $@;
439 undef $busy; 445 undef $busy;
440 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
441 447
442 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
443 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
444 } 454 }
445 455
446 $time = Event::time - $time; 456 $time = Event::time - $time;
447 457
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
654 664
655In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 667Deliantra).
658 668
659=over 4 669=over 4
660 670
661=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
662 672
… …
960 970
961=cut 971=cut
962 972
963############################################################################# 973#############################################################################
964# object support 974# object support
965#
966 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#
967sub _can_merge { 1009sub _can_merge {
968 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
969 1011
970 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1013
974 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
975} 1016}
976 1017
977sub reattach { 1018sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1025); 1066);
1026 1067
1027sub object_freezer_save { 1068sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1029 1070
1030 my $guard = cf::lock_acquire "io";
1031
1032 sync_job { 1071 sync_job {
1033 if (length $$rdata) { 1072 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1073 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
… …
1042 close $fh; 1081 close $fh;
1043 1082
1044 if (@$objs) { 1083 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1089 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1091 }
… …
1061 } else { 1100 } else {
1062 aio_unlink $filename; 1101 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1064 } 1103 }
1065 }; 1104 };
1066
1067 undef $guard;
1068} 1105}
1069 1106
1070sub object_freezer_as_string { 1107sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1072 1109
… …
1077 1114
1078sub object_thawer_load { 1115sub object_thawer_load {
1079 my ($filename) = @_; 1116 my ($filename) = @_;
1080 1117
1081 my ($data, $av); 1118 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1119
1085 (aio_load $filename, $data) >= 0 1120 (aio_load $filename, $data) >= 0
1086 or return; 1121 or return;
1087 1122
1088 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1125 or return;
1091 1126
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1094 } 1129 }
1095 1130
1096 utf8::decode (my $decname = $filename); 1131 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1388
1354 my $f = new_from_file cf::object::thawer path $login 1389 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1390 or return;
1356 1391
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1392 my $pl = cf::player::load_pl $f
1359 or return; 1393 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1394 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1395 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
… …
1514 1548
1515Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1516 1550
1517=cut 1551=cut
1518 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
1519sub expand_cfpod { 1564sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1521 1566
1522 # escape & and < 1567 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1568
1526 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1527 1572
1528 1 while 1573 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1578 ([BCGHITU])
1534 # replace G<male|female> tags 1579 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1580 (?:
1536 $self->gender ? $2 : $1 1581 ([^<>]*) (?{ $group = $^N })
1537 }ge 1582 | < $interior >
1538 # replace H<hint text> 1583 )
1539 || s{H<([^\>]*)>} 1584 >
1585 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1606 "")
1544 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1546 1618
1619 for ($xml) {
1547 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1549 1622
1550 # compress some whitespace 1623 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1555 1629
1556 $_ 1630 $xml
1557} 1631}
1632
1633no re 'eval';
1558 1634
1559sub hintmode { 1635sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1637 $_[0]{hintmode}
1562} 1638}
… …
2043 } 2119 }
2044 2120
2045 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
2046 2122
2047 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
2048 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2128 if (my $map = find $k) {
2051 $map->load if $v; 2129 $map->load if $v;
2052 } 2130 }
… …
2078 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2079 2157
2080 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2081 2159
2082 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2084 }; 2163 };
2085 2164
2086 if ($uniq) { 2165 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2353=cut
2275 2354
2276sub deref { 2355sub deref {
2277 my ($ref) = @_; 2356 my ($ref) = @_;
2278 2357
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2359 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2361 or return;
2286 $pl->ob->uuid eq $uuid 2362 $pl->ob->uuid eq $uuid
2287 or return; 2363 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2535
2460 $self->enter_link; 2536 $self->enter_link;
2461 2537
2462 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2463 # *tag paths override both path and x|y 2541 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2542 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2544 my $ob = $obs[rand @obs];
2467 2545
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2546 # see if we actually can go there
2469 # for suitability. 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#
2470 2553
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2472 } 2557 }
2473 } 2558 }
2474 2559
2475 my $map = eval { 2560 my $map = eval {
2476 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2477 2562
2478 if ($map) { 2563 if ($map) {
2479 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2481 } else { 2566 } else {
2482 $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);
2483 } 2568 }
2484 2569
2485 $map 2570 $map
2486 }; 2571 };
2487 2572
… …
2577 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2580 2665
2581 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2582 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2670 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2585 2672
2586 1; 2673 1;
… …
2621the 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
2622the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2623 2710
2624=cut 2711=cut
2625 2712
2713# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2714our %CHANNEL = (
2627 "c/identify" => { 2715 "c/identify" => {
2628 id => "identify", 2716 id => "infobox",
2629 title => "Identify", 2717 title => "Identify",
2630 reply => undef, 2718 reply => undef,
2631 tooltip => "Items recently identified", 2719 tooltip => "Items recently identified",
2632 }, 2720 },
2633 "c/examine" => { 2721 "c/examine" => {
2634 id => "examine", 2722 id => "infobox",
2635 title => "Examine", 2723 title => "Examine",
2636 reply => undef, 2724 reply => undef,
2637 tooltip => "Signs and other items you examined", 2725 tooltip => "Signs and other items you examined",
2638 }, 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 },
2639); 2763);
2640 2764
2641sub cf::client::send_msg { 2765sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2767
2644 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2645 2769
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2771
2648 # check predefined channels, for the benefit of C 2772 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2650 2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2651 if (ref $channel) { 2781 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2785 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2786 if $self->can_msg;
… …
2873=pod 3003=pod
2874 3004
2875The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2876 3006
2877 cf::object 3007 cf::object
2878 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
2879 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2880 3010
2881 cf::object::player 3011 cf::object::player
2882 player 3012 player
2883 3013
… …
2890=cut 3020=cut
2891 3021
2892for ( 3022for (
2893 ["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
2894 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2899) { 3029) {
2900 no strict 'refs'; 3030 no strict 'refs';
… …
3175sub main { 3305sub main {
3176 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3178 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#
3179 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3180 Event::one_event; 3311 Event::one_event;
3181 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3182 }; 3313 };
3183 3314
3184 reload_config; 3315 reload_config;
… …
3256 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3393 $pl->save;
3262 } 3394 }
3263 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3264 3396
3265 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3313 3445
3314 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3315 for (;;) { 3447 for (;;) {
3316 BDB::flush; 3448 BDB::flush;
3317 IO::AIO::flush; 3449 IO::AIO::flush;
3318 Coro::cede; 3450 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3452 warn "iterate...";
3321 } 3453 }
3322 3454
3323 ++$RELOAD; 3455 ++$RELOAD;
… …
3428register_command "reload" => sub { 3560register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3430 3562
3431 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3567 reload_perl;
3568 };
3434 } 3569 }
3435}; 3570};
3436 3571
3437unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3438 3573
… …
3456 3591
3457 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3594 $signal->wait;
3460} 3595}
3461
3462our $stat_fh;
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464 3596
3465$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3466 reentrant => 0, 3598 reentrant => 0,
3467 parked => 1, 3599 parked => 1,
3468 prio => 0, 3600 prio => 0,
… …
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
3475 return; 3607 return;
3476 } 3608 }
3477 3609
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3481 3611
3482 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3483 3613
3484 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3486 3616
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3489 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 3621 write_runtime
3491 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3492 }; 3623 };
3493 } 3624 }
3494 3625
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3627 $sig->send;
3500 } 3628 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3630 $sig->send;
… …
3512 3640
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3643
3516 _post_tick; 3644 _post_tick;
3517
3518 # gather some statistics#d#
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3521 }, 3645 },
3522); 3646);
3523 3647
3524{ 3648{
3525 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
… …
3548 ) 3672 )
3549 }; 3673 };
3550 3674
3551 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3552 $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);
3553 3681
3554 cf::sync_job { 3682 cf::sync_job {
3555 eval { 3683 eval {
3556 BDB::db_env_open 3684 BDB::db_env_open
3557 $DB_ENV, 3685 $DB_ENV,
… …
3559 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
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 3689 0666;
3562 3690
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 3692 };
3569 3693
3570 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 3695 };
3572 } 3696 }
3573 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 );
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3575 after => 11, 3709 after => 11,
3576 interval => 60, 3710 interval => 60,
3577 hard => 1, 3711 hard => 1,
3578 prio => 0, 3712 prio => 0,
… …
3601 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3602 reentrant => 0, 3736 reentrant => 0,
3603 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3605 poll => 'r', 3739 poll => 'r',
3606 prio => 6, 3740 prio => 0,
3607 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3608 ); 3742 );
3609} 3743}
3610 3744
3611my $_log_backtrace; 3745my $_log_backtrace;
… …
3617 3751
3618 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3620 ++$_log_backtrace; 3754 ++$_log_backtrace;
3621 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3622 my @bt = fork_call { 3758 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 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 |"
3626 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

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