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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 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
… …
954 } 969 }
955 970
956 0 971 0
957} 972}
958 973
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 975
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 977
963Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
964 979
… …
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,
… …
2691 id => "infobox", 2749 id => "infobox",
2692 title => "Look", 2750 title => "Look",
2693 reply => undef, 2751 reply => undef,
2694 tooltip => "What you saw there", 2752 tooltip => "What you saw there",
2695 }, 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",
2777 },
2696); 2778);
2697 2779
2698sub cf::client::send_msg { 2780sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2700 2782
… …
3068 { 3150 {
3069 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3070 3152
3071 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3073 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3075 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};
3076 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};
3077 3160
3078 cf::cede_to_tick; 3161 cf::cede_to_tick;
3079 } 3162 }
3080 3163
3081 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3083 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3084 or next; 3168 or next;
3169
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3173 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3107 { 3192 {
3108 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3111 3196
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data; 3200 my $data;
3117 3201
3118 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3119 # prepend meta info 3203 # prepend meta info
3120 3204
3121 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3122 name => $name, 3206 name => $name,
3123 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3124 }); 3208 });
3125 3209
3126 $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};
3127 } else { 3217 } else {
3128 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3129 } 3219 }
3130 3220
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3221 cf::cede_to_tick;
3135 } 3222 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3226
3156 1 3227 1
3157} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3158 3249
3159register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3161 3252
3162 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
… …
3239 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3333 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3335 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3246 }; 3337 };
3247 3338
3248 reload_config; 3339 reload_config;
3249 db_init; 3340 db_init;
3250 load_extensions; 3341 load_extensions;
3251 3342
3252 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3253 Event::loop; 3345 EV::loop;
3254} 3346}
3255 3347
3256############################################################################# 3348#############################################################################
3257# initialisation and cleanup 3349# initialisation and cleanup
3258 3350
3259# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3260BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3269 },
3270 ); 3357 };
3271 } 3358 }
3272} 3359}
3273 3360
3274sub write_runtime { 3361sub write_runtime {
3275 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
… …
3369 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3371 3458
3372 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3373 3460
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3380 for (;;) { 3462 for (;;) {
3381 BDB::flush; 3463 BDB::flush;
3382 IO::AIO::flush; 3464 IO::AIO::flush;
3383 Coro::cede_notself; 3465 Coro::cede_notself;
… …
3477 3559
3478sub reload_perl() { 3560sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3481 3563
3482 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3483 reentrant => 0,
3484 after => 0,
3485 data => WF_AUTOCANCEL,
3486 cb => sub {
3487 do_reload_perl;
3488 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3489 }, 3566 do_reload_perl;
3490 ); 3567 };
3491} 3568}
3492 3569
3493register_command "reload" => sub { 3570register_command "reload" => sub {
3494 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3495 3572
… …
3525 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 3604 $signal->wait;
3528} 3605}
3529 3606
3530$TICK_WATCHER = Event->timer ( 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3540 return; 3611 return;
3541 } 3612 }
3542 3613
3543 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3544 3615
3545 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3546 3617
3547 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
3548 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
3549 3620
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 3623 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 3624 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 3625 write_runtime
3555 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
3556 };
3557 } 3627 };
3628 }
3558 3629
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 3631 $sig->send;
3561 } 3632 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 3634 $sig->send;
3564 } 3635 }
3565 3636
3566 $NOW = Event::time;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 3639
3577 _post_tick; 3640 _post_tick;
3578 }, 3641};
3579); 3642$TICK_WATCHER->priority (EV::MAXPRI);
3580 3643
3581{ 3644{
3645 # configure BDB
3646
3582 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3583 BDB::max_poll_time $TICK * 0.1; 3648 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 3649 $Coro::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 3650
3608 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3611 | BDB::LOG_AUTOREMOVE, 1); 3654 | BDB::LOG_AUTOREMOVE, 1);
… …
3626 3669
3627 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 3671 };
3629 } 3672 }
3630 3673
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 3676 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 3679 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 3682 };
3661} 3683}
3662 3684
3663{ 3685{
3686 # configure IO::AIO
3687
3664 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 3691}
3677 3692
3678my $_log_backtrace; 3693my $_log_backtrace;
3679 3694
3680sub _log_backtrace { 3695sub _log_backtrace {

Diff Legend

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