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.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
… …
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
84our $BDB_POLL_WATCHER; 104our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 105our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 106our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 107our $DB_ENV;
88 108
89our %CFG; 109our %CFG;
90 110
91our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 112our $RUNTIME;
113our $NOW;
93 114
94our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
97 118
98# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 121
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
104 126
105binmode STDOUT; 127binmode STDOUT;
106binmode STDERR; 128binmode STDERR;
107 129
108# read virtual server time, if available 130# read virtual server time, if available
… …
161 183
162The raw value load value from the last tick. 184The raw value load value from the last tick.
163 185
164=item %cf::CFG 186=item %cf::CFG
165 187
166Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 189from wherever your confdir points to.
168 190
169=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
170 192
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These 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; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 215
194 LOG llevError, $msg; 216 LOG llevError, $msg;
195 }; 217 };
196} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
197 234
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
208for my $pkg (qw( 245for my $pkg (qw(
209 cf::global cf::attachable 246 cf::global cf::attachable
210 cf::object cf::object::player 247 cf::object cf::object::player
211 cf::client cf::player 248 cf::client cf::player
212 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
213 cf::map cf::party cf::region 251 cf::party cf::region
214)) { 252)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 254}
218 255
219$Event::DIED = sub { 256$EV::DIED = sub {
220 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
221}; 258};
222 259
223############################################################################# 260#############################################################################
224 261
… …
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 285 $d
249 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
250} 287}
251 288
252=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
253 290
254Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
255 292
256=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
257 294
258Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
259 296
260=cut 297=cut
261 298
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 300
264sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
266 303
267=item cf::lock_wait $string 304=item cf::lock_wait $string
268 305
269Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
270 307
… …
326 363
327 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
328} 365}
329 366
330sub freeze_mainloop { 367sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
332 369
333 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 371}
335 }; 372
336 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
337 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
338} 386}
339 387
340=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
341 389
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
353our @SLOT_QUEUE; 401our @SLOT_QUEUE;
354our $SLOT_QUEUE; 402our $SLOT_QUEUE;
355 403
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
358 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
359 409
360 while () { 410 while () {
361 next_job: 411 next_job:
362 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
… …
370 } 420 }
371 } 421 }
372 } 422 }
373 423
374 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 427 $signal->wait;
378 } else { 428 } else {
379 Coro::schedule; 429 Coro::schedule;
380 } 430 }
381 } 431 }
382}; 432};
383 433
384sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
385 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
386 438
387 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
389 441
… …
403 455
404BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
405 457
406=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
407 459
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 463acceptable.
412 464
413If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
… …
419 471
420sub sync_job(&) { 472sub sync_job(&) {
421 my ($job) = @_; 473 my ($job) = @_;
422 474
423 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 476 my $time = EV::time;
425 477
426 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
428 480
429 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 482
431 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
432 484
433 my $busy = 1; 485 my $busy = 1;
434 my @res; 486 my @res;
435 487
436 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 490 @res = eval { $job->() };
438 warn $@ if $@; 491 warn $@ if $@;
439 undef $busy; 492 undef $busy;
440 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
441 494
442 while ($busy) { 495 while ($busy) {
443 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
444 } 500 }
501 }
445 502
446 $time = Event::time - $time; 503 my $time = EV::time - $time;
447 504
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
452 506
453 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
454 } else { 508 } else {
455 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
456 510
… …
481=item fork_call { }, $args 535=item fork_call { }, $args
482 536
483Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
487 541
488=cut 542=cut
489 543
490sub fork_call(&@) { 544sub fork_call(&@) {
491 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
… …
498 reset_signals; 552 reset_signals;
499 &$cb 553 &$cb
500 }, @args; 554 }, @args;
501 555
502 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
503} 584}
504 585
505=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
506 587
507Returns a single value from the environment database. 588Returns a single value from the environment database.
… …
652attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
654 735
655In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 738Deliantra).
658 739
659=over 4 740=over 4
660 741
661=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
662 743
… …
944 } 1025 }
945 1026
946 0 1027 0
947} 1028}
948 1029
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1031
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1033
953Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
954 1035
… …
960 1041
961=cut 1042=cut
962 1043
963############################################################################# 1044#############################################################################
964# object support 1045# object support
965#
966 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
967sub _can_merge { 1080sub _can_merge {
968 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
969 1082
970 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1084
974 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
975} 1087}
976 1088
977sub reattach { 1089sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1091 my ($obj) = @_;
980 1092
1093 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1095
983 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
984 1097
985 @$registry = (); 1098 @$registry = ();
986 1099
… …
1001cf::attachable->attach ( 1114cf::attachable->attach (
1002 prio => -1000000, 1115 prio => -1000000,
1003 on_instantiate => sub { 1116 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1005 1118
1006 $data = from_json $data; 1119 $data = decode_json $data;
1007 1120
1008 for (@$data) { 1121 for (@$data) {
1009 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1010 1123
1011 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1137 },
1025); 1138);
1026 1139
1027sub object_freezer_save { 1140sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1142
1032 sync_job { 1143 sync_job {
1033 if (length $$rdata) { 1144 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1037 1148
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1153 aio_close $fh;
1043 1154
1044 if (@$objs) { 1155 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1161 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1163 }
1053 } else { 1164 } else {
1054 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1055 } 1166 }
… …
1061 } else { 1172 } else {
1062 aio_unlink $filename; 1173 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1064 } 1175 }
1065 }; 1176 };
1066
1067 undef $guard;
1068} 1177}
1069 1178
1070sub object_freezer_as_string { 1179sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1072 1181
… …
1077 1186
1078sub object_thawer_load { 1187sub object_thawer_load {
1079 my ($filename) = @_; 1188 my ($filename) = @_;
1080 1189
1081 my ($data, $av); 1190 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1191
1085 (aio_load $filename, $data) >= 0 1192 (aio_load $filename, $data) >= 0
1086 or return; 1193 or return;
1087 1194
1088 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1197 or return;
1091 1198
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1094 } 1201 }
1095 1202
1096 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
… …
1228 1335
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1338
1232 $ext{source} = 1339 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1235 . $source 1342 . $source
1236 . "\n};\n1"; 1343 . "\n};\n1";
1237 1344
1238 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1256 1363
1257 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1365 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1367 }
1262 1368
1263 warn $msg; 1369 warn $msg;
1264 } 1370 }
1265 1371
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1459
1354 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1461 or return;
1356 1462
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1359 or return; 1464 or return;
1465
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1363 } 1469 }
1364 } 1470 }
… …
1374 1480
1375 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1376 1482
1377 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1379 1487
1380 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1489 cf::cede_to_tick;
1382} 1490}
1383 1491
… …
1419 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1421 1529
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1426 1536
1427 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1577
1468 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1469 my $path = path $login; 1579 my $path = path $login;
1470 1580
1471 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1587 }
1477 1588
… …
1514 1625
1515Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1516 1627
1517=cut 1628=cut
1518 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1519sub expand_cfpod { 1641sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1521 1643
1522 # escape & and < 1644 my $xml;
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1645
1526 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1527 1649
1528 1 while 1650 $group =~ s/&/&amp;/g;
1529 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1655 ([BCGHITU])
1534 # replace G<male|female> tags 1656 <
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1657 (?:
1536 $self->gender ? $2 : $1 1658 ([^<>]*) (?{ $group = $^N })
1537 }ge 1659 | < $interior >
1538 # replace H<hint text> 1660 )
1539 || s{H<([^\>]*)>} 1661 >
1662 %gcsx
1540 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1683 "")
1544 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1545 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1546 1695
1696 for ($xml) {
1547 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1549 1699
1550 # compress some whitespace 1700 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1555 1706
1556 $_ 1707 $xml
1557} 1708}
1709
1710no re 'eval';
1558 1711
1559sub hintmode { 1712sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1714 $_[0]{hintmode}
1562} 1715}
… …
1634our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1636 1789
1637sub generate_random_map { 1790sub generate_random_map {
1638 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1639 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1796 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1921
1766# the temporary/swap location 1922# the temporary/swap location
1767sub save_path { 1923sub save_path {
1768 my ($self) = @_; 1924 my ($self) = @_;
1769 1925
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1772} 1928}
1773 1929
1774# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1775sub uniq_path { 1931sub uniq_path {
1776 my ($self) = @_; 1932 my ($self) = @_;
1777 1933
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1780} 1936}
1781 1937
1782# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1783# all maps in C++... 1939# all maps in C++...
… …
1881 2037
1882 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1884 2040
1885 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1888 2044
1889 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1890 or return; 2046 or return;
1891 2047
1892 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
… …
1895 or return; 2051 or return;
1896 2052
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1900 undef $guard1; 2057 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2058 $map->reset;
1903 return find $path; 2059 return find $path;
1904 } 2060 }
1905 2061
1906 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2090 $f->skip_block;
1935 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
1936 or return; 2092 or return;
1937 2093
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1939 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1940 2096
1941 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2098 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
… …
1969 } 2125 }
1970 2126
1971 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
1973 2129
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2131 }
1976 2132
1977 $self->post_load; 2133 $self->post_load;
1978} 2134}
1979 2135
… …
2037 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2038 2194
2039 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2040 2196
2041 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2199 }
2044 2200
2045 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2046 2202
2047 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
2048 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2208 if (my $map = find $k) {
2051 $map->load if $v; 2209 $map->load if $v;
2052 } 2210 }
… …
2078 return if $self->{deny_save}; 2236 return if $self->{deny_save};
2079 2237
2080 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
2081 2239
2082 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2084 }; 2243 };
2244
2245 cf::get_slot 0.02;
2085 2246
2086 if ($uniq) { 2247 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2250 } else {
… …
2098 $self->save; 2259 $self->save;
2099 2260
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2262
2102 return if $self->players; 2263 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2105 2266
2106 $self->in_memory (cf::MAP_SWAPPED); 2267 $self->in_memory (cf::MAP_SWAPPED);
2107 2268
2108 $self->deactivate; 2269 $self->deactivate;
… …
2226 2387
2227sub unique_maps() { 2388sub unique_maps() {
2228 [ 2389 [
2229 map { 2390 map {
2230 utf8::decode $_; 2391 utf8::decode $_;
2231 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2232 ? normalise $_ 2395 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2397 ]
2236} 2398}
2237 2399
2238package cf;
2239
2240=back 2400=back
2241 2401
2242=head3 cf::object 2402=head3 cf::object
2243 2403
2244=cut 2404=cut
… …
2247 2407
2248=over 4 2408=over 4
2249 2409
2250=item $ob->inv_recursive 2410=item $ob->inv_recursive
2251 2411
2252Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2253 2414
2254=cut 2415=cut
2255 2416
2256sub inv_recursive_; 2417sub inv_recursive_;
2257sub inv_recursive_ { 2418sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2263} 2424}
2264 2425
2265=item $ref = $ob->ref 2426=item $ref = $ob->ref
2266 2427
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2268 2429
2269=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2270 2431
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2433even if the object actually exists. May block.
… …
2274=cut 2435=cut
2275 2436
2276sub deref { 2437sub deref {
2277 my ($ref) = @_; 2438 my ($ref) = @_;
2278 2439
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2441 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2443 or return;
2286 $pl->ob->uuid eq $uuid 2444 $pl->ob->uuid eq $uuid
2287 or return; 2445 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2466dialogue with the given NPC character.
2309 2467
2310=cut 2468=cut
2311 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2312# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2485# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2501
2330 } else { 2502 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2505 }
2334 } 2506 }
2335} 2507}
2336 2508
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2445her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2620be called at the end of this process.
2449 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2450=cut 2625=cut
2451 2626
2452our $GOTOGEN; 2627our $GOTOGEN;
2453 2628
2454sub cf::object::player::goto { 2629sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2634
2460 $self->enter_link; 2635 $self->enter_link;
2461 2636
2462 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2463 # *tag paths override both path and x|y 2640 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2641 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2643 my $ob = $obs[rand @obs];
2467 2644
2468 # see if we actually can go there 2645 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2471 2652
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2473 } 2656 }
2474 } 2657 }
2475 2658
2476 my $map = eval { 2659 my $map = eval {
2477 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2478 2661
2479 if ($map) { 2662 if ($map) {
2480 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2482 } else { 2665 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2667 }
2485 2668
2486 $map 2669 $map
2487 }; 2670 };
2488 2671
… …
2524} 2707}
2525 2708
2526sub prepare_random_map { 2709sub prepare_random_map {
2527 my ($exit) = @_; 2710 my ($exit) = @_;
2528 2711
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2714 # that depends on the exit object
2534 2715
2535 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
… …
2537 if ($exit->map) { 2718 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2542 } 2725 }
2543 2726
2544 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2545 2728
2546 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2549 2732
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2735 undef $fh;
2553 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2554 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2557 } 2744 }
2558} 2745}
2559 2746
2560sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2562 2749
2563 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2564 2751
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2752 $self->enter_link;
2577 2753
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2754 (async {
2583 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2584 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2585 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2586 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2587 1; 2778 1
2588 }) { 2779 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2590 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2624 2815
2625=cut 2816=cut
2626 2817
2818# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2819our %CHANNEL = (
2628 "c/identify" => { 2820 "c/identify" => {
2629 id => "identify", 2821 id => "infobox",
2630 title => "Identify", 2822 title => "Identify",
2631 reply => undef, 2823 reply => undef,
2632 tooltip => "Items recently identified", 2824 tooltip => "Items recently identified",
2633 }, 2825 },
2634 "c/examine" => { 2826 "c/examine" => {
2635 id => "examine", 2827 id => "infobox",
2636 title => "Examine", 2828 title => "Examine",
2637 reply => undef, 2829 reply => undef,
2638 tooltip => "Signs and other items you examined", 2830 tooltip => "Signs and other items you examined",
2639 }, 2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2640); 2874);
2641 2875
2642sub cf::client::send_msg { 2876sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2878
2645 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2646 2880
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2882
2649 # check predefined channels, for the benefit of C 2883 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2651 2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2652 if (ref $channel) { 2892 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2896 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2897 if $self->can_msg;
… …
2874=pod 3114=pod
2875 3115
2876The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2877 3117
2878 cf::object 3118 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
2881 3121
2882 cf::object::player 3122 cf::object::player
2883 player 3123 player
2884 3124
2885 cf::player 3125 cf::player
… …
2890 3130
2891=cut 3131=cut
2892 3132
2893for ( 3133for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3136 decrease split destroy change_exp)],
2897 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2899 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2900) { 3140) {
2901 no strict 'refs'; 3141 no strict 'refs';
… …
3006 { 3246 {
3007 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
3008 3248
3009 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3011 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 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}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3015 3256
3016 cf::cede_to_tick; 3257 cf::cede_to_tick;
3017 } 3258 }
3018 3259
3019 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
3021 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
3022 or next; 3264 or next;
3265
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3269 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3045 { 3288 {
3046 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3049 3292
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data; 3296 my $data;
3055 3297
3056 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3057 # prepend meta info 3299 # prepend meta info
3058 3300
3059 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3060 name => $name, 3302 name => $name,
3061 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3062 }); 3304 });
3063 3305
3064 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3065 } else { 3313 } else {
3066 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3067 } 3315 }
3068 3316
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; 3317 cf::cede_to_tick;
3073 } 3318 }
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 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3322
3094 1 3323 1
3095} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3096 3345
3097register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3099 3348
3100 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3102 } 3351 }
3103}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3104 3363
3105sub reload_regions { 3364sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3366 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3122} 3381}
3123 3382
3124sub reload_archetypes { 3383sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3386}
3133 3387
3134sub reload_treasures { 3388sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3137} 3391}
3138 3392
3139sub reload_resources { 3393sub reload_resources {
3140 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3141 3395
3396 reload_facedata;
3397 reload_archetypes;
3142 reload_regions; 3398 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3399 reload_treasures;
3147 3400
3148 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3149} 3402}
3150 3403
3151sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3152 reload_resources; 3409 reload_resources;
3153} 3410}
3154 3411
3155sub reload_config { 3412sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3414 or return;
3158 3415
3159 local $/; 3416 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3161 3418
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3420
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $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}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3176sub main { 3433sub main {
3177 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3437 (async {
3181 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3183 }; 3441 };
3184 3442
3443 {
3444 my $guard = freeze_mainloop;
3185 reload_config; 3445 reload_config;
3186 db_init; 3446 db_init;
3187 load_extensions; 3447 load_extensions;
3188 3448
3189 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3190 Event::loop; 3452 EV::loop;
3191} 3453}
3192 3454
3193############################################################################# 3455#############################################################################
3194# initialisation and cleanup 3456# initialisation and cleanup
3195 3457
3196# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3197BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3462 $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"; 3463 cf::cleanup "SIG$signal";
3206 },
3207 ); 3464 };
3208 } 3465 }
3209} 3466}
3210 3467
3211sub write_runtime { 3468sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3213 3470
3214 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3216 3473
… …
3242 and return; 3499 and return;
3243 3500
3244 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3245 3502
3246 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3247} 3547}
3248 3548
3249sub emergency_save() { 3549sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3251 3551
… …
3257 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
3259 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3563 $pl->save;
3263 } 3564 }
3264 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
3265 3566
3266 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
… …
3272 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3273 3574
3274 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3277 }; 3582 };
3278 3583
3279 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3280} 3585}
3281 3586
… …
3283 my ($make_core) = @_; 3588 my ($make_core) = @_;
3284 3589
3285 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3591 if $make_core;
3287} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3288 3621
3289sub do_reload_perl() { 3622sub do_reload_perl() {
3290 # can/must only be called in main 3623 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3292 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3293 return; 3626 return;
3294 } 3627 }
3295 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3296 warn "reloading..."; 3632 warn "reloading...";
3297 3633
3298 warn "entering sync_job"; 3634 warn "entering sync_job";
3299 3635
3300 cf::sync_job { 3636 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3638 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3304 3640
3305 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3643
3308 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3309 3645
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"; 3646 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3649 }
3347 3650
3348 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3350 } 3653 %EXT_CORO = ();
3351 3654
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3665
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3363 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3364 } 3675 }
3365 3676
3366 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3367 } 3692 }
3368 3693
3369 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3697
3373 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3376 3701
3377 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3703 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3380 3705
3381 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3382 3707
3383 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3384 require cf; 3709 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3386 3711
3387 warn "loading config and database again"; 3712 warn "loading config and database again";
3388 cf::reload_config; 3713 cf::reload_config;
3389 3714
3390 warn "loading extensions"; 3715 warn "loading extensions";
3391 cf::load_extensions; 3716 cf::load_extensions;
3392 3717
3393 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3399 3724
3400 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3401 3726
3402 1 3727 1
3403 } or do { 3728 } or do {
3404 warn $@; 3729 warn $@;
3405 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3731 };
3408 3732
3409 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3410}; 3736};
3411 3737
3412our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3413 3739
3414sub reload_perl() { 3740sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3417 3743
3418 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3419 reentrant => 0,
3420 after => 0,
3421 data => WF_AUTOCANCEL,
3422 cb => sub {
3423 do_reload_perl; 3745 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3425 },
3426 ); 3747 };
3427} 3748}
3428 3749
3429register_command "reload" => sub { 3750register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3431 3752
3432 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3757 reload_perl;
3758 };
3435 } 3759 }
3436}; 3760};
3437 3761
3438unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3439 3763
… …
3441 3765
3442our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3444 3768
3445sub wait_for_tick { 3769sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3448 3771
3449 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3774 $signal->wait;
3452} 3775}
3453 3776
3454sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3457 3779
3458 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3782 $signal->wait;
3461} 3783}
3462 3784
3463our $stat_fh; 3785sub tick {
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) { 3786 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3476 return; 3789 return;
3477 } 3790 }
3478 3791
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;
3482
3483 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3484 3793
3485 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK;
3487
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3796 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3798 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3800 };
3801 }
3495 3802
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3804 $sig->send;
3501 } 3805 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3807 $sig->send;
3504 } 3808 }
3505 3809
3506 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
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;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3812
3517 _post_tick; 3813 if (0) {
3518 3814 if ($NEXT_TICK) {
3519 # gather some statistics#d# 3815 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3817 warn "jitter $JITTER\n";#d#
3818 }
3522 }, 3819 }
3523); 3820}
3524 3821
3525{ 3822{
3823 # configure BDB
3824
3526 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3527 BDB::max_poll_time $TICK * 0.1; 3826 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3827 $AnyEvent::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 3828
3552 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3836
3555 cf::sync_job { 3837 cf::sync_job {
3556 eval { 3838 eval {
3557 BDB::db_env_open 3839 BDB::db_env_open
3558 $DB_ENV, 3840 $DB_ENV,
… …
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3844 0666;
3563 3845
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 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 }; 3847 };
3570 3848
3571 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3850 };
3573 } 3851 }
3574 3852
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 3855 };
3578 hard => 1, 3856 $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 { }; 3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 3858 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 3859 $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 { }; 3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 3861 };
3595} 3862}
3596 3863
3597{ 3864{
3865 # configure IO::AIO
3866
3598 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
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} 3870}
3611 3871
3612my $_log_backtrace; 3872my $_log_backtrace;
3613 3873
3614sub _log_backtrace { 3874sub _log_backtrace {
… …
3618 3878
3619 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3881 ++$_log_backtrace;
3622 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3623 my @bt = fork_call { 3885 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

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