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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
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
1276use Coro::AIO; 1396use Coro::AIO;
1277 1397
1278=head3 cf::player 1398=head3 cf::player
1279 1399
1280=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1281 1415
1282=item cf::player::find $login 1416=item cf::player::find $login
1283 1417
1284Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1285 1419
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1459
1326 my $f = new_from_file cf::object::thawer path $login 1460 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1461 or return;
1328 1462
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1463 my $pl = cf::player::load_pl $f
1331 or return; 1464 or return;
1465
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1466 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1467 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1335 } 1469 }
1336 } 1470 }
1346 1480
1347 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1348 1482
1349 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1485
1486 cf::get_slot 0.01;
1351 1487
1352 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1489 cf::cede_to_tick;
1354} 1490}
1355 1491
1391 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1392 $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
1393 1529
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1398 1536
1399 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1577
1440 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1441 my $path = path $login; 1579 my $path = path $login;
1442 1580
1443 # a .pst is a dead give-away for a valid player 1581 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1587 }
1449 1588
1486 1625
1487Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1488 1627
1489=cut 1628=cut
1490 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1491sub expand_cfpod { 1641sub expand_cfpod {
1492 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1493 1643
1494 # escape & and < 1644 my $xml;
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497 1645
1498 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1499 1649
1500 1 while 1650 $group =~ s/&/&amp;/g;
1501 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1502 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1503 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1504 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ 1655 ([BCGHITU])
1506 # replace G<male|female> tags 1656 <
1507 || s{G<([^>|]*)\|([^>]*)>}{ 1657 (?:
1508 $self->gender ? $2 : $1 1658 ([^<>]*) (?{ $group = $^N })
1509 }ge 1659 | < $interior >
1510 # replace H<hint text> 1660 )
1511 || s{H<([^\>]*)>} 1661 >
1662 %gcsx
1512 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "") 1683 "")
1516 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1517 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1518 1695
1696 for ($xml) {
1519 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1521 1699
1522 # compress some whitespace 1700 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1527 1706
1528 $_ 1707 $xml
1529} 1708}
1709
1710no re 'eval';
1530 1711
1531sub hintmode { 1712sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode} 1714 $_[0]{hintmode}
1534} 1715}
1606our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1608 1789
1609sub generate_random_map { 1790sub generate_random_map {
1610 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1611 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1796 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 1921
1738# the temporary/swap location 1922# the temporary/swap location
1739sub save_path { 1923sub save_path {
1740 my ($self) = @_; 1924 my ($self) = @_;
1741 1925
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1744} 1928}
1745 1929
1746# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1747sub uniq_path { 1931sub uniq_path {
1748 my ($self) = @_; 1932 my ($self) = @_;
1749 1933
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1752} 1936}
1753 1937
1754# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1755# all maps in C++... 1939# all maps in C++...
1853 2037
1854 cf::lock_wait "map_data:$path";#d#remove 2038 cf::lock_wait "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1856 2040
1857 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
1860 2044
1861 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1862 or return; 2046 or return;
1863 2047
1864 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1867 or return; 2051 or return;
1868 2052
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
1872 undef $guard1; 2057 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 2058 $map->reset;
1875 return find $path; 2059 return find $path;
1876 } 2060 }
1877 2061
1878 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1891 2075
1892 { 2076 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1894 2078
1895 return unless $self->valid; 2079 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2081
1898 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1899 2083
1900 $self->alloc; 2084 $self->alloc;
1901 2085
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2090 $f->skip_block;
1907 $self->_load_objects ($f) 2091 $self->_load_objects ($f)
1908 or return; 2092 or return;
1909 2093
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1911 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1912 2096
1913 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2098 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2099 unless (aio_stat $uniq) {
1941 } 2125 }
1942 2126
1943 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
1945 2129
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2131 }
1948 2132
1949 $self->post_load; 2133 $self->post_load;
1950} 2134}
1951 2135
2009 my ($path, $origin, $load) = @_; 2193 my ($path, $origin, $load) = @_;
2010 2194
2011 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
2012 2196
2013 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2199 }
2016 2200
2017 $MAP_PREFETCH{$path} |= $load; 2201 $MAP_PREFETCH{$path} |= $load;
2018 2202
2019 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
2020 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2208 if (my $map = find $k) {
2023 $map->load if $v; 2209 $map->load if $v;
2024 } 2210 }
2050 return if $self->{deny_save}; 2236 return if $self->{deny_save};
2051 2237
2052 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
2053 2239
2054 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2056 }; 2243 };
2244
2245 cf::get_slot 0.02;
2057 2246
2058 if ($uniq) { 2247 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2250 } else {
2070 $self->save; 2259 $self->save;
2071 2260
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2262
2074 return if $self->players; 2263 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2077 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2078 $self->deactivate; 2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2271 $self->clear;
2080 $self->in_memory (cf::MAP_SWAPPED);
2081} 2272}
2082 2273
2083sub reset_at { 2274sub reset_at {
2084 my ($self) = @_; 2275 my ($self) = @_;
2085 2276
2118 } 2309 }
2119 2310
2120 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
2121 2312
2122 $self->deactivate; 2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2123 $self->clear; 2315 $self->clear;
2124
2125 $_->clear_links_to ($self) for values %cf::MAP;
2126 2316
2127 $self->unlink_save; 2317 $self->unlink_save;
2128 $self->destroy; 2318 $self->destroy;
2129} 2319}
2130 2320
2197 2387
2198sub unique_maps() { 2388sub unique_maps() {
2199 [ 2389 [
2200 map { 2390 map {
2201 utf8::decode $_; 2391 utf8::decode $_;
2202 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2203 ? normalise $_ 2395 : normalise $_
2204 : ()
2205 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2206 ] 2397 ]
2207} 2398}
2208 2399
2209package cf;
2210
2211=back 2400=back
2212 2401
2213=head3 cf::object 2402=head3 cf::object
2214 2403
2215=cut 2404=cut
2218 2407
2219=over 4 2408=over 4
2220 2409
2221=item $ob->inv_recursive 2410=item $ob->inv_recursive
2222 2411
2223Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2224 2414
2225=cut 2415=cut
2226 2416
2227sub inv_recursive_; 2417sub inv_recursive_;
2228sub inv_recursive_ { 2418sub inv_recursive_ {
2233 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2234} 2424}
2235 2425
2236=item $ref = $ob->ref 2426=item $ref = $ob->ref
2237 2427
2238creates and returns a persistent reference to an objetc that can be stored as a string. 2428Creates and returns a persistent reference to an object that can be stored as a string.
2239 2429
2240=item $ob = cf::object::deref ($refstring) 2430=item $ob = cf::object::deref ($refstring)
2241 2431
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block. 2433even if the object actually exists. May block.
2245=cut 2435=cut
2246 2436
2247sub deref { 2437sub deref {
2248 my ($ref) = @_; 2438 my ($ref) = @_;
2249 2439
2250 # temporary compatibility#TODO#remove
2251 $ref =~ s{^<}{player/<};
2252
2253 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2254 my ($uuid, $name) = ($1, $2); 2441 my ($uuid, $name) = ($1, $2);
2255 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2256 or return; 2443 or return;
2257 $pl->ob->uuid eq $uuid 2444 $pl->ob->uuid eq $uuid
2258 or return; 2445 or return;
2278can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2279dialogue with the given NPC character. 2466dialogue with the given NPC character.
2280 2467
2281=cut 2468=cut
2282 2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2483
2283# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2284# with dialog boxes. 2485# with dialog boxes.
2285#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2286sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2287 my ($self, $npc, $msg, $flags) = @_; 2488 my ($self, $npc, $msg, $flags) = @_;
2298 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2299 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2300 2501
2301 } else { 2502 } else {
2302 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2303 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2304 } 2505 }
2305 } 2506 }
2306} 2507}
2307 2508
2308=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2416her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2417that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2418the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2419be called at the end of this process. 2620be called at the end of this process.
2420 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2421=cut 2625=cut
2422 2626
2423our $GOTOGEN; 2627our $GOTOGEN;
2424 2628
2425sub cf::object::player::goto { 2629sub cf::object::player::goto {
2429 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2430 2634
2431 $self->enter_link; 2635 $self->enter_link;
2432 2636
2433 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
2434 my $map = eval { 2659 my $map = eval {
2435 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2436 2661
2437 if ($map) { 2662 if ($map) {
2438 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2439 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2440 } else { 2665 } else {
2441 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2442 } 2667 }
2443 2668
2444 $map 2669 $map
2445 }; 2670 };
2446 2671
2482} 2707}
2483 2708
2484sub prepare_random_map { 2709sub prepare_random_map {
2485 my ($exit) = @_; 2710 my ($exit) = @_;
2486 2711
2487 my $guard = cf::lock_acquire "exit_prepare:$exit";
2488
2489 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2490 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2491 # that depends on the exit object 2714 # that depends on the exit object
2492 2715
2493 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2495 if ($exit->map) { 2718 if ($exit->map) {
2496 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2497 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2498 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2499 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2500 } 2725 }
2501 2726
2502 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2503 2728
2504 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2505 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2506 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2507 2732
2508 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2509 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2510 undef $fh; 2735 undef $fh;
2511 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2512 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2513 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2514 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2515 } 2744 }
2516} 2745}
2517 2746
2518sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2519 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2520 2749
2521 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2522 2751
2523 if ($exit->slaying eq "/!") {
2524 #TODO: this should de-fi-ni-te-ly not be a sync-job
2525 # the problem is that $exit might not survive long enough
2526 # so it needs to be done right now, right here
2527 cf::sync_job { prepare_random_map $exit };
2528 }
2529
2530 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2531 my $hp = $exit->stats->hp;
2532 my $sp = $exit->stats->sp;
2533
2534 $self->enter_link; 2752 $self->enter_link;
2535 2753
2536 # if exit is damned, update players death & WoR home-position
2537 $self->contr->savebed ($slaying, $hp, $sp)
2538 if $exit->flag (FLAG_DAMNED);
2539
2540 (async { 2754 (async {
2541 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2542 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2543 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2544 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2545 1; 2778 1
2546 }) { 2779 }) {
2547 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2548 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2549 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2550 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2580the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2581the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2582 2815
2583=cut 2816=cut
2584 2817
2818# non-persistent channels (usually the info channel)
2585our %CHANNEL = ( 2819our %CHANNEL = (
2586 "c/identify" => { 2820 "c/identify" => {
2587 id => "identify", 2821 id => "infobox",
2588 title => "Identify", 2822 title => "Identify",
2589 reply => undef, 2823 reply => undef,
2590 tooltip => "Items recently identified", 2824 tooltip => "Items recently identified",
2591 }, 2825 },
2592 "c/examine" => { 2826 "c/examine" => {
2593 id => "examine", 2827 id => "infobox",
2594 title => "Examine", 2828 title => "Examine",
2595 reply => undef, 2829 reply => undef,
2596 tooltip => "Signs and other items you examined", 2830 tooltip => "Signs and other items you examined",
2597 }, 2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2598); 2874);
2599 2875
2600sub cf::client::send_msg { 2876sub cf::client::send_msg {
2601 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2602 2878
2603 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2604 2880
2605 $color &= cf::NDI_CLIENT_MASK; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2606 2882
2607 # check predefined channels, for the benefit of C 2883 # check predefined channels, for the benefit of C
2608 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2609 2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2610 if (ref $channel) { 2892 } elsif (ref $channel) {
2611 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2612 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2613 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2614 $self->ext_msg (channel_info => $channel) 2896 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg; 2897 if $self->can_msg;
2832=pod 3114=pod
2833 3115
2834The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2835 3117
2836 cf::object 3118 cf::object
2837 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2838 insert remove name archname title slaying race decrease_ob_nr 3120 insert remove name archname title slaying race decrease split
2839 3121
2840 cf::object::player 3122 cf::object::player
2841 player 3123 player
2842 3124
2843 cf::player 3125 cf::player
2848 3130
2849=cut 3131=cut
2850 3132
2851for ( 3133for (
2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2853 insert remove inv name archname title slaying race 3135 insert remove inv nrof name archname title slaying race
2854 decrease_ob_nr)], 3136 decrease split destroy change_exp)],
2855 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2856 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2857 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2858) { 3140) {
2859 no strict 'refs'; 3141 no strict 'refs';
2964 { 3246 {
2965 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
2966 3248
2967 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
2968 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
2969 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
2970 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2973 3256
2974 cf::cede_to_tick; 3257 cf::cede_to_tick;
2975 } 3258 }
2976 3259
2977 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
2978 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
2979 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
2980 or next; 3264 or next;
3265
2981 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
2982 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
2983 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2984 } else { 3269 } else {
2985 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
3003 { 3288 {
3004 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
3005 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
3006 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
3007 3292
3008 my $soundconf = delete $res->{"res/sound.conf"};
3009
3010 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3011 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data; 3296 my $data;
3013 3297
3014 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
3015 # prepend meta info 3299 # prepend meta info
3016 3300
3017 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
3018 name => $name, 3302 name => $name,
3019 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
3020 }); 3304 });
3021 3305
3022 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3023 } else { 3313 } else {
3024 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
3025 } 3315 }
3026 3316
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3028 cf::face::set_type $idx, $info->{type};
3029
3030 cf::cede_to_tick; 3317 cf::cede_to_tick;
3031 } 3318 }
3032
3033 if ($soundconf) {
3034 $soundconf = $enc->decode (delete $soundconf->{data});
3035
3036 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3037 my $sound = $soundconf->{compat}[$_]
3038 or next;
3039
3040 my $face = cf::face::find "sound/$sound->[1]";
3041 cf::sound::set $sound->[0] => $face;
3042 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3043 }
3044
3045 while (my ($k, $v) = each %{$soundconf->{event}}) {
3046 my $face = cf::face::find "sound/$v";
3047 cf::sound::set $k => $face;
3048 }
3049 }
3050 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3051 3322
3052 1 3323 1
3053} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3054 3345
3055register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
3056 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
3057 3348
3058 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
3059 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
3060 } 3351 }
3061}; 3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3062 3363
3063sub reload_regions { 3364sub reload_regions {
3064 # HACK to clear player env face cache, we need some signal framework 3365 # HACK to clear player env face cache, we need some signal framework
3065 # for this (global event?) 3366 # for this (global event?)
3066 %ext::player_env::MUSIC_FACE_CACHE = (); 3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3080} 3381}
3081 3382
3082sub reload_archetypes { 3383sub reload_archetypes {
3083 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
3084 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
3085 #d# NEED to laod twice to resolve forward references
3086 # this really needs to be done in an extra post-pass
3087 # (which needs to be synchronous, so solve it differently)
3088 load_resource_file "$DATADIR/archetypes"
3089 or die "unable to load archetypes\n";
3090} 3386}
3091 3387
3092sub reload_treasures { 3388sub reload_treasures {
3093 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
3094 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
3095} 3391}
3096 3392
3097sub reload_resources { 3393sub reload_resources {
3098 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
3099 3395
3396 reload_facedata;
3397 reload_archetypes;
3100 reload_regions; 3398 reload_regions;
3101 reload_facedata;
3102 #reload_archetypes;#d#
3103 reload_archetypes;
3104 reload_treasures; 3399 reload_treasures;
3105 3400
3106 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
3107} 3402}
3108 3403
3109sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3110 reload_resources; 3409 reload_resources;
3111} 3410}
3112 3411
3113sub reload_config { 3412sub reload_config {
3114 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
3115 or return; 3414 or return;
3116 3415
3117 local $/; 3416 local $/;
3118 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
3119 3418
3120 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3121 3420
3122 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3123 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3134sub main { 3433sub main {
3135 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3136 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3137 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3138 (async { 3437 (async {
3139 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
3140 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3141 }; 3441 };
3142 3442
3443 {
3444 my $guard = freeze_mainloop;
3143 reload_config; 3445 reload_config;
3144 db_init; 3446 db_init;
3145 load_extensions; 3447 load_extensions;
3146 3448
3147 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3148 Event::loop; 3452 EV::loop;
3149} 3453}
3150 3454
3151############################################################################# 3455#############################################################################
3152# initialisation and cleanup 3456# initialisation and cleanup
3153 3457
3154# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3155BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3156 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3157 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3158 reentrant => 0,
3159 data => WF_AUTOCANCEL,
3160 signal => $signal,
3161 prio => 0,
3162 cb => sub {
3163 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3164 },
3165 ); 3464 };
3166 } 3465 }
3167} 3466}
3168 3467
3169sub write_runtime { 3468sub write_runtime_sync {
3170 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3171 3470
3172 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3173 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3174 3473
3200 and return; 3499 and return;
3201 3500
3202 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3203 3502
3204 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3205} 3547}
3206 3548
3207sub emergency_save() { 3549sub emergency_save() {
3208 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3209 3551
3215 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
3216 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
3217 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
3218 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
3219 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3220 $pl->save; 3563 $pl->save;
3221 } 3564 }
3222 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
3223 3566
3224 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
3230 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3231 3574
3232 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3233 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3234 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3235 }; 3582 };
3236 3583
3237 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3238} 3585}
3239 3586
3241 my ($make_core) = @_; 3588 my ($make_core) = @_;
3242 3589
3243 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3244 if $make_core; 3591 if $make_core;
3245} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3246 3621
3247sub do_reload_perl() { 3622sub do_reload_perl() {
3248 # can/must only be called in main 3623 # can/must only be called in main
3249 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3250 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3251 return; 3626 return;
3252 } 3627 }
3253 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3254 warn "reloading..."; 3632 warn "reloading...";
3255 3633
3256 warn "entering sync_job"; 3634 warn "entering sync_job";
3257 3635
3258 cf::sync_job { 3636 cf::sync_job {
3259 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3260 cf::emergency_save; 3638 cf::emergency_save;
3261 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3262 3640
3263 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3264 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3265 3643
3266 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3267 3645
3268 warn "cancelling all WF_AUTOCANCEL watchers";
3269 for (Event::all_watchers) {
3270 $_->cancel if $_->data & WF_AUTOCANCEL;
3271 }
3272
3273 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3274 for (;;) {
3275 BDB::flush;
3276 IO::AIO::flush;
3277 Coro::cede;
3278 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3279 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3280 }
3281
3282 ++$RELOAD;
3283
3284 warn "cancelling all extension coros";
3285 $_->cancel for values %EXT_CORO;
3286 %EXT_CORO = ();
3287
3288 warn "removing commands";
3289 %COMMAND = ();
3290
3291 warn "removing ext/exti commands";
3292 %EXTCMD = ();
3293 %EXTICMD = ();
3294
3295 warn "unloading/nuking all extensions";
3296 for my $pkg (@EXTS) {
3297 warn "... unloading $pkg";
3298
3299 if (my $cb = $pkg->can ("unload")) {
3300 eval {
3301 $cb->($pkg);
3302 1
3303 } or warn "$pkg unloaded, but with errors: $@";
3304 } 3649 }
3305 3650
3306 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3307 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3308 } 3653 %EXT_CORO = ();
3309 3654
3310 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3311 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3312 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3313 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3314 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3315 delete $INC{$k};
3316 3665
3317 $k =~ s/\.pm$//;
3318 $k =~ s/\//::/g;
3319
3320 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3321 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3322 } 3675 }
3323 3676
3324 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3325 } 3692 }
3326 3693
3327 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3328 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3329 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3330 3697
3331 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3332 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3333 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3334 3701
3335 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3336 # and global variables created in xs 3703 # and global variables created in xs
3337 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3338 3705
3339 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3340 3707
3341 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3342 require cf; 3709 require cf;
3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3344 3711
3345 warn "loading config and database again"; 3712 warn "loading config and database again";
3346 cf::reload_config; 3713 cf::reload_config;
3347 3714
3348 warn "loading extensions"; 3715 warn "loading extensions";
3349 cf::load_extensions; 3716 cf::load_extensions;
3350 3717
3351 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3352 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3353 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3354 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3355 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3356 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3357 3724
3358 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3359 3726
3360 1 3727 1
3361 } or do { 3728 } or do {
3362 warn $@; 3729 warn $@;
3363 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3364 exit 1;
3365 }; 3731 };
3366 3732
3367 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3368}; 3736};
3369 3737
3370our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3371 3739
3372sub reload_perl() { 3740sub reload_perl() {
3373 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3374 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3375 3743
3376 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3377 reentrant => 0,
3378 after => 0,
3379 data => WF_AUTOCANCEL,
3380 cb => sub {
3381 do_reload_perl; 3745 do_reload_perl;
3382 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3383 },
3384 ); 3747 };
3385} 3748}
3386 3749
3387register_command "reload" => sub { 3750register_command "reload" => sub {
3388 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3389 3752
3390 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3391 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3392 async { reload_perl }; 3757 reload_perl;
3758 };
3393 } 3759 }
3394}; 3760};
3395 3761
3396unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3397 3763
3399 3765
3400our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3401our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3402 3768
3403sub wait_for_tick { 3769sub wait_for_tick {
3404 return unless $TICK_WATCHER->is_active;
3405 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3406 3771
3407 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3408 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3409 $signal->wait; 3774 $signal->wait;
3410} 3775}
3411 3776
3412sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3413 return unless $TICK_WATCHER->is_active;
3414 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3415 3779
3416 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3417 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3418 $signal->wait; 3782 $signal->wait;
3419} 3783}
3420 3784
3421 my $min = 1e6;#d# 3785sub tick {
3422 my $avg = 10;
3423$TICK_WATCHER = Event->timer (
3424 reentrant => 0,
3425 parked => 1,
3426 prio => 0,
3427 at => $NEXT_TICK || $TICK,
3428 data => WF_AUTOCANCEL,
3429 cb => sub {
3430 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3431 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3432 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3433 return; 3789 return;
3434 } 3790 }
3435 3791
3436 $NOW = $tick_start = Event::time;
3437
3438 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3439 3793
3440 0 && sync_job {#d# 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3441 for(1..10) { 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3442 my $t = Event::time; 3796 Coro::async_pool {
3443 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3797 $Coro::current->{desc} = "runtime saver";
3444 or die; 3798 write_runtime_sync
3445 3799 or warn "ERROR: unable to write runtime file: $!";
3446 $map->width (50);
3447 $map->height (50);
3448 $map->alloc;
3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3450 my $t = Event::time - $t;
3451
3452 #next unless $t < 0.0013;#d#
3453 if ($t < $min) {
3454 $min = $t;
3455 }
3456 $avg = $avg * 0.99 + $t * 0.01;
3457 }
3458 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3459 exit 0;
3460 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3461 }; 3800 };
3801 }
3462 3802
3463 $RUNTIME += $TICK;
3464 $NEXT_TICK += $TICK;
3465
3466 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3467 $NEXT_RUNTIME_WRITE = $NOW + 10;
3468 Coro::async_pool {
3469 write_runtime
3470 or warn "ERROR: unable to write runtime file: $!";
3471 };
3472 }
3473
3474# my $AFTER = Event::time;
3475# warn $AFTER - $NOW;#d#
3476
3477 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3478 $sig->send; 3804 $sig->send;
3479 } 3805 }
3480 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3481 $sig->send; 3807 $sig->send;
3482 } 3808 }
3483 3809
3484 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3485
3486 # if we are delayed by four ticks or more, skip them all
3487 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3488
3489 $TICK_WATCHER->at ($NEXT_TICK);
3490 $TICK_WATCHER->start;
3491
3492 $LOAD = ($NOW - $tick_start) / $TICK;
3493 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3494 3812
3495 _post_tick; 3813 if (0) {
3496 3814 if ($NEXT_TICK) {
3497 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3498 }, 3819 }
3499); 3820}
3500 3821
3501{ 3822{
3502 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
3503 $BDB_POLL_WATCHER = Event->io ( 3824
3504 reentrant => 0,
3505 fd => BDB::poll_fileno,
3506 poll => 'r',
3507 prio => 0,
3508 data => WF_AUTOCANCEL,
3509 cb => \&BDB::poll_cb,
3510 );
3511 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3512 3826 BDB::max_poll_reqs $TICK * 0.1;
3513 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
3514 my $status;
3515 my $current = $Coro::current;
3516 (
3517 sub {
3518 $status = $!;
3519 $current->ready; undef $current;
3520 },
3521 sub {
3522 Coro::schedule while defined $current;
3523 $! = $status;
3524 },
3525 )
3526 };
3527 3828
3528 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3529 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3530 3836
3531 cf::sync_job { 3837 cf::sync_job {
3532 eval { 3838 eval {
3533 BDB::db_env_open 3839 BDB::db_env_open
3534 $DB_ENV, 3840 $DB_ENV,
3536 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3537 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3538 0666; 3844 0666;
3539 3845
3540 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3541
3542 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3543 $DB_ENV->set_lk_detect;
3544 }; 3847 };
3545 3848
3546 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3547 }; 3850 };
3548 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
3549} 3862}
3550 3863
3551{ 3864{
3865 # configure IO::AIO
3866
3552 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3553
3554 undef $Coro::AIO::WATCHER;
3555 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3556 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3557 reentrant => 0,
3558 data => WF_AUTOCANCEL,
3559 fd => IO::AIO::poll_fileno,
3560 poll => 'r',
3561 prio => 6,
3562 cb => \&IO::AIO::poll_cb,
3563 );
3564} 3870}
3565 3871
3566my $_log_backtrace; 3872my $_log_backtrace;
3567 3873
3568sub _log_backtrace { 3874sub _log_backtrace {
3572 3878
3573 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3574 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3575 ++$_log_backtrace; 3881 ++$_log_backtrace;
3576 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3577 my @bt = fork_call { 3885 my @bt = fork_call {
3578 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3579 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3580 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3581 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines