ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.385 by root, Fri Oct 12 19:13:26 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#
… …
444 warn $@ if $@; 471 warn $@ if $@;
445 undef $busy; 472 undef $busy;
446 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
447 474
448 while ($busy) { 475 while ($busy) {
449 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
450 } 480 }
481 }
451 482
452 $time = Event::time - $time; 483 $time = EV::time - $time;
453 484
454 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456 487
457 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
487=item fork_call { }, $args 518=item fork_call { }, $args
488 519
489Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
493 524
494=cut 525=cut
495 526
496sub fork_call(&@) { 527sub fork_call(&@) {
497 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
658attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
660 691
661In 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>
662C<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
663Crossfire TRT). 694Deliantra).
664 695
665=over 4 696=over 4
666 697
667=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
668 699
… …
950 } 981 }
951 982
952 0 983 0
953} 984}
954 985
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 987
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 989
959Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
960 991
… …
966 997
967=cut 998=cut
968 999
969############################################################################# 1000#############################################################################
970# object support 1001# object support
971#
972 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
973sub _can_merge { 1036sub _can_merge {
974 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
975 1038
976 return 1;#d# 1039 ++$SLOW_MERGES;#d#
977 1040
978 #todo#d# kill yourself and do some recursive checking manually without storable 1041 # we do the slow way here
979 sync_job { 1042 return _object_equal $ob1, $ob2
980 my $guard = Coro::Storable::guard;
981 local $Storable::canonical = 1;
982 my $fob1 = Storable::freeze $ob1;
983 my $fob2 = Storable::freeze $ob2;
984 $fob1 eq $fob2
985 }
986} 1043}
987 1044
988sub reattach { 1045sub reattach {
989 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
990 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1012cf::attachable->attach ( 1069cf::attachable->attach (
1013 prio => -1000000, 1070 prio => -1000000,
1014 on_instantiate => sub { 1071 on_instantiate => sub {
1015 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1016 1073
1017 $data = from_json $data; 1074 $data = decode_json $data;
1018 1075
1019 for (@$data) { 1076 for (@$data) {
1020 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1021 1078
1022 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1051 close $fh; 1108 close $fh;
1052 1109
1053 if (@$objs) { 1110 if (@$objs) {
1054 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) {
1055 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1057 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1058 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1059 close $fh; 1116 close $fh;
1060 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1061 } 1118 }
… …
1092 1149
1093 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1094 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1095 or return; 1152 or return;
1096 1153
1097 my $st = eval { Coro::Storable::thaw $av } 1154 my $st = eval { Coro::Storable::thaw $av };
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs}; 1155 $av = $st->{objs};
1100 } 1156 }
1101 1157
1102 utf8::decode (my $decname = $filename); 1158 utf8::decode (my $decname = $filename);
1103 warn sprintf "loading %s (%d,%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
… …
1260 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1261 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1262 1318
1263 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1264 warn $msg; 1320 warn $msg;
1265 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1266 exit 1;
1267 } 1322 }
1268 1323
1269 warn $msg; 1324 warn $msg;
1270 } 1325 }
1271 1326
… …
1519 1574
1520Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1521 1576
1522=cut 1577=cut
1523 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
1524sub expand_cfpod { 1590sub expand_cfpod {
1525 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1526 1592
1527 # escape & and < 1593 my $xml;
1528 s/&/&amp;/g;
1529 s/(?<![BIUGHT])</&lt;/g;
1530 1594
1531 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1532 1598
1533 1 while 1599 $group =~ s/&/&amp;/g;
1534 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1535 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1536 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1537 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1539 # replace G<male|female> tags 1605 <
1540 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1541 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1542 }ge 1608 | < $interior >
1543 # replace H<hint text> 1609 )
1544 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1545 { 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") {
1546 ("<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>",
1547 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1548 "") 1632 "")
1549 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1550 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1551 1644
1645 for ($xml) {
1552 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1553 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1554 1648
1555 # compress some whitespace 1649 # compress some whitespace
1556 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1557 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1558 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1559 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1560 1655
1561 $_ 1656 $xml
1562} 1657}
1658
1659no re 'eval';
1563 1660
1564sub hintmode { 1661sub hintmode {
1565 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1566 $_[0]{hintmode} 1663 $_[0]{hintmode}
1567} 1664}
… …
2554 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2555 } 2652 }
2556 2653
2557 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2558 2655
2559 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2560 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2561 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2562 2659
2563 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2564 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2637the 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
2638the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2639 2736
2640=cut 2737=cut
2641 2738
2739# non-persistent channels (usually the info channel)
2642our %CHANNEL = ( 2740our %CHANNEL = (
2643 "c/identify" => { 2741 "c/identify" => {
2644 id => "infobox", 2742 id => "infobox",
2645 title => "Identify", 2743 title => "Identify",
2646 reply => undef, 2744 reply => undef,
… …
2650 id => "infobox", 2748 id => "infobox",
2651 title => "Examine", 2749 title => "Examine",
2652 reply => undef, 2750 reply => undef,
2653 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2654 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2655 "c/lookat" => { 2759 "c/lookat" => {
2656 id => "infobox", 2760 id => "infobox",
2657 title => "Look", 2761 title => "Look",
2658 reply => undef, 2762 reply => undef,
2659 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",
2660 }, 2788 },
2661); 2789);
2662 2790
2663sub cf::client::send_msg { 2791sub cf::client::send_msg {
2664 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3033 { 3161 {
3034 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3035 3163
3036 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3037 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3038 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3039 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3040 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};
3041 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};
3042 3171
3043 cf::cede_to_tick; 3172 cf::cede_to_tick;
3044 } 3173 }
3045 3174
3046 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3047 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3048 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3049 or next; 3179 or next;
3180
3050 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3051 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3052 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3053 } else { 3184 } else {
3054 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3072 { 3203 {
3073 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3074 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3075 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3076 3207
3077 my $soundconf = delete $res->{"res/sound.conf"};
3078
3079 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3080 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3081 my $data; 3211 my $data;
3082 3212
3083 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3084 # prepend meta info 3214 # prepend meta info
3085 3215
3086 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3087 name => $name, 3217 name => $name,
3088 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3089 }); 3219 });
3090 3220
3091 $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};
3092 } else { 3228 } else {
3093 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3094 } 3230 }
3095 3231
3096 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3097 cf::face::set_type $idx, $info->{type};
3098
3099 cf::cede_to_tick; 3232 cf::cede_to_tick;
3100 } 3233 }
3101
3102 if ($soundconf) {
3103 $soundconf = $enc->decode (delete $soundconf->{data});
3104
3105 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3106 my $sound = $soundconf->{compat}[$_]
3107 or next;
3108
3109 my $face = cf::face::find "sound/$sound->[1]";
3110 cf::sound::set $sound->[0] => $face;
3111 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3112 }
3113
3114 while (my ($k, $v) = each %{$soundconf->{event}}) {
3115 my $face = cf::face::find "sound/$v";
3116 cf::sound::set $k => $face;
3117 }
3118 }
3119 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3120 3237
3121 1 3238 1
3122} 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});
3123 3260
3124register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3125 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3126 3263
3127 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3182sub reload_config { 3319sub reload_config {
3183 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3184 or return; 3321 or return;
3185 3322
3186 local $/; 3323 local $/;
3187 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3188 3325
3189 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3190 3327
3191 $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};
3192 $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};
… …
3204 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3205 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3206 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#
3207 (async { 3344 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3209 Event::one_event; 3346 EV::loop EV::LOOP_ONESHOT;
3210 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3211 }; 3348 };
3212 3349
3213 reload_config; 3350 reload_config;
3214 db_init; 3351 db_init;
3215 load_extensions; 3352 load_extensions;
3216 3353
3217 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3218 Event::loop; 3356 EV::loop;
3219} 3357}
3220 3358
3221############################################################################# 3359#############################################################################
3222# initialisation and cleanup 3360# initialisation and cleanup
3223 3361
3224# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3225BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3226 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3227 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3228 reentrant => 0,
3229 data => WF_AUTOCANCEL,
3230 signal => $signal,
3231 prio => 0,
3232 cb => sub {
3233 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3234 },
3235 ); 3368 };
3236 } 3369 }
3237} 3370}
3238 3371
3239sub write_runtime { 3372sub write_runtime {
3240 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3334 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3335 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3336 3469
3337 # 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
3338 3471
3339 warn "cancelling all WF_AUTOCANCEL watchers";
3340 for (Event::all_watchers) {
3341 $_->cancel if $_->data & WF_AUTOCANCEL;
3342 }
3343
3344 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3345 for (;;) { 3473 for (;;) {
3346 BDB::flush; 3474 BDB::flush;
3347 IO::AIO::flush; 3475 IO::AIO::flush;
3348 Coro::cede; 3476 Coro::cede_notself;
3349 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3350 warn "iterate..."; 3478 warn "iterate...";
3351 } 3479 }
3352 3480
3353 ++$RELOAD; 3481 ++$RELOAD;
… …
3429 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3430 3558
3431 1 3559 1
3432 } or do { 3560 } or do {
3433 warn $@; 3561 warn $@;
3434 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3435 exit 1;
3436 }; 3563 };
3437 3564
3438 warn "reloaded"; 3565 warn "reloaded";
3439}; 3566};
3440 3567
… …
3442 3569
3443sub reload_perl() { 3570sub reload_perl() {
3444 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3445 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3446 3573
3447 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3448 reentrant => 0,
3449 after => 0,
3450 data => WF_AUTOCANCEL,
3451 cb => sub {
3452 do_reload_perl; 3575 do_reload_perl;
3453 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3454 },
3455 ); 3577 };
3456} 3578}
3457 3579
3458register_command "reload" => sub { 3580register_command "reload" => sub {
3459 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3460 3582
… …
3490 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3491 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3492 $signal->wait; 3614 $signal->wait;
3493} 3615}
3494 3616
3495$TICK_WATCHER = Event->timer ( 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3496 reentrant => 0,
3497 parked => 1,
3498 prio => 0,
3499 at => $NEXT_TICK || $TICK,
3500 data => WF_AUTOCANCEL,
3501 cb => sub {
3502 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3503 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"
3504 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3505 return; 3621 return;
3506 } 3622 }
3507 3623
3508 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3509 3625
3510 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3511 3627
3512 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3513 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3514 3630
3515 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3516 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3517 Coro::async_pool { 3633 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver"; 3634 $Coro::current->{desc} = "runtime saver";
3519 write_runtime 3635 write_runtime
3520 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3521 };
3522 } 3637 };
3638 }
3523 3639
3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3525 $sig->send; 3641 $sig->send;
3526 } 3642 }
3527 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3528 $sig->send; 3644 $sig->send;
3529 } 3645 }
3530 3646
3531 $NOW = Event::time;
3532
3533 # if we are delayed by four ticks or more, skip them all
3534 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3535
3536 $TICK_WATCHER->at ($NEXT_TICK);
3537 $TICK_WATCHER->start;
3538
3539 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3541 3649
3542 _post_tick; 3650 _post_tick;
3543 }, 3651};
3544); 3652$TICK_WATCHER->priority (EV::MAXPRI);
3545 3653
3546{ 3654{
3655 # configure BDB
3656
3547 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3548 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3549 $BDB_POLL_WATCHER = Event->io ( 3659 $Coro::BDB::WATCHER->priority (1);
3550 reentrant => 0,
3551 fd => BDB::poll_fileno,
3552 poll => 'r',
3553 prio => 0,
3554 data => WF_AUTOCANCEL,
3555 cb => \&BDB::poll_cb,
3556 );
3557
3558 BDB::set_sync_prepare {
3559 my $status;
3560 my $current = $Coro::current;
3561 (
3562 sub {
3563 $status = $!;
3564 $current->ready; undef $current;
3565 },
3566 sub {
3567 Coro::schedule while defined $current;
3568 $! = $status;
3569 },
3570 )
3571 };
3572 3660
3573 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3574 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3575 $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
3576 | BDB::LOG_AUTOREMOVE, 1); 3664 | BDB::LOG_AUTOREMOVE, 1);
… …
3591 3679
3592 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3593 }; 3681 };
3594 } 3682 }
3595 3683
3596 $BDB_DEADLOCK_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 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 { };
3604 },
3605 ); 3686 };
3606 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 ); 3689 };
3616 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 ); 3692 };
3626} 3693}
3627 3694
3628{ 3695{
3696 # configure IO::AIO
3697
3629 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3630
3631 undef $Coro::AIO::WATCHER;
3632 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3633 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3634 reentrant => 0,
3635 data => WF_AUTOCANCEL,
3636 fd => IO::AIO::poll_fileno,
3637 poll => 'r',
3638 prio => 0,
3639 cb => \&IO::AIO::poll_cb,
3640 );
3641} 3701}
3642 3702
3643my $_log_backtrace; 3703my $_log_backtrace;
3644 3704
3645sub _log_backtrace { 3705sub _log_backtrace {

Diff Legend

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