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.388 by root, Thu Oct 18 02:56:13 2007 UTC vs.
Revision 1.405 by root, Mon Dec 17 08:03:22 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Event; 9use EV 1.86;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13use Storable (); 13use Storable ();
14 14
15use Coro 4.1 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
… …
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 84our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
… …
89 88
90our %CFG; 89our %CFG;
91 90
92our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 92our $RUNTIME;
93our $NOW;
94 94
95our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
98 98
… …
162 162
163The raw value load value from the last tick. 163The raw value load value from the last tick.
164 164
165=item %cf::CFG 165=item %cf::CFG
166 166
167Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 168from wherever your confdir points to.
169 169
170=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
171 171
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
215)) { 215)) {
216 no strict 'refs'; 216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 218}
219 219
220$Event::DIED = sub { 220$EV::DIED = sub {
221 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
222}; 222};
223 223
224############################################################################# 224#############################################################################
225 225
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 249 $d
250 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
251} 251}
252 252
253=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
254 254
255Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
256 256
257=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
258 258
259Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260 260
261=cut 261=cut
262 262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 264
265sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
267 267
268=item cf::lock_wait $string 268=item cf::lock_wait $string
269 269
270Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
271 271
… …
334 my $guard = Coro::guard { 334 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 335 $TICK_WATCHER->start;
336 }; 336 };
337 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
338 $guard 338 $guard
339}
340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
339} 354}
340 355
341=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
342 357
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 421
407BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
408 423
409=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
410 425
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 429acceptable.
415 430
416If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
… …
422 437
423sub sync_job(&) { 438sub sync_job(&) {
424 my ($job) = @_; 439 my ($job) = @_;
425 440
426 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 442 my $time = EV::time;
428 443
429 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
431 446
432 LOG llevError, Carp::longmess "sync job";#d# 447 LOG llevError, Carp::longmess "sync job";#d#
… …
447 462
448 while ($busy) { 463 while ($busy) {
449 if (Coro::nready) { 464 if (Coro::nready) {
450 Coro::cede_notself; 465 Coro::cede_notself;
451 } else { 466 } else {
452 Event::one_event; 467 EV::loop EV::LOOP_ONESHOT;
453 } 468 }
454 } 469 }
455 470
456 $time = Event::time - $time; 471 $time = EV::time - $time;
457 472
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 475
461 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 506=item fork_call { }, $args
492 507
493Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
497 512
498=cut 513=cut
499 514
500sub fork_call(&@) { 515sub fork_call(&@) {
501 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
664 679
665In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 682Deliantra).
668 683
669=over 4 684=over 4
670 685
671=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
672 687
… …
1042cf::attachable->attach ( 1057cf::attachable->attach (
1043 prio => -1000000, 1058 prio => -1000000,
1044 on_instantiate => sub { 1059 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1046 1061
1047 $data = from_json $data; 1062 $data = decode_json $data;
1048 1063
1049 for (@$data) { 1064 for (@$data) {
1050 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1051 1066
1052 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
1548 1563
1549Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1550 1565
1551=cut 1566=cut
1552 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1553sub expand_cfpod { 1579sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1555 1581
1556 # escape & and < 1582 my $xml;
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1583
1560 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1561 1587
1562 1 while 1588 $group =~ s/&/&amp;/g;
1563 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1568 # replace G<male|female> tags 1594 <
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1570 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1571 }ge 1597 | < $interior >
1572 # replace H<hint text> 1598 )
1573 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1574 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1621 "")
1578 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1579 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1580 1633
1634 for ($xml) {
1581 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1583 1637
1584 # compress some whitespace 1638 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1589 1644
1590 $_ 1645 $xml
1591} 1646}
1647
1648no re 'eval';
1592 1649
1593sub hintmode { 1650sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1652 $_[0]{hintmode}
1596} 1653}
… …
2583 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2584 } 2641 }
2585 2642
2586 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2587 2644
2588 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2589 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2591 2648
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2668 2725
2669=cut 2726=cut
2670 2727
2728# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2729our %CHANNEL = (
2672 "c/identify" => { 2730 "c/identify" => {
2673 id => "infobox", 2731 id => "infobox",
2674 title => "Identify", 2732 title => "Identify",
2675 reply => undef, 2733 reply => undef,
… …
2679 id => "infobox", 2737 id => "infobox",
2680 title => "Examine", 2738 title => "Examine",
2681 reply => undef, 2739 reply => undef,
2682 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2683 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2684 "c/lookat" => { 2748 "c/lookat" => {
2685 id => "infobox", 2749 id => "infobox",
2686 title => "Look", 2750 title => "Look",
2687 reply => undef, 2751 reply => undef,
2688 tooltip => "What you saw there", 2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2689 }, 2777 },
2690); 2778);
2691 2779
2692sub cf::client::send_msg { 2780sub cf::client::send_msg {
2693 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3062 { 3150 {
3063 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3064 3152
3065 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3066 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3067 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3068 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3069 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3070 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3071 3160
3072 cf::cede_to_tick; 3161 cf::cede_to_tick;
3073 } 3162 }
3074 3163
3075 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3076 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3077 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3078 or next; 3168 or next;
3169
3079 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3080 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3081 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3082 } else { 3173 } else {
3083 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3101 { 3192 {
3102 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3103 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3104 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3105 3196
3106 my $soundconf = delete $res->{"res/sound.conf"};
3107
3108 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3109 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3110 my $data; 3200 my $data;
3111 3201
3112 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3113 # prepend meta info 3203 # prepend meta info
3114 3204
3115 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3116 name => $name, 3206 name => $name,
3117 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3118 }); 3208 });
3119 3209
3120 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3121 } else { 3217 } else {
3122 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3123 } 3219 }
3124 3220
3125 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3126 cf::face::set_type $idx, $info->{type};
3127
3128 cf::cede_to_tick; 3221 cf::cede_to_tick;
3129 } 3222 }
3130 3223
3131 if ($soundconf) { 3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3132 $soundconf = $enc->decode (delete $soundconf->{data}); 3225 $soundconf = $enc->decode (delete $soundconf->{data});
3133 3226
3134 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3135 my $sound = $soundconf->{compat}[$_] 3228 my $sound = $soundconf->{compat}[$_]
3136 or next; 3229 or next;
… …
3233 # we must not ever block the main coroutine 3326 # we must not ever block the main coroutine
3234 local $Coro::idle = sub { 3327 local $Coro::idle = sub {
3235 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3236 (async { 3329 (async {
3237 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3330 $Coro::current->{desc} = "IDLE BUG HANDLER";
3238 Event::one_event; 3331 EV::loop EV::LOOP_ONESHOT;
3239 })->prio (Coro::PRIO_MAX); 3332 })->prio (Coro::PRIO_MAX);
3240 }; 3333 };
3241 3334
3242 reload_config; 3335 reload_config;
3243 db_init; 3336 db_init;
3244 load_extensions; 3337 load_extensions;
3245 3338
3246 $TICK_WATCHER->start; 3339 $TICK_WATCHER->start;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3247 Event::loop; 3341 EV::loop;
3248} 3342}
3249 3343
3250############################################################################# 3344#############################################################################
3251# initialisation and cleanup 3345# initialisation and cleanup
3252 3346
3253# install some emergency cleanup handlers 3347# install some emergency cleanup handlers
3254BEGIN { 3348BEGIN {
3349 our %SIGWATCHER = ();
3255 for my $signal (qw(INT HUP TERM)) { 3350 for my $signal (qw(INT HUP TERM)) {
3256 Event->signal ( 3351 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3257 reentrant => 0,
3258 data => WF_AUTOCANCEL,
3259 signal => $signal,
3260 prio => 0,
3261 cb => sub {
3262 cf::cleanup "SIG$signal"; 3352 cf::cleanup "SIG$signal";
3263 },
3264 ); 3353 };
3265 } 3354 }
3266} 3355}
3267 3356
3268sub write_runtime { 3357sub write_runtime {
3269 my $runtime = "$LOCALDIR/runtime"; 3358 my $runtime = "$LOCALDIR/runtime";
… …
3363 warn "syncing database to disk"; 3452 warn "syncing database to disk";
3364 BDB::db_env_txn_checkpoint $DB_ENV; 3453 BDB::db_env_txn_checkpoint $DB_ENV;
3365 3454
3366 # if anything goes wrong in here, we should simply crash as we already saved 3455 # if anything goes wrong in here, we should simply crash as we already saved
3367 3456
3368 warn "cancelling all WF_AUTOCANCEL watchers";
3369 for (Event::all_watchers) {
3370 $_->cancel if $_->data & WF_AUTOCANCEL;
3371 }
3372
3373 warn "flushing outstanding aio requests"; 3457 warn "flushing outstanding aio requests";
3374 for (;;) { 3458 for (;;) {
3375 BDB::flush; 3459 BDB::flush;
3376 IO::AIO::flush; 3460 IO::AIO::flush;
3377 Coro::cede_notself; 3461 Coro::cede_notself;
… …
3471 3555
3472sub reload_perl() { 3556sub reload_perl() {
3473 # doing reload synchronously and two reloads happen back-to-back, 3557 # doing reload synchronously and two reloads happen back-to-back,
3474 # coro crashes during coro_state_free->destroy here. 3558 # coro crashes during coro_state_free->destroy here.
3475 3559
3476 $RELOAD_WATCHER ||= Event->timer ( 3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3477 reentrant => 0,
3478 after => 0,
3479 data => WF_AUTOCANCEL,
3480 cb => sub {
3481 do_reload_perl;
3482 undef $RELOAD_WATCHER; 3561 undef $RELOAD_WATCHER;
3483 }, 3562 do_reload_perl;
3484 ); 3563 };
3485} 3564}
3486 3565
3487register_command "reload" => sub { 3566register_command "reload" => sub {
3488 my ($who, $arg) = @_; 3567 my ($who, $arg) = @_;
3489 3568
… …
3519 my $signal = new Coro::Signal; 3598 my $signal = new Coro::Signal;
3520 push @WAIT_FOR_TICK_BEGIN, $signal; 3599 push @WAIT_FOR_TICK_BEGIN, $signal;
3521 $signal->wait; 3600 $signal->wait;
3522} 3601}
3523 3602
3524$TICK_WATCHER = Event->timer ( 3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3525 reentrant => 0,
3526 parked => 1,
3527 prio => 0,
3528 at => $NEXT_TICK || $TICK,
3529 data => WF_AUTOCANCEL,
3530 cb => sub {
3531 if ($Coro::current != $Coro::main) { 3604 if ($Coro::current != $Coro::main) {
3532 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"
3533 unless ++$bug_warning > 10; 3606 unless ++$bug_warning > 10;
3534 return; 3607 return;
3535 } 3608 }
3536 3609
3537 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = EV::now;
3538 3611
3539 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3540 3613
3541 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3542 $NEXT_TICK += $TICK; 3615 $NEXT_TICK = $_[0]->at;
3543 3616
3544 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3545 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3546 Coro::async_pool { 3619 Coro::async_pool {
3547 $Coro::current->{desc} = "runtime saver"; 3620 $Coro::current->{desc} = "runtime saver";
3548 write_runtime 3621 write_runtime
3549 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3550 };
3551 } 3623 };
3624 }
3552 3625
3553 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3554 $sig->send; 3627 $sig->send;
3555 } 3628 }
3556 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3557 $sig->send; 3630 $sig->send;
3558 } 3631 }
3559 3632
3560 $NOW = Event::time;
3561
3562 # if we are delayed by four ticks or more, skip them all
3563 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3564
3565 $TICK_WATCHER->at ($NEXT_TICK);
3566 $TICK_WATCHER->start;
3567
3568 $LOAD = ($NOW - $tick_start) / $TICK; 3633 $LOAD = ($NOW - $tick_start) / $TICK;
3569 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3570 3635
3571 _post_tick; 3636 _post_tick;
3572 }, 3637};
3573); 3638$TICK_WATCHER->priority (EV::MAXPRI);
3574 3639
3575{ 3640{
3641 # configure BDB
3642
3576 BDB::min_parallel 8; 3643 BDB::min_parallel 8;
3577 BDB::max_poll_time $TICK * 0.1; 3644 BDB::max_poll_reqs $TICK * 0.1;
3578 $BDB_POLL_WATCHER = Event->io ( 3645 $Coro::BDB::WATCHER->priority (1);
3579 reentrant => 0,
3580 fd => BDB::poll_fileno,
3581 poll => 'r',
3582 prio => 0,
3583 data => WF_AUTOCANCEL,
3584 cb => \&BDB::poll_cb,
3585 );
3586
3587 BDB::set_sync_prepare {
3588 my $status;
3589 my $current = $Coro::current;
3590 (
3591 sub {
3592 $status = $!;
3593 $current->ready; undef $current;
3594 },
3595 sub {
3596 Coro::schedule while defined $current;
3597 $! = $status;
3598 },
3599 )
3600 };
3601 3646
3602 unless ($DB_ENV) { 3647 unless ($DB_ENV) {
3603 $DB_ENV = BDB::db_env_create; 3648 $DB_ENV = BDB::db_env_create;
3604 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3605 | BDB::LOG_AUTOREMOVE, 1); 3650 | BDB::LOG_AUTOREMOVE, 1);
… …
3620 3665
3621 cf::cleanup "db_env_open(db): $@" if $@; 3666 cf::cleanup "db_env_open(db): $@" if $@;
3622 }; 3667 };
3623 } 3668 }
3624 3669
3625 $BDB_DEADLOCK_WATCHER = Event->timer ( 3670 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3626 after => 3,
3627 interval => 1,
3628 hard => 1,
3629 prio => 0,
3630 data => WF_AUTOCANCEL,
3631 cb => sub {
3632 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3671 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3633 },
3634 ); 3672 };
3635 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3673 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3636 after => 11,
3637 interval => 60,
3638 hard => 1,
3639 prio => 0,
3640 data => WF_AUTOCANCEL,
3641 cb => sub {
3642 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3674 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3643 },
3644 ); 3675 };
3645 $BDB_TRICKLE_WATCHER = Event->timer ( 3676 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3646 after => 5,
3647 interval => 10,
3648 hard => 1,
3649 prio => 0,
3650 data => WF_AUTOCANCEL,
3651 cb => sub {
3652 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3677 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3653 },
3654 ); 3678 };
3655} 3679}
3656 3680
3657{ 3681{
3682 # configure IO::AIO
3683
3658 IO::AIO::min_parallel 8; 3684 IO::AIO::min_parallel 8;
3659
3660 undef $Coro::AIO::WATCHER;
3661 IO::AIO::max_poll_time $TICK * 0.1; 3685 IO::AIO::max_poll_time $TICK * 0.1;
3662 $AIO_POLL_WATCHER = Event->io ( 3686 $Coro::AIO::WATCHER->priority (1);
3663 reentrant => 0,
3664 data => WF_AUTOCANCEL,
3665 fd => IO::AIO::poll_fileno,
3666 poll => 'r',
3667 prio => 0,
3668 cb => \&IO::AIO::poll_cb,
3669 );
3670} 3687}
3671 3688
3672my $_log_backtrace; 3689my $_log_backtrace;
3673 3690
3674sub _log_backtrace { 3691sub _log_backtrace {

Diff Legend

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