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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
198 210
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 227)) {
216 no strict 'refs'; 228 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 230}
219 231
220$Event::DIED = sub { 232$EV::DIED = sub {
221 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
222}; 234};
223 235
224############################################################################# 236#############################################################################
225 237
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 261 $d
250 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
251} 263}
252 264
253=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
254 266
255Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
256 268
257=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
258 270
259Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
260 272
261=cut 273=cut
262 274
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 276
265sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
267 279
268=item cf::lock_wait $string 280=item cf::lock_wait $string
269 281
270Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
271 283
… …
334 my $guard = Coro::guard { 346 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 347 $TICK_WATCHER->start;
336 }; 348 };
337 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
338 $guard 350 $guard
351}
352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
339} 366}
340 367
341=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
342 369
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 433
407BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
408 435
409=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
410 437
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 439is 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 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 441acceptable.
415 442
416If it must be done, put the blocking parts into C<sync_job>. This will run 443If 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 444the given BLOCK in another coroutine while waiting for the result. The
… …
422 449
423sub sync_job(&) { 450sub sync_job(&) {
424 my ($job) = @_; 451 my ($job) = @_;
425 452
426 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 454 my $time = EV::time;
428 455
429 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
431 458
432 LOG llevError, Carp::longmess "sync job";#d# 459 LOG llevError, Carp::longmess "sync job";#d#
… …
447 474
448 while ($busy) { 475 while ($busy) {
449 if (Coro::nready) { 476 if (Coro::nready) {
450 Coro::cede_notself; 477 Coro::cede_notself;
451 } else { 478 } else {
452 Event::one_event; 479 EV::loop EV::LOOP_ONESHOT;
453 } 480 }
454 } 481 }
455 482
456 $time = Event::time - $time; 483 $time = EV::time - $time;
457 484
458 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460 487
461 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
491=item fork_call { }, $args 518=item fork_call { }, $args
492 519
493Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
497 524
498=cut 525=cut
499 526
500sub fork_call(&@) { 527sub fork_call(&@) {
501 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
662attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
664 691
665In the following description, CLASS can be any of C<global>, C<object> 692In 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 693C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 694Deliantra).
668 695
669=over 4 696=over 4
670 697
671=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
672 699
… …
954 } 981 }
955 982
956 0 983 0
957} 984}
958 985
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 987
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 989
963Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
964 991
… …
1042cf::attachable->attach ( 1069cf::attachable->attach (
1043 prio => -1000000, 1070 prio => -1000000,
1044 on_instantiate => sub { 1071 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1046 1073
1047 $data = from_json $data; 1074 $data = decode_json $data;
1048 1075
1049 for (@$data) { 1076 for (@$data) {
1050 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1051 1078
1052 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1081 close $fh; 1108 close $fh;
1082 1109
1083 if (@$objs) { 1110 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1116 close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1118 }
… …
1122 1149
1123 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1152 or return;
1126 1153
1127 my $st = eval { Coro::Storable::thaw $av } 1154 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1155 $av = $st->{objs};
1130 } 1156 }
1131 1157
1132 utf8::decode (my $decname = $filename); 1158 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
… …
1290 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1292 1318
1293 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1294 warn $msg; 1320 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1296 exit 1;
1297 } 1322 }
1298 1323
1299 warn $msg; 1324 warn $msg;
1300 } 1325 }
1301 1326
… …
1549 1574
1550Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1551 1576
1552=cut 1577=cut
1553 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1554sub expand_cfpod { 1590sub expand_cfpod {
1555 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1556 1592
1557 # escape & and < 1593 my $xml;
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560 1594
1561 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1562 1598
1563 1 while 1599 $group =~ s/&/&amp;/g;
1564 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1565 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1566 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1567 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1569 # replace G<male|female> tags 1605 <
1570 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1571 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1572 }ge 1608 | < $interior >
1573 # replace H<hint text> 1609 )
1574 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1575 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "") 1632 "")
1579 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1580 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1581 1644
1645 for ($xml) {
1582 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1584 1648
1585 # compress some whitespace 1649 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1590 1655
1591 $_ 1656 $xml
1592} 1657}
1658
1659no re 'eval';
1593 1660
1594sub hintmode { 1661sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode} 1663 $_[0]{hintmode}
1597} 1664}
… …
2584 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2585 } 2652 }
2586 2653
2587 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2588 2655
2589 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2590 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2592 2659
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2669 2736
2670=cut 2737=cut
2671 2738
2739# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2740our %CHANNEL = (
2673 "c/identify" => { 2741 "c/identify" => {
2674 id => "infobox", 2742 id => "infobox",
2675 title => "Identify", 2743 title => "Identify",
2676 reply => undef, 2744 reply => undef,
… …
2680 id => "infobox", 2748 id => "infobox",
2681 title => "Examine", 2749 title => "Examine",
2682 reply => undef, 2750 reply => undef,
2683 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2684 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2685 "c/lookat" => { 2759 "c/lookat" => {
2686 id => "infobox", 2760 id => "infobox",
2687 title => "Look", 2761 title => "Look",
2688 reply => undef, 2762 reply => undef,
2689 tooltip => "What you saw there", 2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2690 }, 2788 },
2691); 2789);
2692 2790
2693sub cf::client::send_msg { 2791sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3063 { 3161 {
3064 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3065 3163
3066 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3068 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3072 3171
3073 cf::cede_to_tick; 3172 cf::cede_to_tick;
3074 } 3173 }
3075 3174
3076 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3078 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3079 or next; 3179 or next;
3180
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3184 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3102 { 3203 {
3103 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3106 3207
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data; 3211 my $data;
3112 3212
3113 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3114 # prepend meta info 3214 # prepend meta info
3115 3215
3116 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3117 name => $name, 3217 name => $name,
3118 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3119 }); 3219 });
3120 3220
3121 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3122 } else { 3228 } else {
3123 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3124 } 3230 }
3125 3231
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3232 cf::cede_to_tick;
3130 } 3233 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3237
3151 1 3238 1
3152} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3153 3260
3154register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3156 3263
3157 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3212sub reload_config { 3319sub reload_config {
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3321 or return;
3215 3322
3216 local $/; 3323 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3218 3325
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3220 3327
3221 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3222 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3234 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3344 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3346 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3241 }; 3348 };
3242 3349
3243 reload_config; 3350 reload_config;
3244 db_init; 3351 db_init;
3245 load_extensions; 3352 load_extensions;
3246 3353
3247 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3248 Event::loop; 3356 EV::loop;
3249} 3357}
3250 3358
3251############################################################################# 3359#############################################################################
3252# initialisation and cleanup 3360# initialisation and cleanup
3253 3361
3254# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3255BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3264 },
3265 ); 3368 };
3266 } 3369 }
3267} 3370}
3268 3371
3269sub write_runtime { 3372sub write_runtime {
3270 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3364 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3469
3367 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3368 3471
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373
3374 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3375 for (;;) { 3473 for (;;) {
3376 BDB::flush; 3474 BDB::flush;
3377 IO::AIO::flush; 3475 IO::AIO::flush;
3378 Coro::cede_notself; 3476 Coro::cede_notself;
… …
3459 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3460 3558
3461 1 3559 1
3462 } or do { 3560 } or do {
3463 warn $@; 3561 warn $@;
3464 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3465 exit 1;
3466 }; 3563 };
3467 3564
3468 warn "reloaded"; 3565 warn "reloaded";
3469}; 3566};
3470 3567
… …
3472 3569
3473sub reload_perl() { 3570sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3476 3573
3477 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3478 reentrant => 0,
3479 after => 0,
3480 data => WF_AUTOCANCEL,
3481 cb => sub {
3482 do_reload_perl; 3575 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3484 },
3485 ); 3577 };
3486} 3578}
3487 3579
3488register_command "reload" => sub { 3580register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3490 3582
… …
3520 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3614 $signal->wait;
3523} 3615}
3524 3616
3525$TICK_WATCHER = Event->timer ( 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3535 return; 3621 return;
3536 } 3622 }
3537 3623
3538 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3539 3625
3540 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3541 3627
3542 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3544 3630
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 3633 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3634 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3635 write_runtime
3550 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3637 };
3638 }
3553 3639
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3641 $sig->send;
3556 } 3642 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3644 $sig->send;
3559 } 3645 }
3560 3646
3561 $NOW = Event::time;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3649
3572 _post_tick; 3650 _post_tick;
3573 }, 3651};
3574); 3652$TICK_WATCHER->priority (EV::MAXPRI);
3575 3653
3576{ 3654{
3655 # configure BDB
3656
3577 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3659 $Coro::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 3660
3603 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3606 | BDB::LOG_AUTOREMOVE, 1); 3664 | BDB::LOG_AUTOREMOVE, 1);
… …
3621 3679
3622 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3681 };
3624 } 3682 }
3625 3683
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 ); 3686 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3689 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3692 };
3656} 3693}
3657 3694
3658{ 3695{
3696 # configure IO::AIO
3697
3659 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3701}
3672 3702
3673my $_log_backtrace; 3703my $_log_backtrace;
3674 3704
3675sub _log_backtrace { 3705sub _log_backtrace {

Diff Legend

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