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

Diff Legend

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