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.390 by root, Thu Oct 25 09:01:24 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 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 ();
32use IO::AIO 2.51 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 81our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 82our $BDB_CHECKPOINT_WATCHER;
… …
89 85
90our %CFG; 86our %CFG;
91 87
92our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 89our $RUNTIME;
90our $NOW;
94 91
95our (%PLAYER, %PLAYER_LOADING); # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 93our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
98 95
… …
162 159
163The raw value load value from the last tick. 160The raw value load value from the last tick.
164 161
165=item %cf::CFG 162=item %cf::CFG
166 163
167Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 165from wherever your confdir points to.
169 166
170=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
171 168
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 191
195 LOG llevError, $msg; 192 LOG llevError, $msg;
196 }; 193 };
197} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
198 200
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 217)) {
216 no strict 'refs'; 218 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 220}
219 221
220$Event::DIED = sub { 222$EV::DIED = sub {
221 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
222}; 224};
223 225
224############################################################################# 226#############################################################################
225 227
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 251 $d
250 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
251} 253}
252 254
253=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
254 256
255Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
256 258
257=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
258 260
259Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
260 262
261=cut 263=cut
262 264
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 266
265sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
267 269
268=item cf::lock_wait $string 270=item cf::lock_wait $string
269 271
270Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
271 273
… …
334 my $guard = Coro::guard { 336 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 337 $TICK_WATCHER->start;
336 }; 338 };
337 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
338 $guard 340 $guard
341}
342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
339} 356}
340 357
341=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
342 359
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 423
407BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
408 425
409=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
410 427
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 429is 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 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 431acceptable.
415 432
416If it must be done, put the blocking parts into C<sync_job>. This will run 433If 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 434the given BLOCK in another coroutine while waiting for the result. The
… …
422 439
423sub sync_job(&) { 440sub sync_job(&) {
424 my ($job) = @_; 441 my ($job) = @_;
425 442
426 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 444 my $time = EV::time;
428 445
429 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
431 448
432 LOG llevError, Carp::longmess "sync job";#d# 449 LOG llevError, Carp::longmess "sync job";#d#
… …
447 464
448 while ($busy) { 465 while ($busy) {
449 if (Coro::nready) { 466 if (Coro::nready) {
450 Coro::cede_notself; 467 Coro::cede_notself;
451 } else { 468 } else {
452 Event::one_event; 469 EV::loop EV::LOOP_ONESHOT;
453 } 470 }
454 } 471 }
455 472
456 $time = Event::time - $time; 473 $time = EV::time - $time;
457 474
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 477
461 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 508=item fork_call { }, $args
492 509
493Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
497 514
498=cut 515=cut
499 516
500sub fork_call(&@) { 517sub fork_call(&@) {
501 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
664 681
665In the following description, CLASS can be any of C<global>, C<object> 682In 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 683C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 684Deliantra).
668 685
669=over 4 686=over 4
670 687
671=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
672 689
… …
954 } 971 }
955 972
956 0 973 0
957} 974}
958 975
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 977
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 979
963Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
964 981
… …
1042cf::attachable->attach ( 1059cf::attachable->attach (
1043 prio => -1000000, 1060 prio => -1000000,
1044 on_instantiate => sub { 1061 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
1046 1063
1047 $data = from_json $data; 1064 $data = decode_json $data;
1048 1065
1049 for (@$data) { 1066 for (@$data) {
1050 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
1051 1068
1052 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
… …
1548 1565
1549Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1550 1567
1551=cut 1568=cut
1552 1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1553sub expand_cfpod { 1581sub expand_cfpod {
1554 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1555 1583
1556 # escape & and < 1584 my $xml;
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559 1585
1560 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1561 1589
1562 1 while 1590 $group =~ s/&/&amp;/g;
1563 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1564 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1565 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1566 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1595 ([BCGHITU])
1568 # replace G<male|female> tags 1596 <
1569 || s{G<([^>|]*)\|([^>]*)>}{ 1597 (?:
1570 $self->gender ? $2 : $1 1598 ([^<>]*) (?{ $group = $^N })
1571 }ge 1599 | < $interior >
1572 # replace H<hint text> 1600 )
1573 || s{H<([^\>]*)>} 1601 >
1602 %gcsx
1574 { 1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "") 1623 "")
1578 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1579 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1580 1635
1636 for ($xml) {
1581 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1583 1639
1584 # compress some whitespace 1640 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1589 1646
1590 $_ 1647 $xml
1591} 1648}
1649
1650no re 'eval';
1592 1651
1593sub hintmode { 1652sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode} 1654 $_[0]{hintmode}
1596} 1655}
… …
2583 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2584 } 2643 }
2585 2644
2586 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2587 2646
2588 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2589 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2591 2650
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2668 2727
2669=cut 2728=cut
2670 2729
2730# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2731our %CHANNEL = (
2672 "c/identify" => { 2732 "c/identify" => {
2673 id => "infobox", 2733 id => "infobox",
2674 title => "Identify", 2734 title => "Identify",
2675 reply => undef, 2735 reply => undef,
… …
2707 }, 2767 },
2708 "c/uptime" => { 2768 "c/uptime" => {
2709 id => "infobox", 2769 id => "infobox",
2710 title => "Uptime", 2770 title => "Uptime",
2711 reply => undef, 2771 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 2772 tooltip => "How long the server has been running since last restart",
2713 }, 2773 },
2714 "c/mapinfo" => { 2774 "c/mapinfo" => {
2715 id => "infobox", 2775 id => "infobox",
2716 title => "Map Info", 2776 title => "Map Info",
2717 reply => undef, 2777 reply => undef,
… …
3092 { 3152 {
3093 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
3094 3154
3095 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
3097 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3100 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3101 3162
3102 cf::cede_to_tick; 3163 cf::cede_to_tick;
3103 } 3164 }
3104 3165
3105 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
3107 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
3108 or next; 3170 or next;
3171
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3175 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3131 { 3194 {
3132 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
3135 3198
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data; 3202 my $data;
3141 3203
3142 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
3143 # prepend meta info 3205 # prepend meta info
3144 3206
3145 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
3146 name => $name, 3208 name => $name,
3147 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
3148 }); 3210 });
3149 3211
3150 $data = pack "(w/a*)*", $meta, $info->{data}; 3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3151 } else { 3219 } else {
3152 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
3153 } 3221 }
3154 3222
3155 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3156 cf::face::set_type $idx, $info->{type};
3157
3158 cf::cede_to_tick; 3223 cf::cede_to_tick;
3159 } 3224 }
3160
3161 if ($soundconf) {
3162 $soundconf = $enc->decode (delete $soundconf->{data});
3163
3164 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3165 my $sound = $soundconf->{compat}[$_]
3166 or next;
3167
3168 my $face = cf::face::find "sound/$sound->[1]";
3169 cf::sound::set $sound->[0] => $face;
3170 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3171 }
3172
3173 while (my ($k, $v) = each %{$soundconf->{event}}) {
3174 my $face = cf::face::find "sound/$v";
3175 cf::sound::set $k => $face;
3176 }
3177 }
3178 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3228
3180 1 3229 1
3181} 3230}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3182 3251
3183register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
3184 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
3185 3254
3186 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
… …
3241sub reload_config { 3310sub reload_config {
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3243 or return; 3312 or return;
3244 3313
3245 local $/; 3314 local $/;
3246 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3247 3316
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3249 3318
3250 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3251 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3263 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3266 (async { 3335 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3337 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3270 }; 3339 };
3271 3340
3272 reload_config; 3341 reload_config;
3273 db_init; 3342 db_init;
3274 load_extensions; 3343 load_extensions;
3275 3344
3276 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3277 Event::loop; 3347 EV::loop;
3278} 3348}
3279 3349
3280############################################################################# 3350#############################################################################
3281# initialisation and cleanup 3351# initialisation and cleanup
3282 3352
3283# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3284BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 signal => $signal,
3290 prio => 0,
3291 cb => sub {
3292 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3293 },
3294 ); 3359 };
3295 } 3360 }
3296} 3361}
3297 3362
3298sub write_runtime { 3363sub write_runtime {
3299 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
… …
3393 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3395 3460
3396 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
3397 3462
3398 warn "cancelling all WF_AUTOCANCEL watchers";
3399 for (Event::all_watchers) {
3400 $_->cancel if $_->data & WF_AUTOCANCEL;
3401 }
3402
3403 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3404 for (;;) { 3464 for (;;) {
3405 BDB::flush; 3465 BDB::flush;
3406 IO::AIO::flush; 3466 IO::AIO::flush;
3407 Coro::cede_notself; 3467 Coro::cede_notself;
… …
3501 3561
3502sub reload_perl() { 3562sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3505 3565
3506 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3507 reentrant => 0,
3508 after => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => sub {
3511 do_reload_perl;
3512 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3513 }, 3568 do_reload_perl;
3514 ); 3569 };
3515} 3570}
3516 3571
3517register_command "reload" => sub { 3572register_command "reload" => sub {
3518 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3519 3574
… …
3549 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 3606 $signal->wait;
3552} 3607}
3553 3608
3554$TICK_WATCHER = Event->timer ( 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3555 reentrant => 0,
3556 parked => 1,
3557 prio => 0,
3558 at => $NEXT_TICK || $TICK,
3559 data => WF_AUTOCANCEL,
3560 cb => sub {
3561 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3564 return; 3613 return;
3565 } 3614 }
3566 3615
3567 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3568 3617
3569 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3570 3619
3571 $RUNTIME += $TICK; 3620 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK; 3621 $NEXT_TICK = $_[0]->at;
3573 3622
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 3625 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 3626 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 3627 write_runtime
3579 or warn "ERROR: unable to write runtime file: $!"; 3628 or warn "ERROR: unable to write runtime file: $!";
3580 };
3581 } 3629 };
3630 }
3582 3631
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 3633 $sig->send;
3585 } 3634 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3587 $sig->send; 3636 $sig->send;
3588 } 3637 }
3589 3638
3590 $NOW = Event::time;
3591
3592 # if we are delayed by four ticks or more, skip them all
3593 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3594
3595 $TICK_WATCHER->at ($NEXT_TICK);
3596 $TICK_WATCHER->start;
3597
3598 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 3641
3601 _post_tick; 3642 _post_tick;
3602 }, 3643};
3603); 3644$TICK_WATCHER->priority (EV::MAXPRI);
3604 3645
3605{ 3646{
3647 # configure BDB
3648
3606 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3607 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 3651 $Coro::BDB::WATCHER->priority (1);
3609 reentrant => 0,
3610 fd => BDB::poll_fileno,
3611 poll => 'r',
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => \&BDB::poll_cb,
3615 );
3616
3617 BDB::set_sync_prepare {
3618 my $status;
3619 my $current = $Coro::current;
3620 (
3621 sub {
3622 $status = $!;
3623 $current->ready; undef $current;
3624 },
3625 sub {
3626 Coro::schedule while defined $current;
3627 $! = $status;
3628 },
3629 )
3630 };
3631 3652
3632 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3635 | BDB::LOG_AUTOREMOVE, 1); 3656 | BDB::LOG_AUTOREMOVE, 1);
… …
3650 3671
3651 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 3673 };
3653 } 3674 }
3654 3675
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 3678 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 3681 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 3684 };
3685} 3685}
3686 3686
3687{ 3687{
3688 # configure IO::AIO
3689
3688 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3693 reentrant => 0,
3694 data => WF_AUTOCANCEL,
3695 fd => IO::AIO::poll_fileno,
3696 poll => 'r',
3697 prio => 0,
3698 cb => \&IO::AIO::poll_cb,
3699 );
3700} 3693}
3701 3694
3702my $_log_backtrace; 3695my $_log_backtrace;
3703 3696
3704sub _log_backtrace { 3697sub _log_backtrace {

Diff Legend

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