| … | |
… | |
| 444 | warn $@ if $@; |
444 | warn $@ if $@; |
| 445 | undef $busy; |
445 | undef $busy; |
| 446 | })->prio (Coro::PRIO_MAX); |
446 | })->prio (Coro::PRIO_MAX); |
| 447 | |
447 | |
| 448 | while ($busy) { |
448 | while ($busy) { |
|
|
449 | if (Coro::nready) { |
|
|
450 | Coro::cede_notself; |
|
|
451 | } else { |
| 449 | Coro::cede or Event::one_event; |
452 | Event::one_event; |
|
|
453 | } |
| 450 | } |
454 | } |
| 451 | |
455 | |
| 452 | $time = Event::time - $time; |
456 | $time = Event::time - $time; |
| 453 | |
457 | |
| 454 | LOG llevError | logBacktrace, Carp::longmess "long sync job" |
458 | LOG llevError | logBacktrace, Carp::longmess "long sync job" |
| … | |
… | |
| 966 | |
970 | |
| 967 | =cut |
971 | =cut |
| 968 | |
972 | |
| 969 | ############################################################################# |
973 | ############################################################################# |
| 970 | # object support |
974 | # object support |
| 971 | # |
|
|
| 972 | |
975 | |
|
|
976 | sub _object_equal($$); |
|
|
977 | sub _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 | |
|
|
1008 | our $SLOW_MERGES;#d# |
| 973 | sub _can_merge { |
1009 | sub _can_merge { |
| 974 | my ($ob1, $ob2) = @_; |
1010 | my ($ob1, $ob2) = @_; |
| 975 | |
1011 | |
| 976 | return 1;#d# |
1012 | ++$SLOW_MERGES;#d# |
| 977 | |
1013 | |
| 978 | #todo#d# kill yourself and do some recursive checking manually without storable |
1014 | # we do the slow way here |
| 979 | sync_job { |
1015 | return _object_equal $ob1, $ob2 |
| 980 | my $guard = Coro::Storable::guard; |
|
|
| 981 | local $Storable::canonical = 1; |
|
|
| 982 | my $fob1 = Storable::freeze $ob1; |
|
|
| 983 | my $fob2 = Storable::freeze $ob2; |
|
|
| 984 | $fob1 eq $fob2 |
|
|
| 985 | } |
|
|
| 986 | } |
1016 | } |
| 987 | |
1017 | |
| 988 | sub reattach { |
1018 | sub reattach { |
| 989 | # basically do the same as instantiate, without calling instantiate |
1019 | # basically do the same as instantiate, without calling instantiate |
| 990 | my ($obj) = @_; |
1020 | my ($obj) = @_; |
| … | |
… | |
| 1051 | close $fh; |
1081 | close $fh; |
| 1052 | |
1082 | |
| 1053 | if (@$objs) { |
1083 | if (@$objs) { |
| 1054 | 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) { |
| 1055 | chmod SAVE_MODE, $fh; |
1085 | chmod SAVE_MODE, $fh; |
| 1056 | my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; |
1086 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
| 1057 | aio_write $fh, 0, (length $data), $data, 0; |
1087 | aio_write $fh, 0, (length $data), $data, 0; |
| 1058 | aio_fsync $fh if $cf::USE_FSYNC; |
1088 | aio_fsync $fh if $cf::USE_FSYNC; |
| 1059 | close $fh; |
1089 | close $fh; |
| 1060 | aio_rename "$filename.pst~", "$filename.pst"; |
1090 | aio_rename "$filename.pst~", "$filename.pst"; |
| 1061 | } |
1091 | } |
| … | |
… | |
| 1092 | |
1122 | |
| 1093 | unless (aio_stat "$filename.pst") { |
1123 | unless (aio_stat "$filename.pst") { |
| 1094 | (aio_load "$filename.pst", $av) >= 0 |
1124 | (aio_load "$filename.pst", $av) >= 0 |
| 1095 | or return; |
1125 | or return; |
| 1096 | |
1126 | |
| 1097 | my $st = eval { Coro::Storable::thaw $av } |
1127 | my $st = eval { Coro::Storable::thaw $av }; |
| 1098 | || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove |
|
|
| 1099 | $av = $st->{objs}; |
1128 | $av = $st->{objs}; |
| 1100 | } |
1129 | } |
| 1101 | |
1130 | |
| 1102 | utf8::decode (my $decname = $filename); |
1131 | utf8::decode (my $decname = $filename); |
| 1103 | warn sprintf "loading %s (%d,%d)\n", |
1132 | warn sprintf "loading %s (%d,%d)\n", |
| … | |
… | |
| 1519 | |
1548 | |
| 1520 | Expand crossfire pod fragments into protocol xml. |
1549 | Expand crossfire pod fragments into protocol xml. |
| 1521 | |
1550 | |
| 1522 | =cut |
1551 | =cut |
| 1523 | |
1552 | |
|
|
1553 | use re 'eval'; |
|
|
1554 | |
|
|
1555 | my $group; |
|
|
1556 | my $interior; $interior = qr{ |
|
|
1557 | (?: |
|
|
1558 | \ (.*?)\ (?{ $group = $^N }) |
|
|
1559 | | < (??{$interior}) > |
|
|
1560 | ) |
|
|
1561 | }x; |
|
|
1562 | |
| 1524 | sub expand_cfpod { |
1563 | sub expand_cfpod { |
| 1525 | ((my $self), (local $_)) = @_; |
1564 | my ($self, $pod) = @_; |
| 1526 | |
1565 | |
| 1527 | # escape & and < |
1566 | my $xml; |
| 1528 | s/&/&/g; |
|
|
| 1529 | s/(?<![BIUGHT])</</g; |
|
|
| 1530 | |
1567 | |
| 1531 | # this is buggy, it needs to properly take care of nested <'s |
1568 | while () { |
|
|
1569 | if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) { |
|
|
1570 | $group = $1; |
| 1532 | |
1571 | |
| 1533 | 1 while |
1572 | $group =~ s/&/&/g; |
| 1534 | # replace B<>, I<>, U<> etc. |
1573 | $group =~ s/</</g; |
| 1535 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1574 | |
| 1536 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1575 | $xml .= $group; |
| 1537 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1576 | } elsif ($pod =~ m%\G |
| 1538 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1577 | ([BCGHITU]) |
| 1539 | # replace G<male|female> tags |
1578 | < |
| 1540 | || s{G<([^>|]*)\|([^>]*)>}{ |
1579 | (?: |
| 1541 | $self->gender ? $2 : $1 |
1580 | ([^<>]*) (?{ $group = $^N }) |
| 1542 | }ge |
1581 | | < $interior > |
| 1543 | # replace H<hint text> |
1582 | ) |
| 1544 | || s{H<([^\>]*)>} |
1583 | > |
|
|
1584 | %gcsx |
| 1545 | { |
1585 | ) { |
|
|
1586 | my ($code, $data) = ($1, $group); |
|
|
1587 | |
|
|
1588 | if ($code eq "B") { |
|
|
1589 | $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>"; |
|
|
1590 | } elsif ($code eq "I") { |
|
|
1591 | $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>"; |
|
|
1592 | } elsif ($code eq "U") { |
|
|
1593 | $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>"; |
|
|
1594 | } elsif ($code eq "C") { |
|
|
1595 | $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>"; |
|
|
1596 | } elsif ($code eq "T") { |
|
|
1597 | $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>"; |
|
|
1598 | } elsif ($code eq "G") { |
|
|
1599 | my ($male, $female) = split /\|/, $data; |
|
|
1600 | $data = $self->gender ? $female : $male; |
|
|
1601 | $xml .= expand_cfpod ($self, $data); |
|
|
1602 | } elsif ($code eq "H") { |
| 1546 | ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", |
1603 | $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>", |
| 1547 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
1604 | "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", |
| 1548 | "") |
1605 | "") |
| 1549 | [$self->{hintmode}] |
1606 | [$self->{hintmode}]; |
|
|
1607 | } else { |
|
|
1608 | $xml .= "error processing '$code($data)' directive"; |
| 1550 | }ge; |
1609 | } |
|
|
1610 | } else { |
|
|
1611 | if ($pod =~ /\G(.+)/) { |
|
|
1612 | warn "parse error while expanding $pod (at $1)"; |
|
|
1613 | } |
|
|
1614 | last; |
|
|
1615 | } |
|
|
1616 | } |
| 1551 | |
1617 | |
|
|
1618 | for ($xml) { |
| 1552 | # create single paragraphs (very hackish) |
1619 | # create single paragraphs (very hackish) |
| 1553 | s/(?<=\S)\n(?=\w)/ /g; |
1620 | s/(?<=\S)\n(?=\w)/ /g; |
| 1554 | |
1621 | |
| 1555 | # compress some whitespace |
1622 | # compress some whitespace |
| 1556 | s/\s+\n/\n/g; # ws line-ends |
1623 | s/\s+\n/\n/g; # ws line-ends |
| 1557 | s/\n\n+/\n/g; # double lines |
1624 | s/\n\n+/\n/g; # double lines |
| 1558 | s/^\n+//; # beginning lines |
1625 | s/^\n+//; # beginning lines |
| 1559 | s/\n+$//; # ending lines |
1626 | s/\n+$//; # ending lines |
|
|
1627 | } |
| 1560 | |
1628 | |
| 1561 | $_ |
1629 | $xml |
| 1562 | } |
1630 | } |
| 1563 | |
1631 | |
| 1564 | sub hintmode { |
1632 | sub hintmode { |
| 1565 | $_[0]{hintmode} = $_[1] if @_ > 1; |
1633 | $_[0]{hintmode} = $_[1] if @_ > 1; |
| 1566 | $_[0]{hintmode} |
1634 | $_[0]{hintmode} |
| … | |
… | |
| 2637 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2705 | the message, with C<log> being the default. If C<$color> is negative, suppress |
| 2638 | the message unless the client supports the msg packet. |
2706 | the message unless the client supports the msg packet. |
| 2639 | |
2707 | |
| 2640 | =cut |
2708 | =cut |
| 2641 | |
2709 | |
|
|
2710 | # non-persistent channels (usually the info channel) |
| 2642 | our %CHANNEL = ( |
2711 | our %CHANNEL = ( |
| 2643 | "c/identify" => { |
2712 | "c/identify" => { |
| 2644 | id => "infobox", |
2713 | id => "infobox", |
| 2645 | title => "Identify", |
2714 | title => "Identify", |
| 2646 | reply => undef, |
2715 | reply => undef, |
| … | |
… | |
| 2650 | id => "infobox", |
2719 | id => "infobox", |
| 2651 | title => "Examine", |
2720 | title => "Examine", |
| 2652 | reply => undef, |
2721 | reply => undef, |
| 2653 | tooltip => "Signs and other items you examined", |
2722 | tooltip => "Signs and other items you examined", |
| 2654 | }, |
2723 | }, |
|
|
2724 | "c/book" => { |
|
|
2725 | id => "infobox", |
|
|
2726 | title => "Book", |
|
|
2727 | reply => undef, |
|
|
2728 | tooltip => "The contents of a note or book", |
|
|
2729 | }, |
| 2655 | "c/lookat" => { |
2730 | "c/lookat" => { |
| 2656 | id => "infobox", |
2731 | id => "infobox", |
| 2657 | title => "Look", |
2732 | title => "Look", |
| 2658 | reply => undef, |
2733 | reply => undef, |
| 2659 | tooltip => "What you saw there", |
2734 | tooltip => "What you saw there", |
|
|
2735 | }, |
|
|
2736 | "c/who" => { |
|
|
2737 | id => "infobox", |
|
|
2738 | title => "Players", |
|
|
2739 | reply => undef, |
|
|
2740 | tooltip => "Shows players who are currently online", |
|
|
2741 | }, |
|
|
2742 | "c/body" => { |
|
|
2743 | id => "infobox", |
|
|
2744 | title => "Body Parts", |
|
|
2745 | reply => undef, |
|
|
2746 | tooltip => "Shows which body parts you posess and are available", |
|
|
2747 | }, |
|
|
2748 | "c/uptime" => { |
|
|
2749 | id => "infobox", |
|
|
2750 | title => "Uptime", |
|
|
2751 | reply => undef, |
|
|
2752 | tooltip => "How long the server has been running since last restart", |
|
|
2753 | }, |
|
|
2754 | "c/mapinfo" => { |
|
|
2755 | id => "infobox", |
|
|
2756 | title => "Map Info", |
|
|
2757 | reply => undef, |
|
|
2758 | tooltip => "Information related to the maps", |
| 2660 | }, |
2759 | }, |
| 2661 | ); |
2760 | ); |
| 2662 | |
2761 | |
| 2663 | sub cf::client::send_msg { |
2762 | sub cf::client::send_msg { |
| 2664 | my ($self, $channel, $msg, $color, @extra) = @_; |
2763 | my ($self, $channel, $msg, $color, @extra) = @_; |
| … | |
… | |
| 3343 | |
3442 | |
| 3344 | warn "flushing outstanding aio requests"; |
3443 | warn "flushing outstanding aio requests"; |
| 3345 | for (;;) { |
3444 | for (;;) { |
| 3346 | BDB::flush; |
3445 | BDB::flush; |
| 3347 | IO::AIO::flush; |
3446 | IO::AIO::flush; |
| 3348 | Coro::cede; |
3447 | Coro::cede_notself; |
| 3349 | last unless IO::AIO::nreqs || BDB::nreqs; |
3448 | last unless IO::AIO::nreqs || BDB::nreqs; |
| 3350 | warn "iterate..."; |
3449 | warn "iterate..."; |
| 3351 | } |
3450 | } |
| 3352 | |
3451 | |
| 3353 | ++$RELOAD; |
3452 | ++$RELOAD; |
