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.368 by root, Wed Sep 12 11:18:25 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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
… …
1515Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1516 1627
1517=cut 1628=cut
1518 1629
1519sub expand_cfpod { 1630sub expand_cfpod {
1520 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1521 1632
1522 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1523 s/&/&amp;/g; 1634 my $xml;
1524 s/(?<![BIUGHT])</&lt;/g;
1525 1635
1526 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1527 1648
1528 1 while 1649 my $cb;
1529 # replace B<>, I<>, U<> etc. 1650
1530 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1531 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1532 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1534 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1535 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1536 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1537 }ge 1658 $cb = sub {
1538 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1539 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1540 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "") 1667 "",
1544 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1545 }ge; 1707 }
1708 }
1709 }
1546 1710
1547 # create single paragraphs (very hackish) 1711 $xml
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557} 1712}
1558 1713
1559sub hintmode { 1714sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode} 1716 $_[0]{hintmode}
… …
1634our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1636 1791
1637sub generate_random_map { 1792sub generate_random_map {
1638 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1639 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1798 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1923
1766# the temporary/swap location 1924# the temporary/swap location
1767sub save_path { 1925sub save_path {
1768 my ($self) = @_; 1926 my ($self) = @_;
1769 1927
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1772} 1930}
1773 1931
1774# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1775sub uniq_path { 1933sub uniq_path {
1776 my ($self) = @_; 1934 my ($self) = @_;
1777 1935
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1780} 1938}
1781 1939
1782# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1783# all maps in C++... 1941# all maps in C++...
… …
1881 2039
1882 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1884 2042
1885 $cf::MAP{$path} || do { 2043 $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 2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
1888 2046
1889 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1890 or return; 2048 or return;
1891 2049
1892 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
… …
1895 or return; 2053 or return;
1896 2054
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1900 undef $guard1; 2059 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2060 $map->reset;
1903 return find $path; 2061 return find $path;
1904 } 2062 }
1905 2063
1906 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2092 $f->skip_block;
1935 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1936 or return; 2094 or return;
1937 2095
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1939 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1940 2098
1941 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2100 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
… …
1969 } 2127 }
1970 2128
1971 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1973 2131
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2133 }
1976 2134
1977 $self->post_load; 2135 $self->post_load;
1978} 2136}
1979 2137
… …
2037 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2038 2196
2039 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2040 2198
2041 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2201 }
2044 2202
2045 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2046 2204
2047 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
2048 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2210 if (my $map = find $k) {
2051 $map->load if $v; 2211 $map->load if $v;
2052 } 2212 }
… …
2078 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2079 2239
2080 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2081 2241
2082 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2084 }; 2245 };
2246
2247 cf::get_slot 0.02;
2085 2248
2086 if ($uniq) { 2249 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2252 } else {
… …
2098 $self->save; 2261 $self->save;
2099 2262
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2264
2102 return if $self->players; 2265 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2105 2268
2106 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2107 2270
2108 $self->deactivate; 2271 $self->deactivate;
… …
2226 2389
2227sub unique_maps() { 2390sub unique_maps() {
2228 [ 2391 [
2229 map { 2392 map {
2230 utf8::decode $_; 2393 utf8::decode $_;
2231 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2232 ? normalise $_ 2397 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2399 ]
2236} 2400}
2237 2401
2238package cf;
2239
2240=back 2402=back
2241 2403
2242=head3 cf::object 2404=head3 cf::object
2243 2405
2244=cut 2406=cut
… …
2247 2409
2248=over 4 2410=over 4
2249 2411
2250=item $ob->inv_recursive 2412=item $ob->inv_recursive
2251 2413
2252Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2253 2416
2254=cut 2417=cut
2255 2418
2256sub inv_recursive_; 2419sub inv_recursive_;
2257sub inv_recursive_ { 2420sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2263} 2426}
2264 2427
2265=item $ref = $ob->ref 2428=item $ref = $ob->ref
2266 2429
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2430Creates and returns a persistent reference to an object that can be stored as a string.
2268 2431
2269=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2270 2433
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2435even if the object actually exists. May block.
… …
2274=cut 2437=cut
2275 2438
2276sub deref { 2439sub deref {
2277 my ($ref) = @_; 2440 my ($ref) = @_;
2278 2441
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2443 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2445 or return;
2286 $pl->ob->uuid eq $uuid 2446 $pl->ob->uuid eq $uuid
2287 or return; 2447 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2468dialogue with the given NPC character.
2309 2469
2310=cut 2470=cut
2311 2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2485
2312# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2487# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2503
2330 } else { 2504 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2507 }
2334 } 2508 }
2335} 2509}
2336 2510
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2445her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2620that 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 2621the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2622be called at the end of this process.
2449 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2450=cut 2627=cut
2451 2628
2452our $GOTOGEN; 2629our $GOTOGEN;
2453 2630
2454sub cf::object::player::goto { 2631sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2636
2460 $self->enter_link; 2637 $self->enter_link;
2461 2638
2462 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2463 # *tag paths override both path and x|y 2642 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2643 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2645 my $ob = $obs[rand @obs];
2467 2646
2468 # see if we actually can go there 2647 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { 2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs]; 2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2652 }
2472 # else put him there anyways for now #d# 2653 # else put us there anyways for now #d#
2473 2654
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2475 } 2658 }
2476 } 2659 }
2477 2660
2478 my $map = eval { 2661 my $map = eval {
2479 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2480 2663
2481 if ($map) { 2664 if ($map) {
2482 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2483 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2484 } else { 2667 } else {
2485 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2486 } 2669 }
2487 2670
2488 $map 2671 $map
2489 }; 2672 };
2490 2673
… …
2526} 2709}
2527 2710
2528sub prepare_random_map { 2711sub prepare_random_map {
2529 my ($exit) = @_; 2712 my ($exit) = @_;
2530 2713
2531 my $guard = cf::lock_acquire "exit_prepare:$exit";
2532
2533 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2534 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2535 # that depends on the exit object 2716 # that depends on the exit object
2536 2717
2537 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
… …
2539 if ($exit->map) { 2720 if ($exit->map) {
2540 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2541 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2542 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2543 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2544 } 2727 }
2545 2728
2546 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2547 2730
2548 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2549 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2550 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2551 2734
2552 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2553 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2554 undef $fh; 2737 undef $fh;
2555 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2556 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2557 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2558 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2559 } 2746 }
2560} 2747}
2561 2748
2562sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2563 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2564 2751
2565 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2566 2753
2567 if ($exit->slaying eq "/!") {
2568 #TODO: this should de-fi-ni-te-ly not be a sync-job
2569 # the problem is that $exit might not survive long enough
2570 # so it needs to be done right now, right here
2571 cf::sync_job { prepare_random_map $exit };
2572 }
2573
2574 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2575 my $hp = $exit->stats->hp;
2576 my $sp = $exit->stats->sp;
2577
2578 $self->enter_link; 2754 $self->enter_link;
2579 2755
2580 # if exit is damned, update players death & WoR home-position
2581 $self->contr->savebed ($slaying, $hp, $sp)
2582 if $exit->flag (FLAG_DAMNED);
2583
2584 (async { 2756 (async {
2585 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2586 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2587 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2588 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2589 1; 2780 1
2590 }) { 2781 }) {
2591 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2592 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2593 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2594 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
… …
2624the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2625the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2626 2817
2627=cut 2818=cut
2628 2819
2820# non-persistent channels (usually the info channel)
2629our %CHANNEL = ( 2821our %CHANNEL = (
2630 "c/identify" => { 2822 "c/identify" => {
2631 id => "identify", 2823 id => "infobox",
2632 title => "Identify", 2824 title => "Identify",
2633 reply => undef, 2825 reply => undef,
2634 tooltip => "Items recently identified", 2826 tooltip => "Items recently identified",
2635 }, 2827 },
2636 "c/examine" => { 2828 "c/examine" => {
2637 id => "examine", 2829 id => "infobox",
2638 title => "Examine", 2830 title => "Examine",
2639 reply => undef, 2831 reply => undef,
2640 tooltip => "Signs and other items you examined", 2832 tooltip => "Signs and other items you examined",
2641 }, 2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2642); 2876);
2643 2877
2644sub cf::client::send_msg { 2878sub cf::client::send_msg {
2645 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2646 2880
2647 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2648 2882
2649 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2650 2884
2651 # check predefined channels, for the benefit of C 2885 # check predefined channels, for the benefit of C
2652 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2653 2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2654 if (ref $channel) { 2894 } elsif (ref $channel) {
2655 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2656 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2657 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2658 $self->ext_msg (channel_info => $channel) 2898 $self->ext_msg (channel_info => $channel)
2659 if $self->can_msg; 2899 if $self->can_msg;
… …
2876=pod 3116=pod
2877 3117
2878The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2879 3119
2880 cf::object 3120 cf::object
2881 contr pay_amount pay_player map x y force_find force_add 3121 contr pay_amount pay_player map x y force_find force_add destroy
2882 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
2883 3123
2884 cf::object::player 3124 cf::object::player
2885 player 3125 player
2886 3126
2887 cf::player 3127 cf::player
… …
2892 3132
2893=cut 3133=cut
2894 3134
2895for ( 3135for (
2896 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2897 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
2898 decrease_ob_nr)], 3138 decrease split destroy change_exp)],
2899 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2900 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2901 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2902) { 3142) {
2903 no strict 'refs'; 3143 no strict 'refs';
… …
3008 { 3248 {
3009 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
3010 3250
3011 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
3012 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
3013 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
3014 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
3015 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3016 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3017 3258
3018 cf::cede_to_tick; 3259 cf::cede_to_tick;
3019 } 3260 }
3020 3261
3021 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
3022 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
3023 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
3024 or next; 3266 or next;
3267
3025 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
3026 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
3027 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3028 } else { 3271 } else {
3029 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3047 { 3290 {
3048 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
3049 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
3050 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
3051 3294
3052 my $soundconf = delete $res->{"res/sound.conf"};
3053
3054 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3055 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3056 my $data; 3298 my $data;
3057 3299
3058 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
3059 # prepend meta info 3301 # prepend meta info
3060 3302
3061 my $meta = $enc->encode ({ 3303 my $meta = $enc->encode ({
3062 name => $name, 3304 name => $name,
3063 %{ $info->{meta} || {} }, 3305 %{ $info->{meta} || {} },
3064 }); 3306 });
3065 3307
3066 $data = pack "(w/a*)*", $meta, $info->{data}; 3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
3067 } else { 3315 } else {
3068 $data = $info->{data}; 3316 $RESOURCE{$name} = $info;
3069 } 3317 }
3070 3318
3071 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3072 cf::face::set_type $idx, $info->{type};
3073
3074 cf::cede_to_tick; 3319 cf::cede_to_tick;
3075 } 3320 }
3076
3077 if ($soundconf) {
3078 $soundconf = $enc->decode (delete $soundconf->{data});
3079
3080 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3081 my $sound = $soundconf->{compat}[$_]
3082 or next;
3083
3084 my $face = cf::face::find "sound/$sound->[1]";
3085 cf::sound::set $sound->[0] => $face;
3086 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3087 }
3088
3089 while (my ($k, $v) = each %{$soundconf->{event}}) {
3090 my $face = cf::face::find "sound/$v";
3091 cf::sound::set $k => $face;
3092 }
3093 }
3094 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3095 3324
3096 1 3325 1
3097} 3326}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3098 3347
3099register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
3100 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
3101 3350
3102 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3103 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3104 } 3353 }
3105}; 3354};
3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3106 3365
3107sub reload_regions { 3366sub reload_regions {
3108 # HACK to clear player env face cache, we need some signal framework 3367 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?) 3368 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3124} 3383}
3125 3384
3126sub reload_archetypes { 3385sub reload_archetypes {
3127 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3128 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3129 #d# NEED to laod twice to resolve forward references
3130 # this really needs to be done in an extra post-pass
3131 # (which needs to be synchronous, so solve it differently)
3132 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n";
3134} 3388}
3135 3389
3136sub reload_treasures { 3390sub reload_treasures {
3137 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3138 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3139} 3393}
3140 3394
3141sub reload_resources { 3395sub reload_resources {
3142 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3143 3397
3398 reload_facedata;
3399 reload_archetypes;
3144 reload_regions; 3400 reload_regions;
3145 reload_facedata;
3146 #reload_archetypes;#d#
3147 reload_archetypes;
3148 reload_treasures; 3401 reload_treasures;
3149 3402
3150 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3151} 3404}
3152 3405
3153sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3154 reload_resources; 3411 reload_resources;
3155} 3412}
3156 3413
3157sub reload_config { 3414sub reload_config {
3158 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3159 or return; 3416 or return;
3160 3417
3161 local $/; 3418 local $/;
3162 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3163 3420
3164 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3165 3422
3166 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3167 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3178sub main { 3435sub main {
3179 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
3180 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
3181 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3182 (async { 3439 (async {
3183 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
3184 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3185 }; 3443 };
3186 3444
3445 {
3446 my $guard = freeze_mainloop;
3187 reload_config; 3447 reload_config;
3188 db_init; 3448 db_init;
3189 load_extensions; 3449 load_extensions;
3190 3450
3191 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3192 Event::loop; 3454 EV::loop;
3193} 3455}
3194 3456
3195############################################################################# 3457#############################################################################
3196# initialisation and cleanup 3458# initialisation and cleanup
3197 3459
3198# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3199BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3200 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3201 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3202 reentrant => 0,
3203 data => WF_AUTOCANCEL,
3204 signal => $signal,
3205 prio => 0,
3206 cb => sub {
3207 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3208 },
3209 ); 3466 };
3210 } 3467 }
3211} 3468}
3212 3469
3213sub write_runtime { 3470sub write_runtime_sync {
3214 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3215 3472
3216 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3217 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3218 3475
… …
3244 and return; 3501 and return;
3245 3502
3246 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3247 3504
3248 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3249} 3549}
3250 3550
3251sub emergency_save() { 3551sub emergency_save() {
3252 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3253 3553
… …
3259 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
3260 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
3261 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
3262 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
3263 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3264 $pl->save; 3565 $pl->save;
3265 } 3566 }
3266 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
3267 3568
3268 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
… …
3274 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3275 3576
3276 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3277 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3278 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3279 }; 3584 };
3280 3585
3281 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3282} 3587}
3283 3588
… …
3285 my ($make_core) = @_; 3590 my ($make_core) = @_;
3286 3591
3287 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3288 if $make_core; 3593 if $make_core;
3289} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3290 3623
3291sub do_reload_perl() { 3624sub do_reload_perl() {
3292 # can/must only be called in main 3625 # can/must only be called in main
3293 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3294 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3295 return; 3628 return;
3296 } 3629 }
3297 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3298 warn "reloading..."; 3634 warn "reloading...";
3299 3635
3300 warn "entering sync_job"; 3636 warn "entering sync_job";
3301 3637
3302 cf::sync_job { 3638 cf::sync_job {
3303 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3304 cf::emergency_save; 3640 cf::emergency_save;
3305 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3306 3642
3307 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3308 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3309 3645
3310 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3311 3647
3312 warn "cancelling all WF_AUTOCANCEL watchers";
3313 for (Event::all_watchers) {
3314 $_->cancel if $_->data & WF_AUTOCANCEL;
3315 }
3316
3317 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3318 for (;;) {
3319 BDB::flush;
3320 IO::AIO::flush;
3321 Coro::cede;
3322 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3323 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3324 }
3325
3326 ++$RELOAD;
3327
3328 warn "cancelling all extension coros";
3329 $_->cancel for values %EXT_CORO;
3330 %EXT_CORO = ();
3331
3332 warn "removing commands";
3333 %COMMAND = ();
3334
3335 warn "removing ext/exti commands";
3336 %EXTCMD = ();
3337 %EXTICMD = ();
3338
3339 warn "unloading/nuking all extensions";
3340 for my $pkg (@EXTS) {
3341 warn "... unloading $pkg";
3342
3343 if (my $cb = $pkg->can ("unload")) {
3344 eval {
3345 $cb->($pkg);
3346 1
3347 } or warn "$pkg unloaded, but with errors: $@";
3348 } 3651 }
3349 3652
3350 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3351 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3352 } 3655 %EXT_CORO = ();
3353 3656
3354 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3355 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3356 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3357 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3358 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3359 delete $INC{$k};
3360 3667
3361 $k =~ s/\.pm$//;
3362 $k =~ s/\//::/g;
3363
3364 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3365 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3366 } 3677 }
3367 3678
3368 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3369 } 3694 }
3370 3695
3371 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3372 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3373 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3374 3699
3375 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3376 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3377 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3378 3703
3379 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3380 # and global variables created in xs 3705 # and global variables created in xs
3381 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3382 3707
3383 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3384 3709
3385 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3386 require cf; 3711 require cf;
3387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3388 3713
3389 warn "loading config and database again"; 3714 warn "loading config and database again";
3390 cf::reload_config; 3715 cf::reload_config;
3391 3716
3392 warn "loading extensions"; 3717 warn "loading extensions";
3393 cf::load_extensions; 3718 cf::load_extensions;
3394 3719
3395 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3396 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3397 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3398 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3399 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3400 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3401 3726
3402 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3403 3728
3404 1 3729 1
3405 } or do { 3730 } or do {
3406 warn $@; 3731 warn $@;
3407 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3408 exit 1;
3409 }; 3733 };
3410 3734
3411 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3412}; 3738};
3413 3739
3414our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3415 3741
3416sub reload_perl() { 3742sub reload_perl() {
3417 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3418 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3419 3745
3420 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3421 reentrant => 0,
3422 after => 0,
3423 data => WF_AUTOCANCEL,
3424 cb => sub {
3425 do_reload_perl; 3747 do_reload_perl;
3426 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3427 },
3428 ); 3749 };
3429} 3750}
3430 3751
3431register_command "reload" => sub { 3752register_command "reload" => sub {
3432 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3433 3754
3434 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
3435 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
3436 async { reload_perl }; 3759 reload_perl;
3760 };
3437 } 3761 }
3438}; 3762};
3439 3763
3440unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
3441 3765
… …
3443 3767
3444our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3445our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3446 3770
3447sub wait_for_tick { 3771sub wait_for_tick {
3448 return unless $TICK_WATCHER->is_active;
3449 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3450 3773
3451 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3452 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3453 $signal->wait; 3776 $signal->wait;
3454} 3777}
3455 3778
3456sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3457 return unless $TICK_WATCHER->is_active;
3458 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3459 3781
3460 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3461 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3462 $signal->wait; 3784 $signal->wait;
3463} 3785}
3464 3786
3465our $stat_fh; 3787sub tick {
3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3468$TICK_WATCHER = Event->timer (
3469 reentrant => 0,
3470 parked => 1,
3471 prio => 0,
3472 at => $NEXT_TICK || $TICK,
3473 data => WF_AUTOCANCEL,
3474 cb => sub {
3475 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3477 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3478 return; 3791 return;
3479 } 3792 }
3480 3793
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3486 3795
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3798 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3800 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3801 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3802 };
3803 }
3497 3804
3498# my $AFTER = Event::time;
3499# warn $AFTER - $NOW;#d#
3500
3501 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3502 $sig->send; 3806 $sig->send;
3503 } 3807 }
3504 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3505 $sig->send; 3809 $sig->send;
3506 } 3810 }
3507 3811
3508 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3509
3510 # if we are delayed by four ticks or more, skip them all
3511 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3512
3513 $TICK_WATCHER->at ($NEXT_TICK);
3514 $TICK_WATCHER->start;
3515
3516 $LOAD = ($NOW - $tick_start) / $TICK;
3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3518 3814
3519 _post_tick; 3815 if (0) {
3520 3816 if ($NEXT_TICK) {
3521 # gather some statistics#d# 3817 my $jitter = $TICK_START - $NEXT_TICK;
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3819 warn "jitter $JITTER\n";#d#
3820 }
3524 }, 3821 }
3525); 3822}
3526 3823
3527{ 3824{
3825 # configure BDB
3826
3528 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3828 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3829 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3830
3554 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3556 3838
3557 cf::sync_job { 3839 cf::sync_job {
3558 eval { 3840 eval {
3559 BDB::db_env_open 3841 BDB::db_env_open
3560 $DB_ENV, 3842 $DB_ENV,
… …
3562 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3844 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3563 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3845 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3564 0666; 3846 0666;
3565 3847
3566 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3848 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3567
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_lk_detect;
3571 }; 3849 };
3572 3850
3573 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3852 };
3575 } 3853 }
3576 3854
3577 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 11, 3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3579 interval => 60, 3857 };
3580 hard => 1, 3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3585 },
3586 ); 3860 };
3587 $BDB_TRICKLE_WATCHER = Event->timer ( 3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3588 after => 5,
3589 interval => 10,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3595 },
3596 ); 3863 };
3597} 3864}
3598 3865
3599{ 3866{
3867 # configure IO::AIO
3868
3600 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3601
3602 undef $Coro::AIO::WATCHER;
3603 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3604 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3605 reentrant => 0,
3606 data => WF_AUTOCANCEL,
3607 fd => IO::AIO::poll_fileno,
3608 poll => 'r',
3609 prio => 6,
3610 cb => \&IO::AIO::poll_cb,
3611 );
3612} 3872}
3613 3873
3614my $_log_backtrace; 3874my $_log_backtrace;
3615 3875
3616sub _log_backtrace { 3876sub _log_backtrace {
… …
3620 3880
3621 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3622 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3623 ++$_log_backtrace; 3883 ++$_log_backtrace;
3624 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3625 my @bt = fork_call { 3887 my @bt = fork_call {
3626 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3627 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3628 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3890 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3629 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

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