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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines