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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.406 by root, Mon Dec 17 08:27:44 2007 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;
84our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 85our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 86our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 87our $DB_ENV;
88 88
89our %CFG; 89our %CFG;
90 90
91our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 92our $RUNTIME;
93our $NOW;
93 94
94our (%PLAYER, %PLAYER_LOADING); # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 96our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
97 98
… …
161 162
162The raw value load value from the last tick. 163The raw value load value from the last tick.
163 164
164=item %cf::CFG 165=item %cf::CFG
165 166
166Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 168from wherever your confdir points to.
168 169
169=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
170 171
171These 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
… …
214)) { 215)) {
215 no strict 'refs'; 216 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 218}
218 219
219$Event::DIED = sub { 220$EV::DIED = sub {
220 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
221}; 222};
222 223
223############################################################################# 224#############################################################################
224 225
… …
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 249 $d
249 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
250} 251}
251 252
252=item $ref = cf::from_json $json 253=item $ref = cf::decode_json $json
253 254
254Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
255 256
256=item $json = cf::to_json $ref 257=item $json = cf::encode_json $ref
257 258
258Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
259 260
260=cut 261=cut
261 262
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 264
264sub to_json ($) { $json_coder->encode ($_[0]) } 265sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 266sub decode_json($) { $json_coder->decode ($_[0]) }
266 267
267=item cf::lock_wait $string 268=item cf::lock_wait $string
268 269
269Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
270 271
… …
335 }; 336 };
336 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
337 $guard 338 $guard
338} 339}
339 340
341=item cf::periodic $interval, $cb
342
343Like EV::periodic, but randomly selects a starting point so that the actions
344get spread over timer.
345
346=cut
347
348sub periodic($$) {
349 my ($interval, $cb) = @_;
350
351 my $start = rand List::Util::min 180, $interval;
352
353 EV::periodic $start, $interval, 0, $cb
354}
355
340=item cf::get_slot $time[, $priority[, $name]] 356=item cf::get_slot $time[, $priority[, $name]]
341 357
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 358Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds 359This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede. 360of cpu time till the next tick. The slot is only valid till the next cede.
… …
353our @SLOT_QUEUE; 369our @SLOT_QUEUE;
354our $SLOT_QUEUE; 370our $SLOT_QUEUE;
355 371
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 372$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 373$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager");
375
358 my $signal = new Coro::Signal; 376 my $signal = new Coro::Signal;
359 377
360 while () { 378 while () {
361 next_job: 379 next_job:
362 my $avail = cf::till_tick; 380 my $avail = cf::till_tick;
… …
370 } 388 }
371 } 389 }
372 } 390 }
373 391
374 if (@SLOT_QUEUE) { 392 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 393 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 394 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 395 $signal->wait;
378 } else { 396 } else {
379 Coro::schedule; 397 Coro::schedule;
380 } 398 }
… …
403 421
404BEGIN { *async = \&Coro::async_pool } 422BEGIN { *async = \&Coro::async_pool }
405 423
406=item cf::sync_job { BLOCK } 424=item cf::sync_job { BLOCK }
407 425
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 426The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 427is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 428partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 429acceptable.
412 430
413If it must be done, put the blocking parts into C<sync_job>. This will run 431If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 432the given BLOCK in another coroutine while waiting for the result. The
… …
419 437
420sub sync_job(&) { 438sub sync_job(&) {
421 my ($job) = @_; 439 my ($job) = @_;
422 440
423 if ($Coro::current == $Coro::main) { 441 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 442 my $time = EV::time;
425 443
426 # this is the main coro, too bad, we have to block 444 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 445 # till the operation succeeds, freezing the server :/
428 446
447 LOG llevError, Carp::longmess "sync job";#d#
448
429 # TODO: use suspend/resume instead 449 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 450 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 451 my $freeze_guard = freeze_mainloop;
432 452
433 my $busy = 1; 453 my $busy = 1;
434 my @res; 454 my @res;
435 455
436 (async { 456 (async {
457 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 458 @res = eval { $job->() };
438 warn $@ if $@; 459 warn $@ if $@;
439 undef $busy; 460 undef $busy;
440 })->prio (Coro::PRIO_MAX); 461 })->prio (Coro::PRIO_MAX);
441 462
442 while ($busy) { 463 while ($busy) {
443 Coro::cede or Event::one_event; 464 if (Coro::nready) {
465 Coro::cede_notself;
466 } else {
467 EV::loop EV::LOOP_ONESHOT;
444 } 468 }
469 }
445 470
446 $time = Event::time - $time; 471 $time = EV::time - $time;
447 472
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450 475
451 $tick_start += $time; # do not account sync jobs to server load 476 $tick_start += $time; # do not account sync jobs to server load
… …
481=item fork_call { }, $args 506=item fork_call { }, $args
482 507
483Executes the given code block with the given arguments in a seperate 508Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 509process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 510Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 511never block itself or use any form of event handling.
487 512
488=cut 513=cut
489 514
490sub fork_call(&@) { 515sub fork_call(&@) {
491 my ($cb, @args) = @_; 516 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 677attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 678to it. All such attachable objects support the following methods.
654 679
655In the following description, CLASS can be any of C<global>, C<object> 680In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 681C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 682Deliantra).
658 683
659=over 4 684=over 4
660 685
661=item $attachable->attach ($attachment, key => $value...) 686=item $attachable->attach ($attachment, key => $value...)
662 687
… …
944 } 969 }
945 970
946 0 971 0
947} 972}
948 973
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 974=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 975
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 977
953Generate an object-specific event with the given arguments. 978Generate an object-specific event with the given arguments.
954 979
… …
960 985
961=cut 986=cut
962 987
963############################################################################# 988#############################################################################
964# object support 989# object support
965#
966 990
991sub _object_equal($$);
992sub _object_equal($$) {
993 my ($a, $b) = @_;
994
995 return 0 unless (ref $a) eq (ref $b);
996
997 if ("HASH" eq ref $a) {
998 my @ka = keys %$a;
999 my @kb = keys %$b;
1000
1001 return 0 if @ka != @kb;
1002
1003 for (0 .. $#ka) {
1004 return 0 unless $ka[$_] eq $kb[$_];
1005 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1006 }
1007
1008 } elsif ("ARRAY" eq ref $a) {
1009
1010 return 0 if @$a != @$b;
1011
1012 for (0 .. $#$a) {
1013 return 0 unless _object_equal $a->[$_], $b->[$_];
1014 }
1015
1016 } elsif ($a ne $b) {
1017 return 0;
1018 }
1019
1020 1
1021}
1022
1023our $SLOW_MERGES;#d#
967sub _can_merge { 1024sub _can_merge {
968 my ($ob1, $ob2) = @_; 1025 my ($ob1, $ob2) = @_;
969 1026
970 local $Storable::canonical = 1; 1027 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1028
974 $fob1 eq $fob2 1029 # we do the slow way here
1030 return _object_equal $ob1, $ob2
975} 1031}
976 1032
977sub reattach { 1033sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1034 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1035 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1057cf::attachable->attach (
1002 prio => -1000000, 1058 prio => -1000000,
1003 on_instantiate => sub { 1059 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1060 my ($obj, $data) = @_;
1005 1061
1006 $data = from_json $data; 1062 $data = decode_json $data;
1007 1063
1008 for (@$data) { 1064 for (@$data) {
1009 my ($name, $args) = @$_; 1065 my ($name, $args) = @$_;
1010 1066
1011 $obj->attach ($name, %{$args || {} }); 1067 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1080 },
1025); 1081);
1026 1082
1027sub object_freezer_save { 1083sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1084 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1085
1032 sync_job { 1086 sync_job {
1033 if (length $$rdata) { 1087 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1088 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1089 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1096 close $fh;
1043 1097
1044 if (@$objs) { 1098 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1100 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1102 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1103 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1104 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1105 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1106 }
… …
1061 } else { 1115 } else {
1062 aio_unlink $filename; 1116 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1117 aio_unlink "$filename.pst";
1064 } 1118 }
1065 }; 1119 };
1066
1067 undef $guard;
1068} 1120}
1069 1121
1070sub object_freezer_as_string { 1122sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1123 my ($rdata, $objs) = @_;
1072 1124
… …
1077 1129
1078sub object_thawer_load { 1130sub object_thawer_load {
1079 my ($filename) = @_; 1131 my ($filename) = @_;
1080 1132
1081 my ($data, $av); 1133 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1134
1085 (aio_load $filename, $data) >= 0 1135 (aio_load $filename, $data) >= 0
1086 or return; 1136 or return;
1087 1137
1088 unless (aio_stat "$filename.pst") { 1138 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1139 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1140 or return;
1091 1141
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1142 my $st = eval { Coro::Storable::thaw $av };
1143 $av = $st->{objs};
1094 } 1144 }
1095 1145
1096 utf8::decode (my $decname = $filename); 1146 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1147 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1148 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1402 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1403
1354 my $f = new_from_file cf::object::thawer path $login 1404 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1405 or return;
1356 1406
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1407 my $pl = cf::player::load_pl $f
1359 or return; 1408 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1409 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1410 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1411 $cf::PLAYER{$login} = $pl
… …
1514 1563
1515Expand crossfire pod fragments into protocol xml. 1564Expand crossfire pod fragments into protocol xml.
1516 1565
1517=cut 1566=cut
1518 1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1519sub expand_cfpod { 1579sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1580 my ($self, $pod) = @_;
1521 1581
1522 # escape & and < 1582 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1583
1526 # this is buggy, it needs to properly take care of nested <'s 1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1527 1587
1528 1 while 1588 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1589 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1590
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1591 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1592 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1593 ([BCGHITU])
1534 # replace G<male|female> tags 1594 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1595 (?:
1536 $self->gender ? $2 : $1 1596 ([^<>]*) (?{ $group = $^N })
1537 }ge 1597 | < $interior >
1538 # replace H<hint text> 1598 )
1539 || s{H<([^\>]*)>} 1599 >
1600 %gcsx
1540 { 1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1621 "")
1544 [$self->{hintmode}] 1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1546 1633
1634 for ($xml) {
1547 # create single paragraphs (very hackish) 1635 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1636 s/(?<=\S)\n(?=\w)/ /g;
1549 1637
1550 # compress some whitespace 1638 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1639 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1640 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1641 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1642 s/\n+$//; # ending lines
1643 }
1555 1644
1556 $_ 1645 $xml
1557} 1646}
1647
1648no re 'eval';
1558 1649
1559sub hintmode { 1650sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1652 $_[0]{hintmode}
1562} 1653}
… …
2043 } 2134 }
2044 2135
2045 $MAP_PREFETCH{$path} |= $load; 2136 $MAP_PREFETCH{$path} |= $load;
2046 2137
2047 $MAP_PREFETCHER ||= cf::async { 2138 $MAP_PREFETCHER ||= cf::async {
2139 $Coro::current->{desc} = "map prefetcher";
2140
2048 while (%MAP_PREFETCH) { 2141 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2142 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2143 if (my $map = find $k) {
2051 $map->load if $v; 2144 $map->load if $v;
2052 } 2145 }
… …
2078 return if $self->{deny_save}; 2171 return if $self->{deny_save};
2079 2172
2080 local $self->{last_access} = $self->last_access;#d# 2173 local $self->{last_access} = $self->last_access;#d#
2081 2174
2082 cf::async { 2175 cf::async {
2176 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2177 $_->contr->save for $self->players;
2084 }; 2178 };
2085 2179
2086 if ($uniq) { 2180 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2368=cut
2275 2369
2276sub deref { 2370sub deref {
2277 my ($ref) = @_; 2371 my ($ref) = @_;
2278 2372
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2373 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2374 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2375 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2376 or return;
2286 $pl->ob->uuid eq $uuid 2377 $pl->ob->uuid eq $uuid
2287 or return; 2378 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2550
2460 $self->enter_link; 2551 $self->enter_link;
2461 2552
2462 (async { 2553 (async {
2554 $Coro::current->{desc} = "player::goto $path $x $y";
2555
2463 # *tag paths override both path and x|y 2556 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2557 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2558 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2559 my $ob = $obs[rand @obs];
2467 2560
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2561 # see if we actually can go there
2469 # for suitability. 2562 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2563 $ob = $obs[rand @obs];
2564 } else {
2565 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2566 }
2567 # else put us there anyways for now #d#
2470 2568
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2569 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2570 } else {
2571 ($path, $x, $y) = (undef, undef, undef);
2472 } 2572 }
2473 } 2573 }
2474 2574
2475 my $map = eval { 2575 my $map = eval {
2476 my $map = cf::map::find $path; 2576 my $map = defined $path ? cf::map::find $path : undef;
2477 2577
2478 if ($map) { 2578 if ($map) {
2479 $map = $map->customise_for ($self); 2579 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2580 $map = $check->($map) if $check && $map;
2481 } else { 2581 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2583 }
2484 2584
2485 $map 2585 $map
2486 }; 2586 };
2487 2587
… …
2540 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2541 } 2641 }
2542 2642
2543 $rmp->{random_seed} ||= $exit->random_seed; 2643 $rmp->{random_seed} ||= $exit->random_seed;
2544 2644
2545 my $data = cf::to_json $rmp; 2645 my $data = cf::encode_json $rmp;
2546 my $md5 = Digest::MD5::md5_hex $data; 2646 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2647 my $meta = "$RANDOMDIR/$md5.meta";
2548 2648
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2650 aio_write $fh, 0, (length $data), $data, 0;
… …
2577 # if exit is damned, update players death & WoR home-position 2677 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp) 2678 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED); 2679 if $exit->flag (FLAG_DAMNED);
2580 2680
2581 (async { 2681 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2683
2582 $self->deactivate_recursive; # just to be sure 2684 $self->deactivate_recursive; # just to be sure
2583 unless (eval { 2685 unless (eval {
2584 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($slaying, $hp, $sp);
2585 2687
2586 1; 2688 1;
… …
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2723the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2724the message unless the client supports the msg packet.
2623 2725
2624=cut 2726=cut
2625 2727
2728# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2729our %CHANNEL = (
2627 "c/identify" => { 2730 "c/identify" => {
2628 id => "identify", 2731 id => "infobox",
2629 title => "Identify", 2732 title => "Identify",
2630 reply => undef, 2733 reply => undef,
2631 tooltip => "Items recently identified", 2734 tooltip => "Items recently identified",
2632 }, 2735 },
2633 "c/examine" => { 2736 "c/examine" => {
2634 id => "examine", 2737 id => "infobox",
2635 title => "Examine", 2738 title => "Examine",
2636 reply => undef, 2739 reply => undef,
2637 tooltip => "Signs and other items you examined", 2740 tooltip => "Signs and other items you examined",
2638 }, 2741 },
2742 "c/book" => {
2743 id => "infobox",
2744 title => "Book",
2745 reply => undef,
2746 tooltip => "The contents of a note or book",
2747 },
2748 "c/lookat" => {
2749 id => "infobox",
2750 title => "Look",
2751 reply => undef,
2752 tooltip => "What you saw there",
2753 },
2754 "c/who" => {
2755 id => "infobox",
2756 title => "Players",
2757 reply => undef,
2758 tooltip => "Shows players who are currently online",
2759 },
2760 "c/body" => {
2761 id => "infobox",
2762 title => "Body Parts",
2763 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available",
2765 },
2766 "c/uptime" => {
2767 id => "infobox",
2768 title => "Uptime",
2769 reply => undef,
2770 tooltip => "How long the server has been running since last restart",
2771 },
2772 "c/mapinfo" => {
2773 id => "infobox",
2774 title => "Map Info",
2775 reply => undef,
2776 tooltip => "Information related to the maps",
2777 },
2639); 2778);
2640 2779
2641sub cf::client::send_msg { 2780sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 2781 my ($self, $channel, $msg, $color, @extra) = @_;
2643 2782
2644 $msg = $self->pl->expand_cfpod ($msg); 2783 $msg = $self->pl->expand_cfpod ($msg);
2645 2784
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 2785 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 2786
2648 # check predefined channels, for the benefit of C 2787 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2788 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel};
2650 2790
2791 $self->ext_msg (channel_info => $channel)
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id};
2795
2651 if (ref $channel) { 2796 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 2797 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 2798 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 2799 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 2800 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg; 2801 if $self->can_msg;
… …
2873=pod 3018=pod
2874 3019
2875The following functions and methods are available within a safe environment: 3020The following functions and methods are available within a safe environment:
2876 3021
2877 cf::object 3022 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3023 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3024 insert remove name archname title slaying race decrease_ob_nr
2880 3025
2881 cf::object::player 3026 cf::object::player
2882 player 3027 player
2883 3028
… …
2890=cut 3035=cut
2891 3036
2892for ( 3037for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3039 insert remove inv name archname title slaying race
2895 decrease_ob_nr)], 3040 decrease_ob_nr destroy)],
2896 ["cf::object::player" => qw(player)], 3041 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3042 ["cf::player" => qw(peaceful)],
2898 ["cf::map" => qw(trigger)], 3043 ["cf::map" => qw(trigger)],
2899) { 3044) {
2900 no strict 'refs'; 3045 no strict 'refs';
… …
3005 { 3150 {
3006 my $faces = $facedata->{faceinfo}; 3151 my $faces = $facedata->{faceinfo};
3007 3152
3008 while (my ($face, $info) = each %$faces) { 3153 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3154 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155
3010 cf::face::set_visibility $idx, $info->{visibility}; 3156 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3157 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3014 3160
3015 cf::cede_to_tick; 3161 cf::cede_to_tick;
3016 } 3162 }
3017 3163
3018 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3165 next unless $info->{smooth};
3166
3020 my $idx = cf::face::find $face 3167 my $idx = cf::face::find $face
3021 or next; 3168 or next;
3169
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3170 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3171 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3173 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3174 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3044 { 3192 {
3045 # TODO: for gcfclient pleasure, we should give resources 3193 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index. 3194 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3195 my $res = $facedata->{resource};
3048 3196
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3197 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3199 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data; 3200 my $data;
3054 3201
3055 if ($info->{type} & 1) { 3202 if ($info->{type} & 1) {
3056 # prepend meta info 3203 # prepend meta info
3057 3204
3058 my $meta = $enc->encode ({ 3205 my $meta = $enc->encode ({
3059 name => $name, 3206 name => $name,
3060 %{ $info->{meta} || {} }, 3207 %{ $info->{meta} || {} },
3061 }); 3208 });
3062 3209
3063 $data = pack "(w/a*)*", $meta, $info->{data}; 3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type};
3064 } else { 3217 } else {
3065 $data = $info->{data}; 3218 $RESOURCE{$name} = $info;
3066 } 3219 }
3067 3220
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3221 cf::cede_to_tick;
3072 } 3222 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3223 }
3224
3225 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3226
3093 1 3227 1
3094} 3228}
3229
3230cf::global->attach (on_resource_update => sub {
3231 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3232 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3233
3234 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3235 my $sound = $soundconf->{compat}[$_]
3236 or next;
3237
3238 my $face = cf::face::find "sound/$sound->[1]";
3239 cf::sound::set $sound->[0] => $face;
3240 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3241 }
3242
3243 while (my ($k, $v) = each %{$soundconf->{event}}) {
3244 my $face = cf::face::find "sound/$v";
3245 cf::sound::set $k => $face;
3246 }
3247 }
3248});
3095 3249
3096register_exticmd fx_want => sub { 3250register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3251 my ($ns, $want) = @_;
3098 3252
3099 while (my ($k, $v) = each %$want) { 3253 while (my ($k, $v) = each %$want) {
… …
3175sub main { 3329sub main {
3176 # we must not ever block the main coroutine 3330 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3331 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3332 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3333 (async {
3180 Event::one_event; 3334 $Coro::current->{desc} = "IDLE BUG HANDLER";
3335 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3336 })->prio (Coro::PRIO_MAX);
3182 }; 3337 };
3183 3338
3184 reload_config; 3339 reload_config;
3185 db_init; 3340 db_init;
3186 load_extensions; 3341 load_extensions;
3187 3342
3188 $TICK_WATCHER->start; 3343 $TICK_WATCHER->start;
3344 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3189 Event::loop; 3345 EV::loop;
3190} 3346}
3191 3347
3192############################################################################# 3348#############################################################################
3193# initialisation and cleanup 3349# initialisation and cleanup
3194 3350
3195# install some emergency cleanup handlers 3351# install some emergency cleanup handlers
3196BEGIN { 3352BEGIN {
3353 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3354 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3355 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3356 cf::cleanup "SIG$signal";
3205 },
3206 ); 3357 };
3207 } 3358 }
3208} 3359}
3209 3360
3210sub write_runtime { 3361sub write_runtime {
3211 my $runtime = "$LOCALDIR/runtime"; 3362 my $runtime = "$LOCALDIR/runtime";
… …
3256 # and maps saved/destroyed asynchronously. 3407 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3408 warn "begin emergency player save\n";
3258 for my $login (keys %cf::PLAYER) { 3409 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3410 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3411 $pl->valid or next;
3412 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3413 $pl->save;
3262 } 3414 }
3263 warn "end emergency player save\n"; 3415 warn "end emergency player save\n";
3264 3416
3265 warn "begin emergency map save\n"; 3417 warn "begin emergency map save\n";
… …
3304 warn "syncing database to disk"; 3456 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3457 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3458
3307 # if anything goes wrong in here, we should simply crash as we already saved 3459 # if anything goes wrong in here, we should simply crash as we already saved
3308 3460
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3461 warn "flushing outstanding aio requests";
3315 for (;;) { 3462 for (;;) {
3316 BDB::flush; 3463 BDB::flush;
3317 IO::AIO::flush; 3464 IO::AIO::flush;
3318 Coro::cede; 3465 Coro::cede_notself;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3466 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate..."; 3467 warn "iterate...";
3321 } 3468 }
3322 3469
3323 ++$RELOAD; 3470 ++$RELOAD;
… …
3412 3559
3413sub reload_perl() { 3560sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3561 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3562 # coro crashes during coro_state_free->destroy here.
3416 3563
3417 $RELOAD_WATCHER ||= Event->timer ( 3564 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3418 reentrant => 0,
3419 after => 0,
3420 data => WF_AUTOCANCEL,
3421 cb => sub {
3422 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3565 undef $RELOAD_WATCHER;
3424 }, 3566 do_reload_perl;
3425 ); 3567 };
3426} 3568}
3427 3569
3428register_command "reload" => sub { 3570register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3571 my ($who, $arg) = @_;
3430 3572
3431 if ($who->flag (FLAG_WIZ)) { 3573 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3574 $who->message ("reloading server.");
3575 async {
3576 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3577 reload_perl;
3578 };
3434 } 3579 }
3435}; 3580};
3436 3581
3437unshift @INC, $LIBDIR; 3582unshift @INC, $LIBDIR;
3438 3583
… …
3457 my $signal = new Coro::Signal; 3602 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3603 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3604 $signal->wait;
3460} 3605}
3461 3606
3462our $stat_fh; 3607$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3465$TICK_WATCHER = Event->timer (
3466 reentrant => 0,
3467 parked => 1,
3468 prio => 0,
3469 at => $NEXT_TICK || $TICK,
3470 data => WF_AUTOCANCEL,
3471 cb => sub {
3472 if ($Coro::current != $Coro::main) { 3608 if ($Coro::current != $Coro::main) {
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3609 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 3610 unless ++$bug_warning > 10;
3475 return; 3611 return;
3476 } 3612 }
3477 3613
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3479
3480 $NOW = $tick_start = Event::time; 3614 $NOW = $tick_start = EV::now;
3481 3615
3482 cf::server_tick; # one server iteration 3616 cf::server_tick; # one server iteration
3483 3617
3484 $RUNTIME += $TICK; 3618 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK; 3619 $NEXT_TICK = $_[0]->at;
3486 3620
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3621 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 3622 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3489 Coro::async_pool { 3623 Coro::async_pool {
3624 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 3625 write_runtime
3491 or warn "ERROR: unable to write runtime file: $!"; 3626 or warn "ERROR: unable to write runtime file: $!";
3492 };
3493 } 3627 };
3628 }
3494 3629
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3630 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3631 $sig->send;
3500 } 3632 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3633 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3634 $sig->send;
3503 } 3635 }
3504 3636
3505 $NOW = Event::time;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3637 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3638 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3639
3516 _post_tick; 3640 _post_tick;
3517 3641};
3518 # gather some statistics#d# 3642$TICK_WATCHER->priority (EV::MAXPRI);
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3521 },
3522);
3523 3643
3524{ 3644{
3645 # configure BDB
3646
3525 BDB::min_parallel 8; 3647 BDB::min_parallel 8;
3526 BDB::max_poll_time $TICK * 0.1; 3648 BDB::max_poll_reqs $TICK * 0.1;
3527 $BDB_POLL_WATCHER = Event->io ( 3649 $Coro::BDB::WATCHER->priority (1);
3528 reentrant => 0,
3529 fd => BDB::poll_fileno,
3530 poll => 'r',
3531 prio => 0,
3532 data => WF_AUTOCANCEL,
3533 cb => \&BDB::poll_cb,
3534 );
3535
3536 BDB::set_sync_prepare {
3537 my $status;
3538 my $current = $Coro::current;
3539 (
3540 sub {
3541 $status = $!;
3542 $current->ready; undef $current;
3543 },
3544 sub {
3545 Coro::schedule while defined $current;
3546 $! = $status;
3547 },
3548 )
3549 };
3550 3650
3551 unless ($DB_ENV) { 3651 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 3652 $DB_ENV = BDB::db_env_create;
3653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3654 | BDB::LOG_AUTOREMOVE, 1);
3655 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3656 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3657
3554 cf::sync_job { 3658 cf::sync_job {
3555 eval { 3659 eval {
3556 BDB::db_env_open 3660 BDB::db_env_open
3557 $DB_ENV, 3661 $DB_ENV,
… …
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3663 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3664 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 3665 0666;
3562 3666
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3667 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 3668 };
3569 3669
3570 cf::cleanup "db_env_open(db): $@" if $@; 3670 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 3671 };
3572 } 3672 }
3573 3673
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3674 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3575 after => 11, 3675 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3576 interval => 60, 3676 };
3577 hard => 1, 3677 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3678 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 ); 3679 };
3584 $BDB_TRICKLE_WATCHER = Event->timer ( 3680 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3681 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 ); 3682 };
3594} 3683}
3595 3684
3596{ 3685{
3686 # configure IO::AIO
3687
3597 IO::AIO::min_parallel 8; 3688 IO::AIO::min_parallel 8;
3598
3599 undef $Coro::AIO::WATCHER;
3600 IO::AIO::max_poll_time $TICK * 0.1; 3689 IO::AIO::max_poll_time $TICK * 0.1;
3601 $AIO_POLL_WATCHER = Event->io ( 3690 $Coro::AIO::WATCHER->priority (1);
3602 reentrant => 0,
3603 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno,
3605 poll => 'r',
3606 prio => 6,
3607 cb => \&IO::AIO::poll_cb,
3608 );
3609} 3691}
3610 3692
3611my $_log_backtrace; 3693my $_log_backtrace;
3612 3694
3613sub _log_backtrace { 3695sub _log_backtrace {
… …
3617 3699
3618 # limit the # of concurrent backtraces 3700 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 3701 if ($_log_backtrace < 2) {
3620 ++$_log_backtrace; 3702 ++$_log_backtrace;
3621 async { 3703 async {
3704 $Coro::current->{desc} = "abt $msg";
3705
3622 my @bt = fork_call { 3706 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 3707 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3708 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3709 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3626 or die "addr2line: $!"; 3710 or die "addr2line: $!";

Diff Legend

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