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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.411 by root, Fri Feb 1 15:54:07 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use 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 ();
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
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 81our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 82our $BDB_CHECKPOINT_WATCHER;
… …
89 85
90our %CFG; 86our %CFG;
91 87
92our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 89our $RUNTIME;
90our $NOW;
94 91
95our (%PLAYER, %PLAYER_LOADING); # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 93our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
98 95
… …
162 159
163The raw value load value from the last tick. 160The raw value load value from the last tick.
164 161
165=item %cf::CFG 162=item %cf::CFG
166 163
167Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 165from wherever your confdir points to.
169 166
170=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
171 168
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 191
195 LOG llevError, $msg; 192 LOG llevError, $msg;
196 }; 193 };
197} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
198 210
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
215)) { 227)) {
216 no strict 'refs'; 228 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 230}
219 231
220$Event::DIED = sub { 232$EV::DIED = sub {
221 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
222}; 234};
223 235
224############################################################################# 236#############################################################################
225 237
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 261 $d
250 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
251} 263}
252 264
253=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
254 266
255Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
256 268
257=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
258 270
259Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
260 272
261=cut 273=cut
262 274
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 276
265sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
267 279
268=item cf::lock_wait $string 280=item cf::lock_wait $string
269 281
270Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
271 283
… …
336 }; 348 };
337 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
338 $guard 350 $guard
339} 351}
340 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
341=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
342 369
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
… …
354our @SLOT_QUEUE; 381our @SLOT_QUEUE;
355our $SLOT_QUEUE; 382our $SLOT_QUEUE;
356 383
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
359 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
360 389
361 while () { 390 while () {
362 next_job: 391 next_job:
363 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
… …
371 } 400 }
372 } 401 }
373 } 402 }
374 403
375 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 407 $signal->wait;
379 } else { 408 } else {
380 Coro::schedule; 409 Coro::schedule;
381 } 410 }
… …
404 433
405BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
406 435
407=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
408 437
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 441acceptable.
413 442
414If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
… …
420 449
421sub sync_job(&) { 450sub sync_job(&) {
422 my ($job) = @_; 451 my ($job) = @_;
423 452
424 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 454 my $time = EV::time;
426 455
427 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
429 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
430 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
431 # (but this is cancel-safe) 462 # (but this is cancel-safe)
432 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
433 464
434 my $busy = 1; 465 my $busy = 1;
435 my @res; 466 my @res;
436 467
437 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 470 @res = eval { $job->() };
439 warn $@ if $@; 471 warn $@ if $@;
440 undef $busy; 472 undef $busy;
441 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
442 474
443 while ($busy) { 475 while ($busy) {
444 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
445 } 480 }
481 }
446 482
447 $time = Event::time - $time; 483 $time = EV::time - $time;
448 484
449 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451 487
452 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
… …
482=item fork_call { }, $args 518=item fork_call { }, $args
483 519
484Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
488 524
489=cut 525=cut
490 526
491sub fork_call(&@) { 527sub fork_call(&@) {
492 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
… …
653attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
655 691
656In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 694Deliantra).
659 695
660=over 4 696=over 4
661 697
662=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
663 699
… …
945 } 981 }
946 982
947 0 983 0
948} 984}
949 985
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 987
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 989
954Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
955 991
… …
961 997
962=cut 998=cut
963 999
964############################################################################# 1000#############################################################################
965# object support 1001# object support
966#
967 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
968sub _can_merge { 1036sub _can_merge {
969 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
970 1038
971 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1040
975 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
976} 1043}
977 1044
978sub reattach { 1045sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1047 my ($obj) = @_;
… …
1002cf::attachable->attach ( 1069cf::attachable->attach (
1003 prio => -1000000, 1070 prio => -1000000,
1004 on_instantiate => sub { 1071 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
1006 1073
1007 $data = from_json $data; 1074 $data = decode_json $data;
1008 1075
1009 for (@$data) { 1076 for (@$data) {
1010 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
1011 1078
1012 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
1025 }, 1092 },
1026); 1093);
1027 1094
1028sub object_freezer_save { 1095sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1097
1033 sync_job { 1098 sync_job {
1034 if (length $$rdata) { 1099 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1100 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
… …
1043 close $fh; 1108 close $fh;
1044 1109
1045 if (@$objs) { 1110 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1051 close $fh; 1116 close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1118 }
… …
1062 } else { 1127 } else {
1063 aio_unlink $filename; 1128 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1065 } 1130 }
1066 }; 1131 };
1067
1068 undef $guard;
1069} 1132}
1070 1133
1071sub object_freezer_as_string { 1134sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1073 1136
… …
1078 1141
1079sub object_thawer_load { 1142sub object_thawer_load {
1080 my ($filename) = @_; 1143 my ($filename) = @_;
1081 1144
1082 my ($data, $av); 1145 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1146
1086 (aio_load $filename, $data) >= 0 1147 (aio_load $filename, $data) >= 0
1087 or return; 1148 or return;
1088 1149
1089 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1152 or return;
1092 1153
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1095 } 1156 }
1096 1157
1097 utf8::decode (my $decname = $filename); 1158 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
… …
1255 my $msg = $@ ? "$v->{path}: $@\n" 1316 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1317 : "$v->{base}: extension inactive.\n";
1257 1318
1258 if (exists $v->{meta}{mandatory}) { 1319 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1320 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1321 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1322 }
1263 1323
1264 warn $msg; 1324 warn $msg;
1265 } 1325 }
1266 1326
… …
1514 1574
1515Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1516 1576
1517=cut 1577=cut
1518 1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1519sub expand_cfpod { 1590sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1521 1592
1522 # escape & and < 1593 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1594
1526 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1527 1598
1528 1 while 1599 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1534 # replace G<male|female> tags 1605 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1536 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1537 }ge 1608 | < $interior >
1538 # replace H<hint text> 1609 )
1539 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1540 { 1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1632 "")
1544 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1546 1644
1645 for ($xml) {
1547 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1549 1648
1550 # compress some whitespace 1649 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1555 1655
1556 $_ 1656 $xml
1557} 1657}
1658
1659no re 'eval';
1558 1660
1559sub hintmode { 1661sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1663 $_[0]{hintmode}
1562} 1664}
… …
2043 } 2145 }
2044 2146
2045 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2046 2148
2047 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2048 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2154 if (my $map = find $k) {
2051 $map->load if $v; 2155 $map->load if $v;
2052 } 2156 }
… …
2078 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2079 2183
2080 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2081 2185
2082 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2084 }; 2189 };
2085 2190
2086 if ($uniq) { 2191 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2274=cut 2379=cut
2275 2380
2276sub deref { 2381sub deref {
2277 my ($ref) = @_; 2382 my ($ref) = @_;
2278 2383
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2387 or return;
2286 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2287 or return; 2389 or return;
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2561
2460 $self->enter_link; 2562 $self->enter_link;
2461 2563
2462 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2463 # *tag paths override both path and x|y 2567 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2568 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2570 my $ob = $obs[rand @obs];
2467 2571
… …
2547 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2548 } 2652 }
2549 2653
2550 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2551 2655
2552 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2553 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2555 2659
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2584 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2587 2691
2588 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2589 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2590 unless (eval { 2696 unless (eval {
2591 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2592 2698
2593 1; 2699 1;
… …
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2630 2736
2631=cut 2737=cut
2632 2738
2739# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2740our %CHANNEL = (
2634 "c/identify" => { 2741 "c/identify" => {
2635 id => "identify", 2742 id => "infobox",
2636 title => "Identify", 2743 title => "Identify",
2637 reply => undef, 2744 reply => undef,
2638 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2639 }, 2746 },
2640 "c/examine" => { 2747 "c/examine" => {
2641 id => "examine", 2748 id => "infobox",
2642 title => "Examine", 2749 title => "Examine",
2643 reply => undef, 2750 reply => undef,
2644 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2645 }, 2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/uptime" => {
2778 id => "infobox",
2779 title => "Uptime",
2780 reply => undef,
2781 tooltip => "How long the server has been running since last restart",
2782 },
2783 "c/mapinfo" => {
2784 id => "infobox",
2785 title => "Map Info",
2786 reply => undef,
2787 tooltip => "Information related to the maps",
2788 },
2646); 2789);
2647 2790
2648sub cf::client::send_msg { 2791sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2793
2651 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2652 2795
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2797
2655 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2657 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2658 if (ref $channel) { 2807 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg; 2812 if $self->can_msg;
… …
2880=pod 3029=pod
2881 3030
2882The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2883 3032
2884 cf::object 3033 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3034 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2887 3036
2888 cf::object::player 3037 cf::object::player
2889 player 3038 player
2890 3039
… …
2897=cut 3046=cut
2898 3047
2899for ( 3048for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2902 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2903 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2905 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2906) { 3055) {
2907 no strict 'refs'; 3056 no strict 'refs';
… …
3012 { 3161 {
3013 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3014 3163
3015 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3017 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021 3171
3022 cf::cede_to_tick; 3172 cf::cede_to_tick;
3023 } 3173 }
3024 3174
3025 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3027 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3028 or next; 3179 or next;
3180
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3184 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3203 {
3052 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3055 3207
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3211 my $data;
3061 3212
3062 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3063 # prepend meta info 3214 # prepend meta info
3064 3215
3065 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3066 name => $name, 3217 name => $name,
3067 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3068 }); 3219 });
3069 3220
3070 $data = pack "(w/a*)*", $meta, $info->{data}; 3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type};
3071 } else { 3228 } else {
3072 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3073 } 3230 }
3074 3231
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; 3232 cf::cede_to_tick;
3079 } 3233 }
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 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3237
3100 1 3238 1
3101} 3239}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3102 3260
3103register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3105 3263
3106 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3161sub reload_config { 3319sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3321 or return;
3164 3322
3165 local $/; 3323 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3167 3325
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3327
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3329 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3182sub main { 3340sub main {
3183 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3344 (async {
3187 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3189 }; 3348 };
3190 3349
3191 reload_config; 3350 reload_config;
3192 db_init; 3351 db_init;
3193 load_extensions; 3352 load_extensions;
3194 3353
3195 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3196 Event::loop; 3356 EV::loop;
3197} 3357}
3198 3358
3199############################################################################# 3359#############################################################################
3200# initialisation and cleanup 3360# initialisation and cleanup
3201 3361
3202# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3203BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3366 $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"; 3367 cf::cleanup "SIG$signal";
3212 },
3213 ); 3368 };
3214 } 3369 }
3215} 3370}
3216 3371
3217sub write_runtime { 3372sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3263 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3265 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3424 $pl->save;
3269 } 3425 }
3270 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3271 3427
3272 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3311 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3469
3314 # if anything goes wrong in here, we should simply crash as we already saved 3470 # if anything goes wrong in here, we should simply crash as we already saved
3315 3471
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"; 3472 warn "flushing outstanding aio requests";
3322 for (;;) { 3473 for (;;) {
3323 BDB::flush; 3474 BDB::flush;
3324 IO::AIO::flush; 3475 IO::AIO::flush;
3325 Coro::cede; 3476 Coro::cede_notself;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate..."; 3478 warn "iterate...";
3328 } 3479 }
3329 3480
3330 ++$RELOAD; 3481 ++$RELOAD;
… …
3406 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3407 3558
3408 1 3559 1
3409 } or do { 3560 } or do {
3410 warn $@; 3561 warn $@;
3411 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3563 };
3414 3564
3415 warn "reloaded"; 3565 warn "reloaded";
3416}; 3566};
3417 3567
… …
3419 3569
3420sub reload_perl() { 3570sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3423 3573
3424 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3425 reentrant => 0,
3426 after => 0,
3427 data => WF_AUTOCANCEL,
3428 cb => sub {
3429 do_reload_perl; 3575 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3431 },
3432 ); 3577 };
3433} 3578}
3434 3579
3435register_command "reload" => sub { 3580register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3437 3582
3438 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3587 reload_perl;
3588 };
3441 } 3589 }
3442}; 3590};
3443 3591
3444unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3445 3593
… …
3464 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3614 $signal->wait;
3467} 3615}
3468 3616
3469$TICK_WATCHER = Event->timer ( 3617$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) { 3618 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3479 return; 3621 return;
3480 } 3622 }
3481 3623
3482 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3483 3625
3484 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3485 3627
3486 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3488 3630
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3633 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3635 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3637 };
3638 }
3496 3639
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3641 $sig->send;
3499 } 3642 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3644 $sig->send;
3502 } 3645 }
3503 3646
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; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3649
3515 _post_tick; 3650 _post_tick;
3516 }, 3651};
3517); 3652$TICK_WATCHER->priority (EV::MAXPRI);
3518 3653
3519{ 3654{
3655 # configure BDB
3656
3520 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3659 $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 3660
3546 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1); 3664 | BDB::LOG_AUTOREMOVE, 1);
… …
3564 3679
3565 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3681 };
3567 } 3682 }
3568 3683
3569 $BDB_DEADLOCK_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 3,
3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3685 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 },
3578 ); 3686 };
3579 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 ); 3689 };
3589 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 ); 3692 };
3599} 3693}
3600 3694
3601{ 3695{
3696 # configure IO::AIO
3697
3602 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614} 3701}
3615 3702
3616my $_log_backtrace; 3703my $_log_backtrace;
3617 3704
3618sub _log_backtrace { 3705sub _log_backtrace {
… …
3622 3709
3623 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace; 3712 ++$_log_backtrace;
3626 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3627 my @bt = fork_call { 3716 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3719 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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