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

Diff Legend

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