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.378 by root, Thu Oct 4 11:36:54 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 Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 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 ();
32use IO::AIO 2.32 (); 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 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>:
… …
373 } 393 }
374 } 394 }
375 } 395 }
376 396
377 if (@SLOT_QUEUE) { 397 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 398 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 399 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 400 $signal->wait;
381 } else { 401 } else {
382 Coro::schedule; 402 Coro::schedule;
383 } 403 }
… …
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
452 LOG llevError, Carp::longmess "sync job";#d#
453
432 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
433 # (but this is cancel-safe) 455 # (but this is cancel-safe)
434 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
435 457
436 my $busy = 1; 458 my $busy = 1;
… …
442 warn $@ if $@; 464 warn $@ if $@;
443 undef $busy; 465 undef $busy;
444 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
445 467
446 while ($busy) { 468 while ($busy) {
447 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
448 } 473 }
474 }
449 475
450 $time = Event::time - $time; 476 $time = EV::time - $time;
451 477
452 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454 480
455 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
… …
485=item fork_call { }, $args 511=item fork_call { }, $args
486 512
487Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
491 517
492=cut 518=cut
493 519
494sub fork_call(&@) { 520sub fork_call(&@) {
495 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
… …
656attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
658 684
659In 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>
660C<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
661Crossfire TRT). 687Deliantra).
662 688
663=over 4 689=over 4
664 690
665=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
666 692
… …
948 } 974 }
949 975
950 0 976 0
951} 977}
952 978
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 980
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 982
957Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
958 984
… …
964 990
965=cut 991=cut
966 992
967############################################################################# 993#############################################################################
968# object support 994# object support
969#
970 995
996sub _object_equal($$);
997sub _object_equal($$) {
998 my ($a, $b) = @_;
999
1000 return 0 unless (ref $a) eq (ref $b);
1001
1002 if ("HASH" eq ref $a) {
1003 my @ka = keys %$a;
1004 my @kb = keys %$b;
1005
1006 return 0 if @ka != @kb;
1007
1008 for (0 .. $#ka) {
1009 return 0 unless $ka[$_] eq $kb[$_];
1010 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1011 }
1012
1013 } elsif ("ARRAY" eq ref $a) {
1014
1015 return 0 if @$a != @$b;
1016
1017 for (0 .. $#$a) {
1018 return 0 unless _object_equal $a->[$_], $b->[$_];
1019 }
1020
1021 } elsif ($a ne $b) {
1022 return 0;
1023 }
1024
1025 1
1026}
1027
1028our $SLOW_MERGES;#d#
971sub _can_merge { 1029sub _can_merge {
972 my ($ob1, $ob2) = @_; 1030 my ($ob1, $ob2) = @_;
973 1031
974 local $Storable::canonical = 1; 1032 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1033
978 $fob1 eq $fob2 1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
979} 1036}
980 1037
981sub reattach { 1038sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1040 my ($obj) = @_;
… …
1005cf::attachable->attach ( 1062cf::attachable->attach (
1006 prio => -1000000, 1063 prio => -1000000,
1007 on_instantiate => sub { 1064 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
1009 1066
1010 $data = from_json $data; 1067 $data = decode_json $data;
1011 1068
1012 for (@$data) { 1069 for (@$data) {
1013 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
1014 1071
1015 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
… …
1044 close $fh; 1101 close $fh;
1045 1102
1046 if (@$objs) { 1103 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1109 close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1111 }
… …
1085 1142
1086 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1145 or return;
1089 1146
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1091 } 1149 }
1092 1150
1093 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
… …
1510 1568
1511Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1512 1570
1513=cut 1571=cut
1514 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
1515sub expand_cfpod { 1584sub expand_cfpod {
1516 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1517 1586
1518 # escape & and < 1587 my $xml;
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521 1588
1522 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1523 1592
1524 1 while 1593 $group =~ s/&/&amp;/g;
1525 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1526 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1527 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1528 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1598 ([BCGHITU])
1530 # replace G<male|female> tags 1599 <
1531 || s{G<([^>|]*)\|([^>]*)>}{ 1600 (?:
1532 $self->gender ? $2 : $1 1601 ([^<>]*) (?{ $group = $^N })
1533 }ge 1602 | < $interior >
1534 # replace H<hint text> 1603 )
1535 || s{H<([^\>]*)>} 1604 >
1605 %gcsx
1536 { 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") {
1537 ("<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>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "") 1626 "")
1540 [$self->{hintmode}] 1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1541 }ge; 1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1542 1638
1639 for ($xml) {
1543 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1545 1642
1546 # compress some whitespace 1643 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends 1644 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines 1645 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines 1646 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines 1647 s/\n+$//; # ending lines
1648 }
1551 1649
1552 $_ 1650 $xml
1553} 1651}
1652
1653no re 'eval';
1554 1654
1555sub hintmode { 1655sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1; 1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode} 1657 $_[0]{hintmode}
1558} 1658}
… …
2545 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2546 } 2646 }
2547 2647
2548 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2549 2649
2550 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2551 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2552 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2553 2653
2554 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2555 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
… …
2628the 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
2629the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2630 2730
2631=cut 2731=cut
2632 2732
2733# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2734our %CHANNEL = (
2634 "c/identify" => { 2735 "c/identify" => {
2635 id => "infobox", 2736 id => "infobox",
2636 title => "Identify", 2737 title => "Identify",
2637 reply => undef, 2738 reply => undef,
… …
2641 id => "infobox", 2742 id => "infobox",
2642 title => "Examine", 2743 title => "Examine",
2643 reply => undef, 2744 reply => undef,
2644 tooltip => "Signs and other items you examined", 2745 tooltip => "Signs and other items you examined",
2645 }, 2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2646 "c/lookat" => { 2753 "c/lookat" => {
2647 id => "infobox", 2754 id => "infobox",
2648 title => "Look", 2755 title => "Look",
2649 reply => undef, 2756 reply => undef,
2650 tooltip => "What you saw there", 2757 tooltip => "What you saw there",
2758 },
2759 "c/who" => {
2760 id => "infobox",
2761 title => "Players",
2762 reply => undef,
2763 tooltip => "Shows players who are currently online",
2764 },
2765 "c/body" => {
2766 id => "infobox",
2767 title => "Body Parts",
2768 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available",
2770 },
2771 "c/uptime" => {
2772 id => "infobox",
2773 title => "Uptime",
2774 reply => undef,
2775 tooltip => "How long the server has been running since last restart",
2776 },
2777 "c/mapinfo" => {
2778 id => "infobox",
2779 title => "Map Info",
2780 reply => undef,
2781 tooltip => "Information related to the maps",
2651 }, 2782 },
2652); 2783);
2653 2784
2654sub cf::client::send_msg { 2785sub cf::client::send_msg {
2655 my ($self, $channel, $msg, $color, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
… …
2892=pod 3023=pod
2893 3024
2894The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2895 3026
2896 cf::object 3027 cf::object
2897 contr pay_amount pay_player map x y force_find force_add 3028 contr pay_amount pay_player map x y force_find force_add destroy
2898 insert remove name archname title slaying race decrease_ob_nr 3029 insert remove name archname title slaying race decrease_ob_nr
2899 3030
2900 cf::object::player 3031 cf::object::player
2901 player 3032 player
2902 3033
… …
2909=cut 3040=cut
2910 3041
2911for ( 3042for (
2912 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2913 insert remove inv name archname title slaying race 3044 insert remove inv name archname title slaying race
2914 decrease_ob_nr)], 3045 decrease_ob_nr destroy)],
2915 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2916 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2917 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2918) { 3049) {
2919 no strict 'refs'; 3050 no strict 'refs';
… …
3024 { 3155 {
3025 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
3026 3157
3027 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
3028 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
3029 cf::face::set_visibility $idx, $info->{visibility}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3030 cf::face::set_magicmap $idx, $info->{magicmap}; 3162 cf::face::set_magicmap $idx, $info->{magicmap};
3031 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};
3032 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};
3033 3165
3034 cf::cede_to_tick; 3166 cf::cede_to_tick;
3035 } 3167 }
3036 3168
3037 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
3038 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
3039 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
3040 or next; 3173 or next;
3174
3041 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3042 cf::face::set_smooth $idx, $smooth; 3176 cf::face::set_smooth $idx, $smooth;
3043 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3044 } else { 3178 } else {
3045 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3063 { 3197 {
3064 # TODO: for gcfclient pleasure, we should give resources 3198 # TODO: for gcfclient pleasure, we should give resources
3065 # that gcfclient doesn't grok a >10000 face index. 3199 # that gcfclient doesn't grok a >10000 face index.
3066 my $res = $facedata->{resource}; 3200 my $res = $facedata->{resource};
3067 3201
3068 my $soundconf = delete $res->{"res/sound.conf"};
3069
3070 while (my ($name, $info) = each %$res) { 3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3071 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3072 my $data; 3205 my $data;
3073 3206
3074 if ($info->{type} & 1) { 3207 if ($info->{type} & 1) {
3075 # prepend meta info 3208 # prepend meta info
3076 3209
3077 my $meta = $enc->encode ({ 3210 my $meta = $enc->encode ({
3078 name => $name, 3211 name => $name,
3079 %{ $info->{meta} || {} }, 3212 %{ $info->{meta} || {} },
3080 }); 3213 });
3081 3214
3082 $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};
3083 } else { 3222 } else {
3084 $data = $info->{data}; 3223 $RESOURCE{$name} = $info;
3085 } 3224 }
3086 3225
3087 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3088 cf::face::set_type $idx, $info->{type};
3089
3090 cf::cede_to_tick; 3226 cf::cede_to_tick;
3091 } 3227 }
3092
3093 if ($soundconf) {
3094 $soundconf = $enc->decode (delete $soundconf->{data});
3095
3096 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3097 my $sound = $soundconf->{compat}[$_]
3098 or next;
3099
3100 my $face = cf::face::find "sound/$sound->[1]";
3101 cf::sound::set $sound->[0] => $face;
3102 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3103 }
3104
3105 while (my ($k, $v) = each %{$soundconf->{event}}) {
3106 my $face = cf::face::find "sound/$v";
3107 cf::sound::set $k => $face;
3108 }
3109 }
3110 } 3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3111 3231
3112 1 3232 1
3113} 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});
3114 3254
3115register_exticmd fx_want => sub { 3255register_exticmd fx_want => sub {
3116 my ($ns, $want) = @_; 3256 my ($ns, $want) = @_;
3117 3257
3118 while (my ($k, $v) = each %$want) { 3258 while (my ($k, $v) = each %$want) {
… …
3195 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
3196 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
3197 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#
3198 (async { 3338 (async {
3199 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3200 Event::one_event; 3340 EV::loop EV::LOOP_ONESHOT;
3201 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
3202 }; 3342 };
3203 3343
3204 reload_config; 3344 reload_config;
3205 db_init; 3345 db_init;
3206 load_extensions; 3346 load_extensions;
3207 3347
3208 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3209 Event::loop; 3350 EV::loop;
3210} 3351}
3211 3352
3212############################################################################# 3353#############################################################################
3213# initialisation and cleanup 3354# initialisation and cleanup
3214 3355
3215# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
3216BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
3217 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
3218 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3219 reentrant => 0,
3220 data => WF_AUTOCANCEL,
3221 signal => $signal,
3222 prio => 0,
3223 cb => sub {
3224 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
3225 },
3226 ); 3362 };
3227 } 3363 }
3228} 3364}
3229 3365
3230sub write_runtime { 3366sub write_runtime {
3231 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
… …
3276 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
3277 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
3278 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
3279 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
3280 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3281 $pl->save; 3418 $pl->save;
3282 } 3419 }
3283 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
3284 3421
3285 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
… …
3324 warn "syncing database to disk"; 3461 warn "syncing database to disk";
3325 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
3326 3463
3327 # 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
3328 3465
3329 warn "cancelling all WF_AUTOCANCEL watchers";
3330 for (Event::all_watchers) {
3331 $_->cancel if $_->data & WF_AUTOCANCEL;
3332 }
3333
3334 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
3335 for (;;) { 3467 for (;;) {
3336 BDB::flush; 3468 BDB::flush;
3337 IO::AIO::flush; 3469 IO::AIO::flush;
3338 Coro::cede; 3470 Coro::cede_notself;
3339 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
3340 warn "iterate..."; 3472 warn "iterate...";
3341 } 3473 }
3342 3474
3343 ++$RELOAD; 3475 ++$RELOAD;
… …
3432 3564
3433sub reload_perl() { 3565sub reload_perl() {
3434 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3435 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3436 3568
3437 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3438 reentrant => 0,
3439 after => 0,
3440 data => WF_AUTOCANCEL,
3441 cb => sub {
3442 do_reload_perl;
3443 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3444 }, 3571 do_reload_perl;
3445 ); 3572 };
3446} 3573}
3447 3574
3448register_command "reload" => sub { 3575register_command "reload" => sub {
3449 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3450 3577
… …
3480 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3481 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3482 $signal->wait; 3609 $signal->wait;
3483} 3610}
3484 3611
3485$TICK_WATCHER = Event->timer ( 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3486 reentrant => 0,
3487 parked => 1,
3488 prio => 0,
3489 at => $NEXT_TICK || $TICK,
3490 data => WF_AUTOCANCEL,
3491 cb => sub {
3492 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3493 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"
3494 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3495 return; 3616 return;
3496 } 3617 }
3497 3618
3498 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3499 3620
3500 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3501 3622
3502 $RUNTIME += $TICK; 3623 $RUNTIME += $TICK;
3503 $NEXT_TICK += $TICK; 3624 $NEXT_TICK = $_[0]->at;
3504 3625
3505 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3506 $NEXT_RUNTIME_WRITE = $NOW + 10; 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3507 Coro::async_pool { 3628 Coro::async_pool {
3508 $Coro::current->{desc} = "runtime saver"; 3629 $Coro::current->{desc} = "runtime saver";
3509 write_runtime 3630 write_runtime
3510 or warn "ERROR: unable to write runtime file: $!"; 3631 or warn "ERROR: unable to write runtime file: $!";
3511 };
3512 } 3632 };
3633 }
3513 3634
3514 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3515 $sig->send; 3636 $sig->send;
3516 } 3637 }
3517 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3518 $sig->send; 3639 $sig->send;
3519 } 3640 }
3520 3641
3521 $NOW = Event::time;
3522
3523 # if we are delayed by four ticks or more, skip them all
3524 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3525
3526 $TICK_WATCHER->at ($NEXT_TICK);
3527 $TICK_WATCHER->start;
3528
3529 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3530 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3531 3644
3532 _post_tick; 3645 _post_tick;
3533 }, 3646};
3534); 3647$TICK_WATCHER->priority (EV::MAXPRI);
3535 3648
3536{ 3649{
3650 # configure BDB
3651
3537 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3538 BDB::max_poll_time $TICK * 0.1; 3653 BDB::max_poll_reqs $TICK * 0.1;
3539 $BDB_POLL_WATCHER = Event->io ( 3654 $Coro::BDB::WATCHER->priority (1);
3540 reentrant => 0,
3541 fd => BDB::poll_fileno,
3542 poll => 'r',
3543 prio => 0,
3544 data => WF_AUTOCANCEL,
3545 cb => \&BDB::poll_cb,
3546 );
3547
3548 BDB::set_sync_prepare {
3549 my $status;
3550 my $current = $Coro::current;
3551 (
3552 sub {
3553 $status = $!;
3554 $current->ready; undef $current;
3555 },
3556 sub {
3557 Coro::schedule while defined $current;
3558 $! = $status;
3559 },
3560 )
3561 };
3562 3655
3563 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3564 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3565 $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
3566 | BDB::LOG_AUTOREMOVE, 1); 3659 | BDB::LOG_AUTOREMOVE, 1);
… …
3581 3674
3582 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3583 }; 3676 };
3584 } 3677 }
3585 3678
3586 $BDB_DEADLOCK_WATCHER = Event->timer ( 3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3587 after => 3,
3588 interval => 1,
3589 hard => 1,
3590 prio => 0,
3591 data => WF_AUTOCANCEL,
3592 cb => sub {
3593 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 { };
3594 },
3595 ); 3681 };
3596 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3597 after => 11,
3598 interval => 60,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3604 },
3605 ); 3684 };
3606 $BDB_TRICKLE_WATCHER = Event->timer ( 3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3607 after => 5,
3608 interval => 10,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3614 },
3615 ); 3687 };
3616} 3688}
3617 3689
3618{ 3690{
3691 # configure IO::AIO
3692
3619 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3620
3621 undef $Coro::AIO::WATCHER;
3622 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3623 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3624 reentrant => 0,
3625 data => WF_AUTOCANCEL,
3626 fd => IO::AIO::poll_fileno,
3627 poll => 'r',
3628 prio => 0,
3629 cb => \&IO::AIO::poll_cb,
3630 );
3631} 3696}
3632 3697
3633my $_log_backtrace; 3698my $_log_backtrace;
3634 3699
3635sub _log_backtrace { 3700sub _log_backtrace {

Diff Legend

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