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.367 by root, Wed Sep 12 11:10:11 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];
2467 2562
2468 # see if we actually can go there 2563 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 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#
2471 2570
2472 ($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);
2473 } 2574 }
2474 } 2575 }
2475 2576
2476 my $map = eval { 2577 my $map = eval {
2477 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2478 2579
2479 if ($map) { 2580 if ($map) {
2480 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2482 } else { 2583 } else {
2483 $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);
2484 } 2585 }
2485 2586
2486 $map 2587 $map
2487 }; 2588 };
2488 2589
… …
2541 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2542 } 2643 }
2543 2644
2544 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2545 2646
2546 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2547 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2549 2650
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
… …
2578 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2581 2682
2582 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2583 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2584 unless (eval { 2687 unless (eval {
2585 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2586 2689
2587 1; 2690 1;
… …
2622the 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
2623the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2624 2727
2625=cut 2728=cut
2626 2729
2730# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2731our %CHANNEL = (
2628 "c/identify" => { 2732 "c/identify" => {
2629 id => "identify", 2733 id => "infobox",
2630 title => "Identify", 2734 title => "Identify",
2631 reply => undef, 2735 reply => undef,
2632 tooltip => "Items recently identified", 2736 tooltip => "Items recently identified",
2633 }, 2737 },
2634 "c/examine" => { 2738 "c/examine" => {
2635 id => "examine", 2739 id => "infobox",
2636 title => "Examine", 2740 title => "Examine",
2637 reply => undef, 2741 reply => undef,
2638 tooltip => "Signs and other items you examined", 2742 tooltip => "Signs and other items you examined",
2639 }, 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 },
2640); 2780);
2641 2781
2642sub cf::client::send_msg { 2782sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2784
2645 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2646 2786
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2788
2649 # check predefined channels, for the benefit of C 2789 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2651 2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2652 if (ref $channel) { 2798 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2802 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2803 if $self->can_msg;
… …
2874=pod 3020=pod
2875 3021
2876The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2877 3023
2878 cf::object 3024 cf::object
2879 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
2880 insert remove name archname title slaying race decrease_ob_nr 3026 insert remove name archname title slaying race decrease_ob_nr
2881 3027
2882 cf::object::player 3028 cf::object::player
2883 player 3029 player
2884 3030
… …
2891=cut 3037=cut
2892 3038
2893for ( 3039for (
2894 ["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
2895 insert remove inv name archname title slaying race 3041 insert remove inv name archname title slaying race
2896 decrease_ob_nr)], 3042 decrease_ob_nr destroy)],
2897 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2899 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2900) { 3046) {
2901 no strict 'refs'; 3047 no strict 'refs';
… …
3006 { 3152 {
3007 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
3008 3154
3009 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
3011 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
3013 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};
3014 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};
3015 3162
3016 cf::cede_to_tick; 3163 cf::cede_to_tick;
3017 } 3164 }
3018 3165
3019 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
3021 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
3022 or next; 3170 or next;
3171
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3175 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3045 { 3194 {
3046 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
3049 3198
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data; 3202 my $data;
3055 3203
3056 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
3057 # prepend meta info 3205 # prepend meta info
3058 3206
3059 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
3060 name => $name, 3208 name => $name,
3061 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
3062 }); 3210 });
3063 3211
3064 $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};
3065 } else { 3219 } else {
3066 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
3067 } 3221 }
3068 3222
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3223 cf::cede_to_tick;
3073 } 3224 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3228
3094 1 3229 1
3095} 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});
3096 3251
3097register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
3099 3254
3100 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
… …
3155sub reload_config { 3310sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3312 or return;
3158 3313
3159 local $/; 3314 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3161 3316
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3318
3164 $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};
3165 $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};
… …
3176sub main { 3331sub main {
3177 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3179 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#
3180 (async { 3335 (async {
3181 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3183 }; 3339 };
3184 3340
3185 reload_config; 3341 reload_config;
3186 db_init; 3342 db_init;
3187 load_extensions; 3343 load_extensions;
3188 3344
3189 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3190 Event::loop; 3347 EV::loop;
3191} 3348}
3192 3349
3193############################################################################# 3350#############################################################################
3194# initialisation and cleanup 3351# initialisation and cleanup
3195 3352
3196# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3197BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3206 },
3207 ); 3359 };
3208 } 3360 }
3209} 3361}
3210 3362
3211sub write_runtime { 3363sub write_runtime {
3212 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
… …
3257 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3259 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3415 $pl->save;
3263 } 3416 }
3264 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3265 3418
3266 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
… …
3305 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3460
3308 # 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
3309 3462
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3316 for (;;) { 3464 for (;;) {
3317 BDB::flush; 3465 BDB::flush;
3318 IO::AIO::flush; 3466 IO::AIO::flush;
3319 Coro::cede; 3467 Coro::cede_notself;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3321 warn "iterate..."; 3469 warn "iterate...";
3322 } 3470 }
3323 3471
3324 ++$RELOAD; 3472 ++$RELOAD;
… …
3413 3561
3414sub reload_perl() { 3562sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3417 3565
3418 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3419 reentrant => 0,
3420 after => 0,
3421 data => WF_AUTOCANCEL,
3422 cb => sub {
3423 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3425 }, 3568 do_reload_perl;
3426 ); 3569 };
3427} 3570}
3428 3571
3429register_command "reload" => sub { 3572register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3431 3574
3432 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3579 reload_perl;
3580 };
3435 } 3581 }
3436}; 3582};
3437 3583
3438unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3439 3585
… …
3458 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3606 $signal->wait;
3461} 3607}
3462 3608
3463our $stat_fh; 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3474 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"
3475 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3476 return; 3613 return;
3477 } 3614 }
3478 3615
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3482 3617
3483 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3484 3619
3485 $RUNTIME += $TICK; 3620 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK; 3621 $NEXT_TICK = $_[0]->at;
3487 3622
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3625 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3627 write_runtime
3492 or warn "ERROR: unable to write runtime file: $!"; 3628 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3629 };
3630 }
3495 3631
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3633 $sig->send;
3501 } 3634 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3636 $sig->send;
3504 } 3637 }
3505 3638
3506 $NOW = Event::time;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3641
3517 _post_tick; 3642 _post_tick;
3518 3643};
3519 # gather some statistics#d# 3644$TICK_WATCHER->priority (EV::MAXPRI);
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3522 },
3523);
3524 3645
3525{ 3646{
3647 # configure BDB
3648
3526 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3527 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3651 $Coro::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 3652
3552 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3553 $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);
3554 3659
3555 cf::sync_job { 3660 cf::sync_job {
3556 eval { 3661 eval {
3557 BDB::db_env_open 3662 BDB::db_env_open
3558 $DB_ENV, 3663 $DB_ENV,
… …
3560 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
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3667 0666;
3563 3668
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3670 };
3570 3671
3571 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3673 };
3573 } 3674 }
3574 3675
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 3678 };
3578 hard => 1, 3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 3681 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 3684 };
3595} 3685}
3596 3686
3597{ 3687{
3688 # configure IO::AIO
3689
3598 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 3693}
3611 3694
3612my $_log_backtrace; 3695my $_log_backtrace;
3613 3696
3614sub _log_backtrace { 3697sub _log_backtrace {
… …
3618 3701
3619 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3704 ++$_log_backtrace;
3622 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3623 my @bt = fork_call { 3708 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 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 |"
3627 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

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