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.362 by root, Mon Sep 10 12:44:06 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
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our (%PLAYER, %PLAYER_LOADING); # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These 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
190 $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;
191 215
192 LOG llevError, $msg; 216 LOG llevError, $msg;
193 }; 217 };
194} 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#?
195 234
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 245for my $pkg (qw(
207 cf::global cf::attachable 246 cf::global cf::attachable
208 cf::object cf::object::player 247 cf::object cf::object::player
209 cf::client cf::player 248 cf::client cf::player
210 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
211 cf::map cf::party cf::region 251 cf::party cf::region
212)) { 252)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 254}
216 255
217$Event::DIED = sub { 256$EV::DIED = sub {
218 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
219}; 258};
220 259
221############################################################################# 260#############################################################################
222 261
245 $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;
246 $d 285 $d
247 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
248} 287}
249 288
250=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
251 290
252Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
253 292
254=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
255 294
256Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
257 296
258=cut 297=cut
259 298
260our $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
261 300
262sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
264 303
265=item cf::lock_wait $string 304=item cf::lock_wait $string
266 305
267Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
268 307
324 363
325 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
326} 365}
327 366
328sub freeze_mainloop { 367sub freeze_mainloop {
329 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
330 369
331 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
332 $TICK_WATCHER->start; 371}
333 }; 372
334 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
335 $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
336} 386}
337 387
338=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
339 389
340Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
351our @SLOT_QUEUE; 401our @SLOT_QUEUE;
352our $SLOT_QUEUE; 402our $SLOT_QUEUE;
353 403
354$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
355$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
356 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
357 409
358 while () { 410 while () {
359 next_job: 411 next_job:
360 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
368 } 420 }
369 } 421 }
370 } 422 }
371 423
372 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
373 # 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
374 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
375 $signal->wait; 427 $signal->wait;
376 } else { 428 } else {
377 Coro::schedule; 429 Coro::schedule;
378 } 430 }
379 } 431 }
380}; 432};
381 433
382sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
383 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
384 438
385 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
386 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
387 441
401 455
402BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
403 457
404=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
405 459
406The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
407is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
408partly 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
409acceptable. 463acceptable.
410 464
411If 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
412the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
417 471
418sub sync_job(&) { 472sub sync_job(&) {
419 my ($job) = @_; 473 my ($job) = @_;
420 474
421 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
422 my $time = Event::time; 476 my $time = EV::time;
423 477
424 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
425 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
426 480
427 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
428 # (but this is cancel-safe) 482
429 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
430 484
431 my $busy = 1; 485 my $busy = 1;
432 my @res; 486 my @res;
433 487
434 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
435 @res = eval { $job->() }; 490 @res = eval { $job->() };
436 warn $@ if $@; 491 warn $@ if $@;
437 undef $busy; 492 undef $busy;
438 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
439 494
440 while ($busy) { 495 while ($busy) {
441 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
442 } 500 }
501 }
443 502
444 $time = Event::time - $time; 503 my $time = EV::time - $time;
445 504
446 LOG llevError | logBacktrace, Carp::longmess "long sync job"
447 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
448
449 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
450 506
451 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
452 } else { 508 } else {
453 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
454 510
479=item fork_call { }, $args 535=item fork_call { }, $args
480 536
481Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
482process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
483Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
484never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
485 541
486=cut 542=cut
487 543
488sub fork_call(&@) { 544sub fork_call(&@) {
489 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
498 }, @args; 554 }, @args;
499 555
500 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
501} 557}
502 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
584}
585
503=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
504 587
505Returns a single value from the environment database. 588Returns a single value from the environment database.
506 589
507=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
508 591
509Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
510data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
511 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
512=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
513 618
514our $DB; 619our $DB;
515 620
516sub db_init { 621sub db_init {
517 unless ($DB) {
518 $DB = BDB::db_create $DB_ENV;
519
520 cf::sync_job { 622 cf::sync_job {
521 eval { 623 $DB ||= db_table "db";
522 $DB->set_flags (BDB::CHKSUM);
523
524 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
525 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
526 cf::cleanup "db_open(db): $!" if $!;
527 };
528 cf::cleanup "db_open(db): $@" if $@;
529 };
530 } 624 };
531} 625}
532 626
533sub db_get($$) { 627sub db_get($$) {
534 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
535 629
639attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
640to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
641 735
642In 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>
643C<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
644Crossfire TRT). 738Deliantra).
645 739
646=over 4 740=over 4
647 741
648=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
649 743
931 } 1025 }
932 1026
933 0 1027 0
934} 1028}
935 1029
936=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
937 1031
938=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
939 1033
940Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
941 1035
947 1041
948=cut 1042=cut
949 1043
950############################################################################# 1044#############################################################################
951# object support 1045# object support
952#
953 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#
954sub _can_merge { 1080sub _can_merge {
955 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
956 1082
957 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
958 my $fob1 = Storable::freeze $ob1;
959 my $fob2 = Storable::freeze $ob2;
960 1084
961 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
962} 1087}
963 1088
964sub reattach { 1089sub reattach {
965 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
966 my ($obj) = @_; 1091 my ($obj) = @_;
967 1092
1093 # no longer needed after getting rid of delete_package?
968 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
969 1095
970 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
971 1097
972 @$registry = (); 1098 @$registry = ();
973 1099
988cf::attachable->attach ( 1114cf::attachable->attach (
989 prio => -1000000, 1115 prio => -1000000,
990 on_instantiate => sub { 1116 on_instantiate => sub {
991 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
992 1118
993 $data = from_json $data; 1119 $data = decode_json $data;
994 1120
995 for (@$data) { 1121 for (@$data) {
996 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
997 1123
998 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1011 }, 1137 },
1012); 1138);
1013 1139
1014sub object_freezer_save { 1140sub object_freezer_save {
1015 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1016
1017 my $guard = cf::lock_acquire "io";
1018 1142
1019 sync_job { 1143 sync_job {
1020 if (length $$rdata) { 1144 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1023 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1024 1148
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1153 aio_close $fh;
1030 1154
1031 if (@$objs) { 1155 if (@$objs) {
1032 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) {
1033 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1161 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1163 }
1040 } else { 1164 } else {
1041 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1042 } 1166 }
1048 } else { 1172 } else {
1049 aio_unlink $filename; 1173 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1051 } 1175 }
1052 }; 1176 };
1053
1054 undef $guard;
1055} 1177}
1056 1178
1057sub object_freezer_as_string { 1179sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1059 1181
1064 1186
1065sub object_thawer_load { 1187sub object_thawer_load {
1066 my ($filename) = @_; 1188 my ($filename) = @_;
1067 1189
1068 my ($data, $av); 1190 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1191
1072 (aio_load $filename, $data) >= 0 1192 (aio_load $filename, $data) >= 0
1073 or return; 1193 or return;
1074 1194
1075 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1197 or return;
1078 1198
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1081 } 1201 }
1082 1202
1083 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1084 warn sprintf "loading %s (%d,%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1085 $decname, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1215 1335
1216 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1217 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1218 1338
1219 $ext{source} = 1339 $ext{source} =
1220 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1221 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1222 . $source 1342 . $source
1223 . "\n};\n1"; 1343 . "\n};\n1";
1224 1344
1225 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1241 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1242 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1243 1363
1244 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1245 warn $msg; 1365 warn $msg;
1246 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1247 exit 1;
1248 } 1367 }
1249 1368
1250 warn $msg; 1369 warn $msg;
1251 } 1370 }
1252 1371
1339 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1340 1459
1341 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1342 or return; 1461 or return;
1343 1462
1344 $f->next;
1345 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1346 or return; 1464 or return;
1465
1347 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1349 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1350 } 1469 }
1351 } 1470 }
1361 1480
1362 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1363 1482
1364 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1365 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1366 1487
1367 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1368 cf::cede_to_tick; 1489 cf::cede_to_tick;
1369} 1490}
1370 1491
1406 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1407 $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
1408 1529
1409 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1410 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1411 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1412 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1413 1536
1414 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1415 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1454 1577
1455 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1456 my $path = path $login; 1579 my $path = path $login;
1457 1580
1458 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1461 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1462 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 } 1587 }
1464 1588
1502Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1503 1627
1504=cut 1628=cut
1505 1629
1506sub expand_cfpod { 1630sub expand_cfpod {
1507 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1508 1632
1509 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1510 s/&/&amp;/g; 1634 my $xml;
1511 s/(?<![BIUGHT])</&lt;/g;
1512 1635
1513 # 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};
1514 1648
1515 1 while 1649 my $cb;
1516 # replace B<>, I<>, U<> etc. 1650
1517 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1518 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1519 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1654 $cb = sub { "<tt>$_[0]</tt>" };
1521 # replace G<male|female> tags 1655 } elsif ($code eq "E") {
1522 || s{G<([^>|]*)\|([^>]*)>}{ 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1523 $self->gender ? $2 : $1 1657 } elsif ($code eq "G") {
1524 }ge 1658 $cb = sub {
1525 # replace H<hint text> 1659 my ($male, $female) = split /\|/, $_[0];
1526 || s{H<([^\>]*)>} 1660 $self->gender ? $female : $male
1527 { 1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1528 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1529 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1530 "") 1667 "",
1531 [$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 }
1532 }ge; 1707 }
1708 }
1709 }
1533 1710
1534 # create single paragraphs (very hackish) 1711 $xml
1535 s/(?<=\S)\n(?=\w)/ /g;
1536
1537 # compress some whitespace
1538 s/\s+\n/\n/g; # ws line-ends
1539 s/\n\n+/\n/g; # double lines
1540 s/^\n+//; # beginning lines
1541 s/\n+$//; # ending lines
1542
1543 $_
1544} 1712}
1545 1713
1546sub hintmode { 1714sub hintmode {
1547 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1548 $_[0]{hintmode} 1716 $_[0]{hintmode}
1621our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1622our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1623 1791
1624sub generate_random_map { 1792sub generate_random_map {
1625 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
1626 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1627 $self->_create_random_map ( 1798 $self->_create_random_map (
1628 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1629 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1630 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1752 1923
1753# the temporary/swap location 1924# the temporary/swap location
1754sub save_path { 1925sub save_path {
1755 my ($self) = @_; 1926 my ($self) = @_;
1756 1927
1757 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1758 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1759} 1930}
1760 1931
1761# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1762sub uniq_path { 1933sub uniq_path {
1763 my ($self) = @_; 1934 my ($self) = @_;
1764 1935
1765 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1766 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1767} 1938}
1768 1939
1769# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1770# all maps in C++... 1941# all maps in C++...
1868 2039
1869 cf::lock_wait "map_data:$path";#d#remove 2040 cf::lock_wait "map_data:$path";#d#remove
1870 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1871 2042
1872 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 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";
1875 2046
1876 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1877 or return; 2048 or return;
1878 2049
1879 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1882 or return; 2053 or return;
1883 2054
1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1885 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1886 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
1887 undef $guard1; 2059 undef $guard1;
1888 undef $guard2;
1889 $map->reset; 2060 $map->reset;
1890 return find $path; 2061 return find $path;
1891 } 2062 }
1892 2063
1893 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1920 my $f = new_from_file cf::object::thawer $self->{load_path}; 2091 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block; 2092 $f->skip_block;
1922 $self->_load_objects ($f) 2093 $self->_load_objects ($f)
1923 or return; 2094 or return;
1924 2095
1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1926 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1927 2098
1928 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1929 utf8::encode $uniq; 2100 utf8::encode $uniq;
1930 unless (aio_stat $uniq) { 2101 unless (aio_stat $uniq) {
1956 } 2127 }
1957 2128
1958 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1959 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1960 2131
1961 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1962 } 2133 }
1963 2134
1964 $self->post_load; 2135 $self->post_load;
1965} 2136}
1966 2137
2024 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
2025 2196
2026 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
2027 2198
2028 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2030 } 2201 }
2031 2202
2032 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
2033 2204
2034 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
2035 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
2036 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
2037 if (my $map = find $k) { 2210 if (my $map = find $k) {
2038 $map->load if $v; 2211 $map->load if $v;
2039 } 2212 }
2065 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2066 2239
2067 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2068 2241
2069 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2070 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2071 }; 2245 };
2246
2247 cf::get_slot 0.02;
2072 2248
2073 if ($uniq) { 2249 if ($uniq) {
2074 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2075 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2076 } else { 2252 } else {
2085 $self->save; 2261 $self->save;
2086 2262
2087 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2088 2264
2089 return if $self->players; 2265 return if $self->players;
2090 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2091 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2092 2268
2093 $self->in_memory (cf::MAP_SWAPPED); 2269 $self->in_memory (cf::MAP_SWAPPED);
2094 2270
2095 $self->deactivate; 2271 $self->deactivate;
2213 2389
2214sub unique_maps() { 2390sub unique_maps() {
2215 [ 2391 [
2216 map { 2392 map {
2217 utf8::decode $_; 2393 utf8::decode $_;
2218 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2219 ? normalise $_ 2397 : normalise $_
2220 : ()
2221 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2222 ] 2399 ]
2223} 2400}
2224 2401
2225package cf;
2226
2227=back 2402=back
2228 2403
2229=head3 cf::object 2404=head3 cf::object
2230 2405
2231=cut 2406=cut
2234 2409
2235=over 4 2410=over 4
2236 2411
2237=item $ob->inv_recursive 2412=item $ob->inv_recursive
2238 2413
2239Returns 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.
2240 2416
2241=cut 2417=cut
2242 2418
2243sub inv_recursive_; 2419sub inv_recursive_;
2244sub inv_recursive_ { 2420sub inv_recursive_ {
2249 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2250} 2426}
2251 2427
2252=item $ref = $ob->ref 2428=item $ref = $ob->ref
2253 2429
2254creates 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.
2255 2431
2256=item $ob = cf::object::deref ($refstring) 2432=item $ob = cf::object::deref ($refstring)
2257 2433
2258returns 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,
2259even if the object actually exists. May block. 2435even if the object actually exists. May block.
2261=cut 2437=cut
2262 2438
2263sub deref { 2439sub deref {
2264 my ($ref) = @_; 2440 my ($ref) = @_;
2265 2441
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2); 2443 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return; 2445 or return;
2273 $pl->ob->uuid eq $uuid 2446 $pl->ob->uuid eq $uuid
2274 or return; 2447 or return;
2294can 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
2295dialogue with the given NPC character. 2468dialogue with the given NPC character.
2296 2469
2297=cut 2470=cut
2298 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
2299# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2300# with dialog boxes. 2487# with dialog boxes.
2301#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
2302sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2303 my ($self, $npc, $msg, $flags) = @_; 2490 my ($self, $npc, $msg, $flags) = @_;
2314 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2315 $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));
2316 2503
2317 } else { 2504 } else {
2318 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2319 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2320 } 2507 }
2321 } 2508 }
2322} 2509}
2323 2510
2324=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2432her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2433that 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
2434the 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
2435be called at the end of this process. 2622be called at the end of this process.
2436 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
2437=cut 2627=cut
2438 2628
2439our $GOTOGEN; 2629our $GOTOGEN;
2440 2630
2441sub cf::object::player::goto { 2631sub cf::object::player::goto {
2445 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2446 2636
2447 $self->enter_link; 2637 $self->enter_link;
2448 2638
2449 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2450 my $map = eval { 2661 my $map = eval {
2451 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2452 2663
2453 if ($map) { 2664 if ($map) {
2454 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2455 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2456 } else { 2667 } else {
2457 $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);
2458 } 2669 }
2459 2670
2460 $map 2671 $map
2461 }; 2672 };
2462 2673
2498} 2709}
2499 2710
2500sub prepare_random_map { 2711sub prepare_random_map {
2501 my ($exit) = @_; 2712 my ($exit) = @_;
2502 2713
2503 my $guard = cf::lock_acquire "exit_prepare:$exit";
2504
2505 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2506 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2507 # that depends on the exit object 2716 # that depends on the exit object
2508 2717
2509 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2511 if ($exit->map) { 2720 if ($exit->map) {
2512 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2513 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2514 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2515 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2516 } 2727 }
2517 2728
2518 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2519 2730
2520 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2521 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2522 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2523 2734
2524 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2525 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2526 undef $fh; 2737 undef $fh;
2527 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2528 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2529 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2530 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2531 } 2746 }
2532} 2747}
2533 2748
2534sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2535 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2536 2751
2537 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2538 2753
2539 if ($exit->slaying eq "/!") {
2540 #TODO: this should de-fi-ni-te-ly not be a sync-job
2541 # the problem is that $exit might not survive long enough
2542 # so it needs to be done right now, right here
2543 cf::sync_job { prepare_random_map $exit };
2544 }
2545
2546 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2547 my $hp = $exit->stats->hp;
2548 my $sp = $exit->stats->sp;
2549
2550 $self->enter_link; 2754 $self->enter_link;
2551 2755
2552 # if exit is damned, update players death & WoR home-position
2553 $self->contr->savebed ($slaying, $hp, $sp)
2554 if $exit->flag (FLAG_DAMNED);
2555
2556 (async { 2756 (async {
2557 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2558 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
2559 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2560 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
2561 1; 2780 1
2562 }) { 2781 }) {
2563 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2564 . "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. "
2565 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2566 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2596the 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
2597the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2598 2817
2599=cut 2818=cut
2600 2819
2820# non-persistent channels (usually the info channel)
2601our %CHANNEL = ( 2821our %CHANNEL = (
2602 "c/identify" => { 2822 "c/identify" => {
2603 id => "identify", 2823 id => "infobox",
2604 title => "Identify", 2824 title => "Identify",
2605 reply => undef, 2825 reply => undef,
2606 tooltip => "Items recently identified", 2826 tooltip => "Items recently identified",
2607 }, 2827 },
2608 "c/examine" => { 2828 "c/examine" => {
2609 id => "examine", 2829 id => "infobox",
2610 title => "Examine", 2830 title => "Examine",
2611 reply => undef, 2831 reply => undef,
2612 tooltip => "Signs and other items you examined", 2832 tooltip => "Signs and other items you examined",
2613 }, 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 },
2614); 2876);
2615 2877
2616sub cf::client::send_msg { 2878sub cf::client::send_msg {
2617 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2618 2880
2619 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2620 2882
2621 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622 2884
2623 # check predefined channels, for the benefit of C 2885 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2625 2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2626 if (ref $channel) { 2894 } elsif (ref $channel) {
2627 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2628 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2629 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2630 $self->ext_msg (channel_info => $channel) 2898 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg; 2899 if $self->can_msg;
2848=pod 3116=pod
2849 3117
2850The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2851 3119
2852 cf::object 3120 cf::object
2853 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
2854 insert remove name archname title slaying race decrease_ob_nr 3122 insert remove name archname title slaying race decrease split
2855 3123
2856 cf::object::player 3124 cf::object::player
2857 player 3125 player
2858 3126
2859 cf::player 3127 cf::player
2864 3132
2865=cut 3133=cut
2866 3134
2867for ( 3135for (
2868 ["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
2869 insert remove inv name archname title slaying race 3137 insert remove inv nrof name archname title slaying race
2870 decrease_ob_nr)], 3138 decrease split destroy change_exp)],
2871 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2872 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2873 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2874) { 3142) {
2875 no strict 'refs'; 3143 no strict 'refs';
2980 { 3248 {
2981 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
2982 3250
2983 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2984 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
2985 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
2986 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
2987 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};
2988 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};
2989 3258
2990 cf::cede_to_tick; 3259 cf::cede_to_tick;
2991 } 3260 }
2992 3261
2993 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
2994 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
2995 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
2996 or next; 3266 or next;
3267
2997 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
2998 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
2999 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3000 } else { 3271 } else {
3001 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
3019 { 3290 {
3020 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
3021 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
3022 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
3023 3294
3024 my $soundconf = delete $res->{"res/sound.conf"};
3025
3026 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) {
3027 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3028 my $data; 3298 my $data;
3029 3299
3030 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
3031 # prepend meta info 3301 # prepend meta info
3032 3302
3033 my $meta = $enc->encode ({ 3303 my $meta = $enc->encode ({
3034 name => $name, 3304 name => $name,
3035 %{ $info->{meta} || {} }, 3305 %{ $info->{meta} || {} },
3036 }); 3306 });
3037 3307
3038 $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};
3039 } else { 3315 } else {
3040 $data = $info->{data}; 3316 $RESOURCE{$name} = $info;
3041 } 3317 }
3042 3318
3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3044 cf::face::set_type $idx, $info->{type};
3045
3046 cf::cede_to_tick; 3319 cf::cede_to_tick;
3047 } 3320 }
3048
3049 if ($soundconf) {
3050 $soundconf = $enc->decode (delete $soundconf->{data});
3051
3052 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3053 my $sound = $soundconf->{compat}[$_]
3054 or next;
3055
3056 my $face = cf::face::find "sound/$sound->[1]";
3057 cf::sound::set $sound->[0] => $face;
3058 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3059 }
3060
3061 while (my ($k, $v) = each %{$soundconf->{event}}) {
3062 my $face = cf::face::find "sound/$v";
3063 cf::sound::set $k => $face;
3064 }
3065 }
3066 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3067 3324
3068 1 3325 1
3069} 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});
3070 3347
3071register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
3072 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
3073 3350
3074 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
3075 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
3076 } 3353 }
3077}; 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}
3078 3365
3079sub reload_regions { 3366sub reload_regions {
3080 # 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
3081 # for this (global event?) 3368 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3096} 3383}
3097 3384
3098sub reload_archetypes { 3385sub reload_archetypes {
3099 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
3100 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
3101 #d# NEED to laod twice to resolve forward references
3102 # this really needs to be done in an extra post-pass
3103 # (which needs to be synchronous, so solve it differently)
3104 load_resource_file "$DATADIR/archetypes"
3105 or die "unable to load archetypes\n";
3106} 3388}
3107 3389
3108sub reload_treasures { 3390sub reload_treasures {
3109 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
3110 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
3111} 3393}
3112 3394
3113sub reload_resources { 3395sub reload_resources {
3114 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
3115 3397
3398 reload_facedata;
3399 reload_archetypes;
3116 reload_regions; 3400 reload_regions;
3117 reload_facedata;
3118 #reload_archetypes;#d#
3119 reload_archetypes;
3120 reload_treasures; 3401 reload_treasures;
3121 3402
3122 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
3123} 3404}
3124 3405
3125sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3126 reload_resources; 3411 reload_resources;
3127} 3412}
3128 3413
3129sub reload_config { 3414sub reload_config {
3130 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
3131 or return; 3416 or return;
3132 3417
3133 local $/; 3418 local $/;
3134 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
3135 3420
3136 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3137 3422
3138 $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};
3139 $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};
3150sub main { 3435sub main {
3151 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
3152 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
3153 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#
3154 (async { 3439 (async {
3155 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
3156 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
3157 }; 3443 };
3158 3444
3445 {
3446 my $guard = freeze_mainloop;
3159 reload_config; 3447 reload_config;
3160 db_init; 3448 db_init;
3161 load_extensions; 3449 load_extensions;
3162 3450
3163 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3164 Event::loop; 3454 EV::loop;
3165} 3455}
3166 3456
3167############################################################################# 3457#############################################################################
3168# initialisation and cleanup 3458# initialisation and cleanup
3169 3459
3170# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3171BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3172 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3173 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3174 reentrant => 0,
3175 data => WF_AUTOCANCEL,
3176 signal => $signal,
3177 prio => 0,
3178 cb => sub {
3179 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3180 },
3181 ); 3466 };
3182 } 3467 }
3183} 3468}
3184 3469
3185sub write_runtime { 3470sub write_runtime_sync {
3186 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3187 3472
3188 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3189 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3190 3475
3216 and return; 3501 and return;
3217 3502
3218 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3219 3504
3220 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 };
3221} 3549}
3222 3550
3223sub emergency_save() { 3551sub emergency_save() {
3224 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3225 3553
3231 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
3232 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
3233 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
3234 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
3235 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3236 $pl->save; 3565 $pl->save;
3237 } 3566 }
3238 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
3239 3568
3240 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
3246 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3247 3576
3248 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3249 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3250 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";
3251 }; 3584 };
3252 3585
3253 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3254} 3587}
3255 3588
3257 my ($make_core) = @_; 3590 my ($make_core) = @_;
3258 3591
3259 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3260 if $make_core; 3593 if $make_core;
3261} 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
3262 3623
3263sub do_reload_perl() { 3624sub do_reload_perl() {
3264 # can/must only be called in main 3625 # can/must only be called in main
3265 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3266 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3267 return; 3628 return;
3268 } 3629 }
3269 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3270 warn "reloading..."; 3634 warn "reloading...";
3271 3635
3272 warn "entering sync_job"; 3636 warn "entering sync_job";
3273 3637
3274 cf::sync_job { 3638 cf::sync_job {
3275 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3276 cf::emergency_save; 3640 cf::emergency_save;
3277 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3278 3642
3279 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3280 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3281 3645
3282 # 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
3283 3647
3284 warn "cancelling all WF_AUTOCANCEL watchers";
3285 for (Event::all_watchers) {
3286 $_->cancel if $_->data & WF_AUTOCANCEL;
3287 }
3288
3289 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3290 for (;;) {
3291 BDB::flush;
3292 IO::AIO::flush;
3293 Coro::cede;
3294 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3295 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3296 }
3297
3298 ++$RELOAD;
3299
3300 warn "cancelling all extension coros";
3301 $_->cancel for values %EXT_CORO;
3302 %EXT_CORO = ();
3303
3304 warn "removing commands";
3305 %COMMAND = ();
3306
3307 warn "removing ext/exti commands";
3308 %EXTCMD = ();
3309 %EXTICMD = ();
3310
3311 warn "unloading/nuking all extensions";
3312 for my $pkg (@EXTS) {
3313 warn "... unloading $pkg";
3314
3315 if (my $cb = $pkg->can ("unload")) {
3316 eval {
3317 $cb->($pkg);
3318 1
3319 } or warn "$pkg unloaded, but with errors: $@";
3320 } 3651 }
3321 3652
3322 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3323 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3324 } 3655 %EXT_CORO = ();
3325 3656
3326 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3327 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3328 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3329 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3330 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3331 delete $INC{$k};
3332 3667
3333 $k =~ s/\.pm$//;
3334 $k =~ s/\//::/g;
3335
3336 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3337 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3338 } 3677 }
3339 3678
3340 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;
3341 } 3694 }
3342 3695
3343 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3344 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3345 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);
3346 3699
3347 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3348 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3349 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3350 3703
3351 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3352 # and global variables created in xs 3705 # and global variables created in xs
3353 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3354 3707
3355 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3356 3709
3357 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3358 require cf; 3711 require cf;
3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3360 3713
3361 warn "loading config and database again"; 3714 warn "loading config and database again";
3362 cf::reload_config; 3715 cf::reload_config;
3363 3716
3364 warn "loading extensions"; 3717 warn "loading extensions";
3365 cf::load_extensions; 3718 cf::load_extensions;
3366 3719
3367 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3368 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3369 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3370 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3371 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3372 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3373 3726
3374 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3375 3728
3376 1 3729 1
3377 } or do { 3730 } or do {
3378 warn $@; 3731 warn $@;
3379 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3380 exit 1;
3381 }; 3733 };
3382 3734
3383 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3384}; 3738};
3385 3739
3386our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3387 3741
3388sub reload_perl() { 3742sub reload_perl() {
3389 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3390 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3391 3745
3392 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3393 reentrant => 0,
3394 after => 0,
3395 data => WF_AUTOCANCEL,
3396 cb => sub {
3397 do_reload_perl; 3747 do_reload_perl;
3398 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3399 },
3400 ); 3749 };
3401} 3750}
3402 3751
3403register_command "reload" => sub { 3752register_command "reload" => sub {
3404 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3405 3754
3406 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
3407 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
3408 async { reload_perl }; 3759 reload_perl;
3760 };
3409 } 3761 }
3410}; 3762};
3411 3763
3412unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
3413 3765
3415 3767
3416our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3417our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3418 3770
3419sub wait_for_tick { 3771sub wait_for_tick {
3420 return unless $TICK_WATCHER->is_active;
3421 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3422 3773
3423 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3424 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3425 $signal->wait; 3776 $signal->wait;
3426} 3777}
3427 3778
3428sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3429 return unless $TICK_WATCHER->is_active;
3430 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3431 3781
3432 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3433 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3434 $signal->wait; 3784 $signal->wait;
3435} 3785}
3436 3786
3437 my $min = 1e6;#d# 3787sub tick {
3438 my $avg = 10;
3439$TICK_WATCHER = Event->timer (
3440 reentrant => 0,
3441 parked => 1,
3442 prio => 0,
3443 at => $NEXT_TICK || $TICK,
3444 data => WF_AUTOCANCEL,
3445 cb => sub {
3446 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3447 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"
3448 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3449 return; 3791 return;
3450 } 3792 }
3451 3793
3452 $NOW = $tick_start = Event::time;
3453
3454 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3455 3795
3456 0 && sync_job {#d# 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3457 for(1..10) { 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3458 my $t = Event::time; 3798 Coro::async_pool {
3459 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3799 $Coro::current->{desc} = "runtime saver";
3460 or die; 3800 write_runtime_sync
3461 3801 or warn "ERROR: unable to write runtime file: $!";
3462 $map->width (50);
3463 $map->height (50);
3464 $map->alloc;
3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3466 my $t = Event::time - $t;
3467
3468 #next unless $t < 0.0013;#d#
3469 if ($t < $min) {
3470 $min = $t;
3471 }
3472 $avg = $avg * 0.99 + $t * 0.01;
3473 }
3474 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3475 exit 0;
3476 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3477 }; 3802 };
3803 }
3478 3804
3479 $RUNTIME += $TICK;
3480 $NEXT_TICK += $TICK;
3481
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
3484 Coro::async_pool {
3485 write_runtime
3486 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 }
3489
3490# my $AFTER = Event::time;
3491# warn $AFTER - $NOW;#d#
3492
3493 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3494 $sig->send; 3806 $sig->send;
3495 } 3807 }
3496 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3497 $sig->send; 3809 $sig->send;
3498 } 3810 }
3499 3811
3500 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3501
3502 # if we are delayed by four ticks or more, skip them all
3503 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3504
3505 $TICK_WATCHER->at ($NEXT_TICK);
3506 $TICK_WATCHER->start;
3507
3508 $LOAD = ($NOW - $tick_start) / $TICK;
3509 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3510 3814
3511 _post_tick; 3815 if (0) {
3512 3816 if ($NEXT_TICK) {
3513 3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3514 }, 3821 }
3515); 3822}
3516 3823
3517{ 3824{
3518 BDB::max_poll_time $TICK * 0.1; 3825 # configure BDB
3519 $BDB_POLL_WATCHER = Event->io ( 3826
3520 reentrant => 0,
3521 fd => BDB::poll_fileno,
3522 poll => 'r',
3523 prio => 0,
3524 data => WF_AUTOCANCEL,
3525 cb => \&BDB::poll_cb,
3526 );
3527 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3528 3828 BDB::max_poll_reqs $TICK * 0.1;
3529 BDB::set_sync_prepare { 3829 $AnyEvent::BDB::WATCHER->priority (1);
3530 my $status;
3531 my $current = $Coro::current;
3532 (
3533 sub {
3534 $status = $!;
3535 $current->ready; undef $current;
3536 },
3537 sub {
3538 Coro::schedule while defined $current;
3539 $! = $status;
3540 },
3541 )
3542 };
3543 3830
3544 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3545 $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);
3546 3838
3547 cf::sync_job { 3839 cf::sync_job {
3548 eval { 3840 eval {
3549 BDB::db_env_open 3841 BDB::db_env_open
3550 $DB_ENV, 3842 $DB_ENV,
3552 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
3553 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3845 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3554 0666; 3846 0666;
3555 3847
3556 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3848 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3557
3558 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3559 $DB_ENV->set_lk_detect;
3560 }; 3849 };
3561 3850
3562 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3563 }; 3852 };
3564 } 3853 }
3854
3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3857 };
3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3860 };
3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3863 };
3565} 3864}
3566 3865
3567{ 3866{
3867 # configure IO::AIO
3868
3568 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3569
3570 undef $Coro::AIO::WATCHER;
3571 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3572 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3573 reentrant => 0,
3574 data => WF_AUTOCANCEL,
3575 fd => IO::AIO::poll_fileno,
3576 poll => 'r',
3577 prio => 6,
3578 cb => \&IO::AIO::poll_cb,
3579 );
3580} 3872}
3581 3873
3582my $_log_backtrace; 3874my $_log_backtrace;
3583 3875
3584sub _log_backtrace { 3876sub _log_backtrace {
3588 3880
3589 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3590 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3591 ++$_log_backtrace; 3883 ++$_log_backtrace;
3592 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3593 my @bt = fork_call { 3887 my @bt = fork_call {
3594 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3595 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3596 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 |"
3597 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines