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.384 by root, Fri Oct 12 18:17:16 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 4.1 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML::Syck ();
… …
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44 43
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
47 46
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 69our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 72our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 73our $BDBDIR = "$LOCALDIR/db";
74our %RESOURCE;
75 75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 81our $USE_FSYNC = 1; # use fsync to write maps - default off
83 82
84our $BDB_POLL_WATCHER; 83our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 84our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
… …
89 88
90our %CFG; 89our %CFG;
91 90
92our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 92our $RUNTIME;
93our $NOW;
94 94
95our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
98 98
… …
162 162
163The raw value load value from the last tick. 163The raw value load value from the last tick.
164 164
165=item %cf::CFG 165=item %cf::CFG
166 166
167Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 168from wherever your confdir points to.
169 169
170=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
171 171
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 194
195 LOG llevError, $msg; 195 LOG llevError, $msg;
196 }; 196 };
197} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
198 203
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 220)) {
216 no strict 'refs'; 221 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 223}
219 224
220$Event::DIED = sub { 225$EV::DIED = sub {
221 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
222}; 227};
223 228
224############################################################################# 229#############################################################################
225 230
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 253 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 254 $d
250 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
251} 256}
252 257
253=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
254 259
255Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
256 261
257=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
258 263
259Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
260 265
261=cut 266=cut
262 267
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 269
265sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
267 272
268=item cf::lock_wait $string 273=item cf::lock_wait $string
269 274
270Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
271 276
… …
334 my $guard = Coro::guard { 339 my $guard = Coro::guard {
335 $TICK_WATCHER->start; 340 $TICK_WATCHER->start;
336 }; 341 };
337 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
338 $guard 343 $guard
344}
345
346=item cf::periodic $interval, $cb
347
348Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer.
350
351=cut
352
353sub periodic($$) {
354 my ($interval, $cb) = @_;
355
356 my $start = rand List::Util::min 180, $interval;
357
358 EV::periodic $start, $interval, 0, $cb
339} 359}
340 360
341=item cf::get_slot $time[, $priority[, $name]] 361=item cf::get_slot $time[, $priority[, $name]]
342 362
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 363Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
406 426
407BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
408 428
409=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
410 430
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 432is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 434acceptable.
415 435
416If it must be done, put the blocking parts into C<sync_job>. This will run 436If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 437the given BLOCK in another coroutine while waiting for the result. The
… …
422 442
423sub sync_job(&) { 443sub sync_job(&) {
424 my ($job) = @_; 444 my ($job) = @_;
425 445
426 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 447 my $time = EV::time;
428 448
429 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
431 451
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 452 LOG llevError, Carp::longmess "sync job";#d#
433 453
434 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
435 # (but this is cancel-safe) 455 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
437 457
… …
444 warn $@ if $@; 464 warn $@ if $@;
445 undef $busy; 465 undef $busy;
446 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
447 467
448 while ($busy) { 468 while ($busy) {
449 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
450 } 473 }
474 }
451 475
452 $time = Event::time - $time; 476 $time = EV::time - $time;
453 477
454 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456 480
457 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
… …
487=item fork_call { }, $args 511=item fork_call { }, $args
488 512
489Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
493 517
494=cut 518=cut
495 519
496sub fork_call(&@) { 520sub fork_call(&@) {
497 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
… …
658attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
660 684
661In 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>
662C<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
663Crossfire TRT). 687Deliantra).
664 688
665=over 4 689=over 4
666 690
667=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
668 692
… …
950 } 974 }
951 975
952 0 976 0
953} 977}
954 978
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 980
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 982
959Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
960 984
… …
966 990
967=cut 991=cut
968 992
969############################################################################# 993#############################################################################
970# object support 994# object support
971#
972 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#
973sub _can_merge { 1029sub _can_merge {
974 my ($ob1, $ob2) = @_; 1030 my ($ob1, $ob2) = @_;
975 1031
976 local $Storable::canonical = 1; 1032 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1033
980 $fob1 eq $fob2 1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
981} 1036}
982 1037
983sub reattach { 1038sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1040 my ($obj) = @_;
… …
1007cf::attachable->attach ( 1062cf::attachable->attach (
1008 prio => -1000000, 1063 prio => -1000000,
1009 on_instantiate => sub { 1064 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
1011 1066
1012 $data = from_json $data; 1067 $data = decode_json $data;
1013 1068
1014 for (@$data) { 1069 for (@$data) {
1015 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
1016 1071
1017 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
… …
1046 close $fh; 1101 close $fh;
1047 1102
1048 if (@$objs) { 1103 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1051 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1109 close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1111 }
… …
1087 1142
1088 unless (aio_stat "$filename.pst") { 1143 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1144 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1145 or return;
1091 1146
1092 my $st = eval { Coro::Storable::thaw $av } 1147 my $st = eval { Coro::Storable::thaw $av };
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs}; 1148 $av = $st->{objs};
1095 } 1149 }
1096 1150
1097 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
… …
1514 1568
1515Expand crossfire pod fragments into protocol xml. 1569Expand crossfire pod fragments into protocol xml.
1516 1570
1517=cut 1571=cut
1518 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
1519sub expand_cfpod { 1584sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1585 my ($self, $pod) = @_;
1521 1586
1522 # escape & and < 1587 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1588
1526 # this is buggy, it needs to properly take care of nested <'s 1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1527 1592
1528 1 while 1593 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1594 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1595
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1596 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1597 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1598 ([BCGHITU])
1534 # replace G<male|female> tags 1599 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1600 (?:
1536 $self->gender ? $2 : $1 1601 ([^<>]*) (?{ $group = $^N })
1537 }ge 1602 | < $interior >
1538 # replace H<hint text> 1603 )
1539 || s{H<([^\>]*)>} 1604 >
1605 %gcsx
1540 { 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") {
1541 ("<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>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1626 "")
1544 [$self->{hintmode}] 1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1546 1638
1639 for ($xml) {
1547 # create single paragraphs (very hackish) 1640 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1641 s/(?<=\S)\n(?=\w)/ /g;
1549 1642
1550 # compress some whitespace 1643 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1644 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1645 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1646 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1647 s/\n+$//; # ending lines
1648 }
1555 1649
1556 $_ 1650 $xml
1557} 1651}
1652
1653no re 'eval';
1558 1654
1559sub hintmode { 1655sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1657 $_[0]{hintmode}
1562} 1658}
… …
2549 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2550 } 2646 }
2551 2647
2552 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2553 2649
2554 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2555 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2556 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2557 2653
2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2559 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
… …
2632the 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
2633the message unless the client supports the msg packet. 2729the message unless the client supports the msg packet.
2634 2730
2635=cut 2731=cut
2636 2732
2733# non-persistent channels (usually the info channel)
2637our %CHANNEL = ( 2734our %CHANNEL = (
2638 "c/identify" => { 2735 "c/identify" => {
2639 id => "infobox", 2736 id => "infobox",
2640 title => "Identify", 2737 title => "Identify",
2641 reply => undef, 2738 reply => undef,
… …
2645 id => "infobox", 2742 id => "infobox",
2646 title => "Examine", 2743 title => "Examine",
2647 reply => undef, 2744 reply => undef,
2648 tooltip => "Signs and other items you examined", 2745 tooltip => "Signs and other items you examined",
2649 }, 2746 },
2747 "c/book" => {
2748 id => "infobox",
2749 title => "Book",
2750 reply => undef,
2751 tooltip => "The contents of a note or book",
2752 },
2650 "c/lookat" => { 2753 "c/lookat" => {
2651 id => "infobox", 2754 id => "infobox",
2652 title => "Look", 2755 title => "Look",
2653 reply => undef, 2756 reply => undef,
2654 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",
2655 }, 2782 },
2656); 2783);
2657 2784
2658sub cf::client::send_msg { 2785sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
… …
3028 { 3155 {
3029 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
3030 3157
3031 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
3032 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
3033 cf::face::set_visibility $idx, $info->{visibility}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap}; 3162 cf::face::set_magicmap $idx, $info->{magicmap};
3035 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};
3036 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};
3037 3165
3038 cf::cede_to_tick; 3166 cf::cede_to_tick;
3039 } 3167 }
3040 3168
3041 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
3042 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
3043 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
3044 or next; 3173 or next;
3174
3045 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth; 3176 cf::face::set_smooth $idx, $smooth;
3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3048 } else { 3178 } else {
3049 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3067 { 3197 {
3068 # TODO: for gcfclient pleasure, we should give resources 3198 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index. 3199 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource}; 3200 my $res = $facedata->{resource};
3071 3201
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) { 3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data; 3205 my $data;
3077 3206
3078 if ($info->{type} & 1) { 3207 if ($info->{type} & 1) {
3079 # prepend meta info 3208 # prepend meta info
3080 3209
3081 my $meta = $enc->encode ({ 3210 my $meta = $enc->encode ({
3082 name => $name, 3211 name => $name,
3083 %{ $info->{meta} || {} }, 3212 %{ $info->{meta} || {} },
3084 }); 3213 });
3085 3214
3086 $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};
3087 } else { 3222 } else {
3088 $data = $info->{data}; 3223 $RESOURCE{$name} = $info;
3089 } 3224 }
3090 3225
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick; 3226 cf::cede_to_tick;
3095 } 3227 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 } 3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3115 3231
3116 1 3232 1
3117} 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});
3118 3254
3119register_exticmd fx_want => sub { 3255register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_; 3256 my ($ns, $want) = @_;
3121 3257
3122 while (my ($k, $v) = each %$want) { 3258 while (my ($k, $v) = each %$want) {
… …
3199 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
3200 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
3201 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#
3202 (async { 3338 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3204 Event::one_event; 3340 EV::loop EV::LOOP_ONESHOT;
3205 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
3206 }; 3342 };
3207 3343
3208 reload_config; 3344 reload_config;
3209 db_init; 3345 db_init;
3210 load_extensions; 3346 load_extensions;
3211 3347
3212 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3213 Event::loop; 3350 EV::loop;
3214} 3351}
3215 3352
3216############################################################################# 3353#############################################################################
3217# initialisation and cleanup 3354# initialisation and cleanup
3218 3355
3219# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
3220BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
3221 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
3222 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3223 reentrant => 0,
3224 data => WF_AUTOCANCEL,
3225 signal => $signal,
3226 prio => 0,
3227 cb => sub {
3228 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
3229 },
3230 ); 3362 };
3231 } 3363 }
3232} 3364}
3233 3365
3234sub write_runtime { 3366sub write_runtime {
3235 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
… …
3329 warn "syncing database to disk"; 3461 warn "syncing database to disk";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
3331 3463
3332 # 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
3333 3465
3334 warn "cancelling all WF_AUTOCANCEL watchers";
3335 for (Event::all_watchers) {
3336 $_->cancel if $_->data & WF_AUTOCANCEL;
3337 }
3338
3339 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
3340 for (;;) { 3467 for (;;) {
3341 BDB::flush; 3468 BDB::flush;
3342 IO::AIO::flush; 3469 IO::AIO::flush;
3343 Coro::cede; 3470 Coro::cede_notself;
3344 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
3345 warn "iterate..."; 3472 warn "iterate...";
3346 } 3473 }
3347 3474
3348 ++$RELOAD; 3475 ++$RELOAD;
… …
3437 3564
3438sub reload_perl() { 3565sub reload_perl() {
3439 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3440 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3441 3568
3442 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3443 reentrant => 0,
3444 after => 0,
3445 data => WF_AUTOCANCEL,
3446 cb => sub {
3447 do_reload_perl;
3448 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3449 }, 3571 do_reload_perl;
3450 ); 3572 };
3451} 3573}
3452 3574
3453register_command "reload" => sub { 3575register_command "reload" => sub {
3454 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3455 3577
… …
3485 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3486 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3487 $signal->wait; 3609 $signal->wait;
3488} 3610}
3489 3611
3490$TICK_WATCHER = Event->timer ( 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3491 reentrant => 0,
3492 parked => 1,
3493 prio => 0,
3494 at => $NEXT_TICK || $TICK,
3495 data => WF_AUTOCANCEL,
3496 cb => sub {
3497 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3498 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"
3499 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3500 return; 3616 return;
3501 } 3617 }
3502 3618
3503 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3504 3620
3505 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3506 3622
3507 $RUNTIME += $TICK; 3623 $RUNTIME += $TICK;
3508 $NEXT_TICK += $TICK; 3624 $NEXT_TICK = $_[0]->at;
3509 3625
3510 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3511 $NEXT_RUNTIME_WRITE = $NOW + 10; 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3512 Coro::async_pool { 3628 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver"; 3629 $Coro::current->{desc} = "runtime saver";
3514 write_runtime 3630 write_runtime
3515 or warn "ERROR: unable to write runtime file: $!"; 3631 or warn "ERROR: unable to write runtime file: $!";
3516 };
3517 } 3632 };
3633 }
3518 3634
3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3520 $sig->send; 3636 $sig->send;
3521 } 3637 }
3522 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send; 3639 $sig->send;
3524 } 3640 }
3525 3641
3526 $NOW = Event::time;
3527
3528 # if we are delayed by four ticks or more, skip them all
3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3530
3531 $TICK_WATCHER->at ($NEXT_TICK);
3532 $TICK_WATCHER->start;
3533
3534 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3536 3644
3537 _post_tick; 3645 _post_tick;
3538 }, 3646};
3539); 3647$TICK_WATCHER->priority (EV::MAXPRI);
3540 3648
3541{ 3649{
3650 # configure BDB
3651
3542 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3543 BDB::max_poll_time $TICK * 0.1; 3653 BDB::max_poll_reqs $TICK * 0.1;
3544 $BDB_POLL_WATCHER = Event->io ( 3654 $Coro::BDB::WATCHER->priority (1);
3545 reentrant => 0,
3546 fd => BDB::poll_fileno,
3547 poll => 'r',
3548 prio => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => \&BDB::poll_cb,
3551 );
3552
3553 BDB::set_sync_prepare {
3554 my $status;
3555 my $current = $Coro::current;
3556 (
3557 sub {
3558 $status = $!;
3559 $current->ready; undef $current;
3560 },
3561 sub {
3562 Coro::schedule while defined $current;
3563 $! = $status;
3564 },
3565 )
3566 };
3567 3655
3568 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3569 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3570 $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
3571 | BDB::LOG_AUTOREMOVE, 1); 3659 | BDB::LOG_AUTOREMOVE, 1);
… …
3586 3674
3587 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3588 }; 3676 };
3589 } 3677 }
3590 3678
3591 $BDB_DEADLOCK_WATCHER = Event->timer ( 3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 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 { };
3599 },
3600 ); 3681 };
3601 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 ); 3684 };
3611 $BDB_TRICKLE_WATCHER = Event->timer ( 3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 ); 3687 };
3621} 3688}
3622 3689
3623{ 3690{
3691 # configure IO::AIO
3692
3624 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3625
3626 undef $Coro::AIO::WATCHER;
3627 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3628 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3629 reentrant => 0,
3630 data => WF_AUTOCANCEL,
3631 fd => IO::AIO::poll_fileno,
3632 poll => 'r',
3633 prio => 0,
3634 cb => \&IO::AIO::poll_cb,
3635 );
3636} 3696}
3637 3697
3638my $_log_backtrace; 3698my $_log_backtrace;
3639 3699
3640sub _log_backtrace { 3700sub _log_backtrace {

Diff Legend

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