ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.371 by root, Thu Sep 13 16:16:01 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
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1413 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1414
1355 my $f = new_from_file cf::object::thawer path $login 1415 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1416 or return;
1357 1417
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1418 my $pl = cf::player::load_pl $f
1360 or return; 1419 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1420 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1421 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1422 $cf::PLAYER{$login} = $pl
… …
1515 1574
1516Expand crossfire pod fragments into protocol xml. 1575Expand crossfire pod fragments into protocol xml.
1517 1576
1518=cut 1577=cut
1519 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
1520sub expand_cfpod { 1590sub expand_cfpod {
1521 ((my $self), (local $_)) = @_; 1591 my ($self, $pod) = @_;
1522 1592
1523 # escape & and < 1593 my $xml;
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526 1594
1527 # this is buggy, it needs to properly take care of nested <'s 1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1528 1598
1529 1 while 1599 $group =~ s/&/&amp;/g;
1530 # replace B<>, I<>, U<> etc. 1600 $group =~ s/</&lt;/g;
1531 s/B<([^\>]*)>/<b>$1<\/b>/ 1601
1532 || s/I<([^\>]*)>/<i>$1<\/i>/ 1602 $xml .= $group;
1533 || s/U<([^\>]*)>/<u>$1<\/u>/ 1603 } elsif ($pod =~ m%\G
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1604 ([BCGHITU])
1535 # replace G<male|female> tags 1605 <
1536 || s{G<([^>|]*)\|([^>]*)>}{ 1606 (?:
1537 $self->gender ? $2 : $1 1607 ([^<>]*) (?{ $group = $^N })
1538 }ge 1608 | < $interior >
1539 # replace H<hint text> 1609 )
1540 || s{H<([^\>]*)>} 1610 >
1611 %gcsx
1541 { 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") {
1542 ("<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>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "") 1632 "")
1545 [$self->{hintmode}] 1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1546 }ge; 1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1547 1644
1645 for ($xml) {
1548 # create single paragraphs (very hackish) 1646 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g; 1647 s/(?<=\S)\n(?=\w)/ /g;
1550 1648
1551 # compress some whitespace 1649 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends 1650 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines 1651 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines 1652 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines 1653 s/\n+$//; # ending lines
1654 }
1556 1655
1557 $_ 1656 $xml
1558} 1657}
1658
1659no re 'eval';
1559 1660
1560sub hintmode { 1661sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1; 1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode} 1663 $_[0]{hintmode}
1563} 1664}
… …
2044 } 2145 }
2045 2146
2046 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2047 2148
2048 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2049 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2154 if (my $map = find $k) {
2052 $map->load if $v; 2155 $map->load if $v;
2053 } 2156 }
… …
2079 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2080 2183
2081 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2082 2185
2083 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2085 }; 2189 };
2086 2190
2087 if ($uniq) { 2191 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2275=cut 2379=cut
2276 2380
2277sub deref { 2381sub deref {
2278 my ($ref) = @_; 2382 my ($ref) = @_;
2279 2383
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2384 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2385 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2386 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2387 or return;
2287 $pl->ob->uuid eq $uuid 2388 $pl->ob->uuid eq $uuid
2288 or return; 2389 or return;
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2561
2461 $self->enter_link; 2562 $self->enter_link;
2462 2563
2463 (async { 2564 (async {
2565 $Coro::current->{desc} = "player::goto $path $x $y";
2566
2464 # *tag paths override both path and x|y 2567 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2568 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2569 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2570 my $ob = $obs[rand @obs];
2468 2571
… …
2548 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2549 } 2652 }
2550 2653
2551 $rmp->{random_seed} ||= $exit->random_seed; 2654 $rmp->{random_seed} ||= $exit->random_seed;
2552 2655
2553 my $data = cf::to_json $rmp; 2656 my $data = cf::encode_json $rmp;
2554 my $md5 = Digest::MD5::md5_hex $data; 2657 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2658 my $meta = "$RANDOMDIR/$md5.meta";
2556 2659
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2661 aio_write $fh, 0, (length $data), $data, 0;
… …
2585 # if exit is damned, update players death & WoR home-position 2688 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2689 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2690 if $exit->flag (FLAG_DAMNED);
2588 2691
2589 (async { 2692 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2694
2590 $self->deactivate_recursive; # just to be sure 2695 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2696 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2697 $self->goto ($slaying, $hp, $sp);
2593 2698
2594 1; 2699 1;
… …
2629the 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
2630the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2631 2736
2632=cut 2737=cut
2633 2738
2739# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2740our %CHANNEL = (
2635 "c/identify" => { 2741 "c/identify" => {
2636 id => "identify", 2742 id => "infobox",
2637 title => "Identify", 2743 title => "Identify",
2638 reply => undef, 2744 reply => undef,
2639 tooltip => "Items recently identified", 2745 tooltip => "Items recently identified",
2640 }, 2746 },
2641 "c/examine" => { 2747 "c/examine" => {
2642 id => "examine", 2748 id => "infobox",
2643 title => "Examine", 2749 title => "Examine",
2644 reply => undef, 2750 reply => undef,
2645 tooltip => "Signs and other items you examined", 2751 tooltip => "Signs and other items you examined",
2646 }, 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 },
2647); 2789);
2648 2790
2649sub cf::client::send_msg { 2791sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2792 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2793
2652 $msg = $self->pl->expand_cfpod ($msg); 2794 $msg = $self->pl->expand_cfpod ($msg);
2653 2795
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2796 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2797
2656 # check predefined channels, for the benefit of C 2798 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2799 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel};
2658 2801
2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id};
2806
2659 if (ref $channel) { 2807 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2808 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2809 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2810 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2811 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg; 2812 if $self->can_msg;
… …
2881=pod 3029=pod
2882 3030
2883The following functions and methods are available within a safe environment: 3031The following functions and methods are available within a safe environment:
2884 3032
2885 cf::object 3033 cf::object
2886 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
2887 insert remove name archname title slaying race decrease_ob_nr 3035 insert remove name archname title slaying race decrease_ob_nr
2888 3036
2889 cf::object::player 3037 cf::object::player
2890 player 3038 player
2891 3039
… …
2898=cut 3046=cut
2899 3047
2900for ( 3048for (
2901 ["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
2902 insert remove inv name archname title slaying race 3050 insert remove inv name archname title slaying race
2903 decrease_ob_nr)], 3051 decrease_ob_nr destroy)],
2904 ["cf::object::player" => qw(player)], 3052 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3053 ["cf::player" => qw(peaceful)],
2906 ["cf::map" => qw(trigger)], 3054 ["cf::map" => qw(trigger)],
2907) { 3055) {
2908 no strict 'refs'; 3056 no strict 'refs';
… …
3013 { 3161 {
3014 my $faces = $facedata->{faceinfo}; 3162 my $faces = $facedata->{faceinfo};
3015 3163
3016 while (my ($face, $info) = each %$faces) { 3164 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3165 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166
3018 cf::face::set_visibility $idx, $info->{visibility}; 3167 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3168 cf::face::set_magicmap $idx, $info->{magicmap};
3020 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};
3021 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};
3022 3171
3023 cf::cede_to_tick; 3172 cf::cede_to_tick;
3024 } 3173 }
3025 3174
3026 while (my ($face, $info) = each %$faces) { 3175 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3176 next unless $info->{smooth};
3177
3028 my $idx = cf::face::find $face 3178 my $idx = cf::face::find $face
3029 or next; 3179 or next;
3180
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3181 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3182 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3184 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3185 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3052 { 3203 {
3053 # TODO: for gcfclient pleasure, we should give resources 3204 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3205 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3206 my $res = $facedata->{resource};
3056 3207
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3208 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3210 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3211 my $data;
3062 3212
3063 if ($info->{type} & 1) { 3213 if ($info->{type} & 1) {
3064 # prepend meta info 3214 # prepend meta info
3065 3215
3066 my $meta = $enc->encode ({ 3216 my $meta = $enc->encode ({
3067 name => $name, 3217 name => $name,
3068 %{ $info->{meta} || {} }, 3218 %{ $info->{meta} || {} },
3069 }); 3219 });
3070 3220
3071 $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};
3072 } else { 3228 } else {
3073 $data = $info->{data}; 3229 $RESOURCE{$name} = $info;
3074 } 3230 }
3075 3231
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3232 cf::cede_to_tick;
3080 } 3233 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3234 }
3235
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3237
3101 1 3238 1
3102} 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});
3103 3260
3104register_exticmd fx_want => sub { 3261register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3262 my ($ns, $want) = @_;
3106 3263
3107 while (my ($k, $v) = each %$want) { 3264 while (my ($k, $v) = each %$want) {
… …
3162sub reload_config { 3319sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3320 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3321 or return;
3165 3322
3166 local $/; 3323 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3324 *CFG = YAML::Load <$fh>;
3168 3325
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3327
3171 $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};
3172 $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};
… …
3183sub main { 3340sub main {
3184 # we must not ever block the main coroutine 3341 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3342 local $Coro::idle = sub {
3186 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#
3187 (async { 3344 (async {
3188 Event::one_event; 3345 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3347 })->prio (Coro::PRIO_MAX);
3190 }; 3348 };
3191 3349
3192 reload_config; 3350 reload_config;
3193 db_init; 3351 db_init;
3194 load_extensions; 3352 load_extensions;
3195 3353
3196 $TICK_WATCHER->start; 3354 $TICK_WATCHER->start;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3197 Event::loop; 3356 EV::loop;
3198} 3357}
3199 3358
3200############################################################################# 3359#############################################################################
3201# initialisation and cleanup 3360# initialisation and cleanup
3202 3361
3203# install some emergency cleanup handlers 3362# install some emergency cleanup handlers
3204BEGIN { 3363BEGIN {
3364 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3365 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3366 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3367 cf::cleanup "SIG$signal";
3213 },
3214 ); 3368 };
3215 } 3369 }
3216} 3370}
3217 3371
3218sub write_runtime { 3372sub write_runtime {
3219 my $runtime = "$LOCALDIR/runtime"; 3373 my $runtime = "$LOCALDIR/runtime";
… …
3264 # and maps saved/destroyed asynchronously. 3418 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3419 warn "begin emergency player save\n";
3266 for my $login (keys %cf::PLAYER) { 3420 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3421 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3422 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3424 $pl->save;
3270 } 3425 }
3271 warn "end emergency player save\n"; 3426 warn "end emergency player save\n";
3272 3427
3273 warn "begin emergency map save\n"; 3428 warn "begin emergency map save\n";
… …
3312 warn "syncing database to disk"; 3467 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3468 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3469
3315 # 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
3316 3471
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3472 warn "flushing outstanding aio requests";
3323 for (;;) { 3473 for (;;) {
3324 BDB::flush; 3474 BDB::flush;
3325 IO::AIO::flush; 3475 IO::AIO::flush;
3326 Coro::cede; 3476 Coro::cede_notself;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3477 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate..."; 3478 warn "iterate...";
3329 } 3479 }
3330 3480
3331 ++$RELOAD; 3481 ++$RELOAD;
… …
3407 warn "leaving sync_job"; 3557 warn "leaving sync_job";
3408 3558
3409 1 3559 1
3410 } or do { 3560 } or do {
3411 warn $@; 3561 warn $@;
3412 warn "error while reloading, exiting."; 3562 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3563 };
3415 3564
3416 warn "reloaded"; 3565 warn "reloaded";
3417}; 3566};
3418 3567
… …
3420 3569
3421sub reload_perl() { 3570sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3571 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3572 # coro crashes during coro_state_free->destroy here.
3424 3573
3425 $RELOAD_WATCHER ||= Event->timer ( 3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3426 reentrant => 0,
3427 after => 0,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 do_reload_perl; 3575 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3576 undef $RELOAD_WATCHER;
3432 },
3433 ); 3577 };
3434} 3578}
3435 3579
3436register_command "reload" => sub { 3580register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3581 my ($who, $arg) = @_;
3438 3582
3439 if ($who->flag (FLAG_WIZ)) { 3583 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3584 $who->message ("reloading server.");
3585 async {
3586 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3587 reload_perl;
3588 };
3442 } 3589 }
3443}; 3590};
3444 3591
3445unshift @INC, $LIBDIR; 3592unshift @INC, $LIBDIR;
3446 3593
… …
3465 my $signal = new Coro::Signal; 3612 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3613 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3614 $signal->wait;
3468} 3615}
3469 3616
3470$TICK_WATCHER = Event->timer ( 3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3618 if ($Coro::current != $Coro::main) {
3478 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"
3479 unless ++$bug_warning > 10; 3620 unless ++$bug_warning > 10;
3480 return; 3621 return;
3481 } 3622 }
3482 3623
3483 $NOW = $tick_start = Event::time; 3624 $NOW = $tick_start = EV::now;
3484 3625
3485 cf::server_tick; # one server iteration 3626 cf::server_tick; # one server iteration
3486 3627
3487 $RUNTIME += $TICK; 3628 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK; 3629 $NEXT_TICK = $_[0]->at;
3489 3630
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3631 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3633 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3635 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3636 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3637 };
3638 }
3497 3639
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3641 $sig->send;
3500 } 3642 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3643 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3644 $sig->send;
3503 } 3645 }
3504 3646
3505 $NOW = Event::time;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK; 3647 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3649
3516 _post_tick; 3650 _post_tick;
3517 }, 3651};
3518); 3652$TICK_WATCHER->priority (EV::MAXPRI);
3519 3653
3520{ 3654{
3655 # configure BDB
3656
3521 BDB::min_parallel 8; 3657 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3658 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3659 $Coro::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3660
3547 unless ($DB_ENV) { 3661 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3662 $DB_ENV = BDB::db_env_create;
3549 $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
3550 | BDB::LOG_AUTOREMOVE, 1); 3664 | BDB::LOG_AUTOREMOVE, 1);
… …
3565 3679
3566 cf::cleanup "db_env_open(db): $@" if $@; 3680 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3681 };
3568 } 3682 }
3569 3683
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3684 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 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 { };
3578 },
3579 ); 3686 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3687 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3688 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3689 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3690 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3691 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3692 };
3600} 3693}
3601 3694
3602{ 3695{
3696 # configure IO::AIO
3697
3603 IO::AIO::min_parallel 8; 3698 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3699 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3700 $Coro::AIO::WATCHER->priority (1);
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3701}
3616 3702
3617my $_log_backtrace; 3703my $_log_backtrace;
3618 3704
3619sub _log_backtrace { 3705sub _log_backtrace {
… …
3623 3709
3624 # limit the # of concurrent backtraces 3710 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3711 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3712 ++$_log_backtrace;
3627 async { 3713 async {
3714 $Coro::current->{desc} = "abt $msg";
3715
3628 my @bt = fork_call { 3716 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3717 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3718 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 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 |"
3632 or die "addr2line: $!"; 3720 or die "addr2line: $!";

Diff Legend

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