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.370 by root, Thu Sep 13 10:59:41 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;
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
… …
192 $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;
193 194
194 LOG llevError, $msg; 195 LOG llevError, $msg;
195 }; 196 };
196} 197}
198
199$Coro::State::DIEHOOK = sub {
200 warn Carp::longmess $_[0];
201 Coro::terminate;
202};
197 203
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
214)) { 220)) {
215 no strict 'refs'; 221 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 223}
218 224
219$Event::DIED = sub { 225$EV::DIED = sub {
220 warn "error in event callback: @_"; 226 warn "error in event callback: @_";
221}; 227};
222 228
223############################################################################# 229#############################################################################
224 230
… …
247 $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;
248 $d 254 $d
249 } || "[unable to dump $_[0]: '$@']"; 255 } || "[unable to dump $_[0]: '$@']";
250} 256}
251 257
252=item $ref = cf::from_json $json 258=item $ref = cf::decode_json $json
253 259
254Converts a JSON string into the corresponding perl data structure. 260Converts a JSON string into the corresponding perl data structure.
255 261
256=item $json = cf::to_json $ref 262=item $json = cf::encode_json $ref
257 263
258Converts a perl data structure into its JSON representation. 264Converts a perl data structure into its JSON representation.
259 265
260=cut 266=cut
261 267
262our $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
263 269
264sub to_json ($) { $json_coder->encode ($_[0]) } 270sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 271sub decode_json($) { $json_coder->decode ($_[0]) }
266 272
267=item cf::lock_wait $string 273=item cf::lock_wait $string
268 274
269Wait until the given lock is available. See cf::lock_acquire. 275Wait until the given lock is available. See cf::lock_acquire.
270 276
… …
335 }; 341 };
336 $TICK_WATCHER->stop; 342 $TICK_WATCHER->stop;
337 $guard 343 $guard
338} 344}
339 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
359}
360
340=item cf::get_slot $time[, $priority[, $name]] 361=item cf::get_slot $time[, $priority[, $name]]
341 362
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 363Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds 364This 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. 365of cpu time till the next tick. The slot is only valid till the next cede.
… …
353our @SLOT_QUEUE; 374our @SLOT_QUEUE;
354our $SLOT_QUEUE; 375our $SLOT_QUEUE;
355 376
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 377$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 378$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager");
380
358 my $signal = new Coro::Signal; 381 my $signal = new Coro::Signal;
359 382
360 while () { 383 while () {
361 next_job: 384 next_job:
362 my $avail = cf::till_tick; 385 my $avail = cf::till_tick;
… …
370 } 393 }
371 } 394 }
372 } 395 }
373 396
374 if (@SLOT_QUEUE) { 397 if (@SLOT_QUEUE) {
375 # 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
376 push @cf::WAIT_FOR_TICK, $signal; 399 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 400 $signal->wait;
378 } else { 401 } else {
379 Coro::schedule; 402 Coro::schedule;
380 } 403 }
… …
403 426
404BEGIN { *async = \&Coro::async_pool } 427BEGIN { *async = \&Coro::async_pool }
405 428
406=item cf::sync_job { BLOCK } 429=item cf::sync_job { BLOCK }
407 430
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 431The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 432is 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 433partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 434acceptable.
412 435
413If 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
414the given BLOCK in another coroutine while waiting for the result. The 437the given BLOCK in another coroutine while waiting for the result. The
… …
419 442
420sub sync_job(&) { 443sub sync_job(&) {
421 my ($job) = @_; 444 my ($job) = @_;
422 445
423 if ($Coro::current == $Coro::main) { 446 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 447 my $time = EV::time;
425 448
426 # this is the main coro, too bad, we have to block 449 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 450 # till the operation succeeds, freezing the server :/
428 451
452 LOG llevError, Carp::longmess "sync job";#d#
453
429 # TODO: use suspend/resume instead 454 # TODO: use suspend/resume instead
430 # (but this is cancel-safe) 455 # (but this is cancel-safe)
431 my $freeze_guard = freeze_mainloop; 456 my $freeze_guard = freeze_mainloop;
432 457
433 my $busy = 1; 458 my $busy = 1;
434 my @res; 459 my @res;
435 460
436 (async { 461 (async {
462 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 463 @res = eval { $job->() };
438 warn $@ if $@; 464 warn $@ if $@;
439 undef $busy; 465 undef $busy;
440 })->prio (Coro::PRIO_MAX); 466 })->prio (Coro::PRIO_MAX);
441 467
442 while ($busy) { 468 while ($busy) {
443 Coro::cede or Event::one_event; 469 if (Coro::nready) {
470 Coro::cede_notself;
471 } else {
472 EV::loop EV::LOOP_ONESHOT;
444 } 473 }
474 }
445 475
446 $time = Event::time - $time; 476 $time = EV::time - $time;
447 477
448 LOG llevError | logBacktrace, Carp::longmess "long sync job" 478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450 480
451 $tick_start += $time; # do not account sync jobs to server load 481 $tick_start += $time; # do not account sync jobs to server load
… …
481=item fork_call { }, $args 511=item fork_call { }, $args
482 512
483Executes the given code block with the given arguments in a seperate 513Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 514process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 515Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 516never block itself or use any form of event handling.
487 517
488=cut 518=cut
489 519
490sub fork_call(&@) { 520sub fork_call(&@) {
491 my ($cb, @args) = @_; 521 my ($cb, @args) = @_;
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 682attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 683to it. All such attachable objects support the following methods.
654 684
655In 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>
656C<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
657Crossfire TRT). 687Deliantra).
658 688
659=over 4 689=over 4
660 690
661=item $attachable->attach ($attachment, key => $value...) 691=item $attachable->attach ($attachment, key => $value...)
662 692
… …
944 } 974 }
945 975
946 0 976 0
947} 977}
948 978
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 979=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 980
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 981=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 982
953Generate an object-specific event with the given arguments. 983Generate an object-specific event with the given arguments.
954 984
… …
960 990
961=cut 991=cut
962 992
963############################################################################# 993#############################################################################
964# object support 994# object support
965#
966 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#
967sub _can_merge { 1029sub _can_merge {
968 my ($ob1, $ob2) = @_; 1030 my ($ob1, $ob2) = @_;
969 1031
970 local $Storable::canonical = 1; 1032 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1033
974 $fob1 eq $fob2 1034 # we do the slow way here
1035 return _object_equal $ob1, $ob2
975} 1036}
976 1037
977sub reattach { 1038sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1039 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1040 my ($obj) = @_;
… …
1001cf::attachable->attach ( 1062cf::attachable->attach (
1002 prio => -1000000, 1063 prio => -1000000,
1003 on_instantiate => sub { 1064 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1065 my ($obj, $data) = @_;
1005 1066
1006 $data = from_json $data; 1067 $data = decode_json $data;
1007 1068
1008 for (@$data) { 1069 for (@$data) {
1009 my ($name, $args) = @$_; 1070 my ($name, $args) = @$_;
1010 1071
1011 $obj->attach ($name, %{$args || {} }); 1072 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1085 },
1025); 1086);
1026 1087
1027sub object_freezer_save { 1088sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1089 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1090
1032 sync_job { 1091 sync_job {
1033 if (length $$rdata) { 1092 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1093 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1094 warn sprintf "saving %s (%d,%d)\n",
… …
1042 close $fh; 1101 close $fh;
1043 1102
1044 if (@$objs) { 1103 if (@$objs) {
1045 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) {
1046 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1107 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1108 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1109 close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1110 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1111 }
… …
1061 } else { 1120 } else {
1062 aio_unlink $filename; 1121 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1122 aio_unlink "$filename.pst";
1064 } 1123 }
1065 }; 1124 };
1066
1067 undef $guard;
1068} 1125}
1069 1126
1070sub object_freezer_as_string { 1127sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1128 my ($rdata, $objs) = @_;
1072 1129
… …
1077 1134
1078sub object_thawer_load { 1135sub object_thawer_load {
1079 my ($filename) = @_; 1136 my ($filename) = @_;
1080 1137
1081 my ($data, $av); 1138 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1139
1085 (aio_load $filename, $data) >= 0 1140 (aio_load $filename, $data) >= 0
1086 or return; 1141 or return;
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 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1147 my $st = eval { Coro::Storable::thaw $av };
1148 $av = $st->{objs};
1094 } 1149 }
1095 1150
1096 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1152 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1153 $decname, length $data, scalar @{$av || []};
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1407 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1408
1354 my $f = new_from_file cf::object::thawer path $login 1409 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1410 or return;
1356 1411
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1412 my $pl = cf::player::load_pl $f
1359 or return; 1413 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1414 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1415 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1416 $cf::PLAYER{$login} = $pl
… …
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}
… …
2043 } 2139 }
2044 2140
2045 $MAP_PREFETCH{$path} |= $load; 2141 $MAP_PREFETCH{$path} |= $load;
2046 2142
2047 $MAP_PREFETCHER ||= cf::async { 2143 $MAP_PREFETCHER ||= cf::async {
2144 $Coro::current->{desc} = "map prefetcher";
2145
2048 while (%MAP_PREFETCH) { 2146 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2147 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2148 if (my $map = find $k) {
2051 $map->load if $v; 2149 $map->load if $v;
2052 } 2150 }
… …
2078 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2079 2177
2080 local $self->{last_access} = $self->last_access;#d# 2178 local $self->{last_access} = $self->last_access;#d#
2081 2179
2082 cf::async { 2180 cf::async {
2181 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2182 $_->contr->save for $self->players;
2084 }; 2183 };
2085 2184
2086 if ($uniq) { 2185 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2373=cut
2275 2374
2276sub deref { 2375sub deref {
2277 my ($ref) = @_; 2376 my ($ref) = @_;
2278 2377
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2378 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2379 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2380 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2381 or return;
2286 $pl->ob->uuid eq $uuid 2382 $pl->ob->uuid eq $uuid
2287 or return; 2383 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2555
2460 $self->enter_link; 2556 $self->enter_link;
2461 2557
2462 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2463 # *tag paths override both path and x|y 2561 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2562 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2564 my $ob = $obs[rand @obs];
2467 2565
… …
2547 $rmp->{origin_y} = $exit->y; 2645 $rmp->{origin_y} = $exit->y;
2548 } 2646 }
2549 2647
2550 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2551 2649
2552 my $data = cf::to_json $rmp; 2650 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2555 2653
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
… …
2584 # if exit is damned, update players death & WoR home-position 2682 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2683 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2684 if $exit->flag (FLAG_DAMNED);
2587 2685
2588 (async { 2686 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2688
2589 $self->deactivate_recursive; # just to be sure 2689 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2690 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2691 $self->goto ($slaying, $hp, $sp);
2592 2692
2593 1; 2693 1;
… …
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 => "identify", 2736 id => "infobox",
2636 title => "Identify", 2737 title => "Identify",
2637 reply => undef, 2738 reply => undef,
2638 tooltip => "Items recently identified", 2739 tooltip => "Items recently identified",
2639 }, 2740 },
2640 "c/examine" => { 2741 "c/examine" => {
2641 id => "examine", 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 },
2753 "c/lookat" => {
2754 id => "infobox",
2755 title => "Look",
2756 reply => undef,
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",
2782 },
2646); 2783);
2647 2784
2648sub cf::client::send_msg { 2785sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2786 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2787
2651 $msg = $self->pl->expand_cfpod ($msg); 2788 $msg = $self->pl->expand_cfpod ($msg);
2652 2789
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2790 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2791
2655 # check predefined channels, for the benefit of C 2792 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2793 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel};
2657 2795
2796 $self->ext_msg (channel_info => $channel)
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id};
2800
2658 if (ref $channel) { 2801 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2802 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2803 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2804 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2805 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2806 if $self->can_msg;
… …
2880=pod 3023=pod
2881 3024
2882The following functions and methods are available within a safe environment: 3025The following functions and methods are available within a safe environment:
2883 3026
2884 cf::object 3027 cf::object
2885 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
2886 insert remove name archname title slaying race decrease_ob_nr 3029 insert remove name archname title slaying race decrease_ob_nr
2887 3030
2888 cf::object::player 3031 cf::object::player
2889 player 3032 player
2890 3033
… …
2897=cut 3040=cut
2898 3041
2899for ( 3042for (
2900 ["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
2901 insert remove inv name archname title slaying race 3044 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3045 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3046 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3047 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3048 ["cf::map" => qw(trigger)],
2906) { 3049) {
2907 no strict 'refs'; 3050 no strict 'refs';
… …
3012 { 3155 {
3013 my $faces = $facedata->{faceinfo}; 3156 my $faces = $facedata->{faceinfo};
3014 3157
3015 while (my ($face, $info) = each %$faces) { 3158 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3159 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160
3017 cf::face::set_visibility $idx, $info->{visibility}; 3161 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3162 cf::face::set_magicmap $idx, $info->{magicmap};
3019 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};
3020 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};
3021 3165
3022 cf::cede_to_tick; 3166 cf::cede_to_tick;
3023 } 3167 }
3024 3168
3025 while (my ($face, $info) = each %$faces) { 3169 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3170 next unless $info->{smooth};
3171
3027 my $idx = cf::face::find $face 3172 my $idx = cf::face::find $face
3028 or next; 3173 or next;
3174
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3175 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3176 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3177 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3178 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3179 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3197 {
3052 # TODO: for gcfclient pleasure, we should give resources 3198 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3199 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3200 my $res = $facedata->{resource};
3055 3201
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3202 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3204 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3205 my $data;
3061 3206
3062 if ($info->{type} & 1) { 3207 if ($info->{type} & 1) {
3063 # prepend meta info 3208 # prepend meta info
3064 3209
3065 my $meta = $enc->encode ({ 3210 my $meta = $enc->encode ({
3066 name => $name, 3211 name => $name,
3067 %{ $info->{meta} || {} }, 3212 %{ $info->{meta} || {} },
3068 }); 3213 });
3069 3214
3070 $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};
3071 } else { 3222 } else {
3072 $data = $info->{data}; 3223 $RESOURCE{$name} = $info;
3073 } 3224 }
3074 3225
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3226 cf::cede_to_tick;
3079 } 3227 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3228 }
3229
3230 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3231
3100 1 3232 1
3101} 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});
3102 3254
3103register_exticmd fx_want => sub { 3255register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3256 my ($ns, $want) = @_;
3105 3257
3106 while (my ($k, $v) = each %$want) { 3258 while (my ($k, $v) = each %$want) {
… …
3182sub main { 3334sub main {
3183 # we must not ever block the main coroutine 3335 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3336 local $Coro::idle = sub {
3185 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#
3186 (async { 3338 (async {
3187 Event::one_event; 3339 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3341 })->prio (Coro::PRIO_MAX);
3189 }; 3342 };
3190 3343
3191 reload_config; 3344 reload_config;
3192 db_init; 3345 db_init;
3193 load_extensions; 3346 load_extensions;
3194 3347
3195 $TICK_WATCHER->start; 3348 $TICK_WATCHER->start;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3196 Event::loop; 3350 EV::loop;
3197} 3351}
3198 3352
3199############################################################################# 3353#############################################################################
3200# initialisation and cleanup 3354# initialisation and cleanup
3201 3355
3202# install some emergency cleanup handlers 3356# install some emergency cleanup handlers
3203BEGIN { 3357BEGIN {
3358 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3359 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3360 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3361 cf::cleanup "SIG$signal";
3212 },
3213 ); 3362 };
3214 } 3363 }
3215} 3364}
3216 3365
3217sub write_runtime { 3366sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime"; 3367 my $runtime = "$LOCALDIR/runtime";
… …
3263 # and maps saved/destroyed asynchronously. 3412 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3413 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3414 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3415 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3416 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3418 $pl->save;
3269 } 3419 }
3270 warn "end emergency player save\n"; 3420 warn "end emergency player save\n";
3271 3421
3272 warn "begin emergency map save\n"; 3422 warn "begin emergency map save\n";
… …
3311 warn "syncing database to disk"; 3461 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3462 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3463
3314 # 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
3315 3465
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3466 warn "flushing outstanding aio requests";
3322 for (;;) { 3467 for (;;) {
3323 BDB::flush; 3468 BDB::flush;
3324 IO::AIO::flush; 3469 IO::AIO::flush;
3325 Coro::cede; 3470 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3471 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3472 warn "iterate...";
3328 } 3473 }
3329 3474
3330 ++$RELOAD; 3475 ++$RELOAD;
… …
3419 3564
3420sub reload_perl() { 3565sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3566 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3567 # coro crashes during coro_state_free->destroy here.
3423 3568
3424 $RELOAD_WATCHER ||= Event->timer ( 3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3570 undef $RELOAD_WATCHER;
3431 }, 3571 do_reload_perl;
3432 ); 3572 };
3433} 3573}
3434 3574
3435register_command "reload" => sub { 3575register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3576 my ($who, $arg) = @_;
3437 3577
3438 if ($who->flag (FLAG_WIZ)) { 3578 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3579 $who->message ("reloading server.");
3580 async {
3581 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3582 reload_perl;
3583 };
3441 } 3584 }
3442}; 3585};
3443 3586
3444unshift @INC, $LIBDIR; 3587unshift @INC, $LIBDIR;
3445 3588
… …
3464 my $signal = new Coro::Signal; 3607 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3608 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3609 $signal->wait;
3467} 3610}
3468 3611
3469$TICK_WATCHER = Event->timer ( 3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3613 if ($Coro::current != $Coro::main) {
3477 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"
3478 unless ++$bug_warning > 10; 3615 unless ++$bug_warning > 10;
3479 return; 3616 return;
3480 } 3617 }
3481 3618
3482 $NOW = $tick_start = Event::time; 3619 $NOW = $tick_start = EV::now;
3483 3620
3484 cf::server_tick; # one server iteration 3621 cf::server_tick; # one server iteration
3485 3622
3486 $RUNTIME += $TICK; 3623 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK; 3624 $NEXT_TICK = $_[0]->at;
3488 3625
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3626 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3628 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3630 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3631 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3632 };
3633 }
3496 3634
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3636 $sig->send;
3499 } 3637 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3638 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3639 $sig->send;
3502 } 3640 }
3503 3641
3504 $NOW = Event::time;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK; 3642 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3644
3515 _post_tick; 3645 _post_tick;
3516 }, 3646};
3517); 3647$TICK_WATCHER->priority (EV::MAXPRI);
3518 3648
3519{ 3649{
3650 # configure BDB
3651
3520 BDB::min_parallel 8; 3652 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3653 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3654 $Coro::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3655
3546 unless ($DB_ENV) { 3656 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3657 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3659 | BDB::LOG_AUTOREMOVE, 1);
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3548 3662
3549 cf::sync_job { 3663 cf::sync_job {
3550 eval { 3664 eval {
3551 BDB::db_env_open 3665 BDB::db_env_open
3552 $DB_ENV, 3666 $DB_ENV,
… …
3554 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3668 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3555 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3669 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3556 0666; 3670 0666;
3557 3671
3558 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3672 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3559
3560 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3561 | BDB::LOG_AUTOREMOVE, 1);
3562 $DB_ENV->set_lk_detect;
3563 }; 3673 };
3564 3674
3565 cf::cleanup "db_env_open(db): $@" if $@; 3675 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3676 };
3567 } 3677 }
3568 3678
3569 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3679 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 11, 3680 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3571 interval => 60, 3681 };
3572 hard => 1, 3682 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3683 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3577 },
3578 ); 3684 };
3579 $BDB_TRICKLE_WATCHER = Event->timer ( 3685 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3580 after => 5,
3581 interval => 10,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3686 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3587 },
3588 ); 3687 };
3589} 3688}
3590 3689
3591{ 3690{
3691 # configure IO::AIO
3692
3592 IO::AIO::min_parallel 8; 3693 IO::AIO::min_parallel 8;
3593
3594 undef $Coro::AIO::WATCHER;
3595 IO::AIO::max_poll_time $TICK * 0.1; 3694 IO::AIO::max_poll_time $TICK * 0.1;
3596 $AIO_POLL_WATCHER = Event->io ( 3695 $Coro::AIO::WATCHER->priority (1);
3597 reentrant => 0,
3598 data => WF_AUTOCANCEL,
3599 fd => IO::AIO::poll_fileno,
3600 poll => 'r',
3601 prio => 6,
3602 cb => \&IO::AIO::poll_cb,
3603 );
3604} 3696}
3605 3697
3606my $_log_backtrace; 3698my $_log_backtrace;
3607 3699
3608sub _log_backtrace { 3700sub _log_backtrace {
… …
3612 3704
3613 # limit the # of concurrent backtraces 3705 # limit the # of concurrent backtraces
3614 if ($_log_backtrace < 2) { 3706 if ($_log_backtrace < 2) {
3615 ++$_log_backtrace; 3707 ++$_log_backtrace;
3616 async { 3708 async {
3709 $Coro::current->{desc} = "abt $msg";
3710
3617 my @bt = fork_call { 3711 my @bt = fork_call {
3618 @addr = map { sprintf "%x", $_ } @addr; 3712 @addr = map { sprintf "%x", $_ } @addr;
3619 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3713 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3620 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3714 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3621 or die "addr2line: $!"; 3715 or die "addr2line: $!";

Diff Legend

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