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

Diff Legend

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