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.445 by root, Wed Sep 10 18:18:10 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 69
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
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
52our %COMMAND = (); 74our %COMMAND = ();
59our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
60 82
61our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
62our @EVENT; 84our @EVENT;
63 85
64our $CONFDIR = confdir; 86our $CONFDIR = confdir;
65our $DATADIR = datadir; 87our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
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 $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
75 101
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 104our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
83 106
107our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 109our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 110our $DB_ENV;
86 111
87our %CFG; 112our %CFG;
88 113
89our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 115our $RUNTIME;
116our $NOW;
91 117
92our (%PLAYER, %PLAYER_LOADING); # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 119our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
95 121
96# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 124
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
102 129
103binmode STDOUT; 130binmode STDOUT;
104binmode STDERR; 131binmode STDERR;
105 132
106# read virtual server time, if available 133# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
111} 138}
112 139
113mkdir $_ 140mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 186
160The raw value load value from the last tick. 187The raw value load value from the last tick.
161 188
162=item %cf::CFG 189=item %cf::CFG
163 190
164Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 192from wherever your confdir points to.
166 193
167=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
168 195
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 214 $msg .= "\n"
188 unless $msg =~ /\n$/; 215 unless $msg =~ /\n$/;
189 216
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 218
192 utf8::encode $msg;
193 LOG llevError, $msg; 219 LOG llevError, $msg;
194 }; 220 };
195} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
196 237
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 248for my $pkg (qw(
208 cf::global cf::attachable 249 cf::global cf::attachable
209 cf::object cf::object::player 250 cf::object cf::object::player
210 cf::client cf::player 251 cf::client cf::player
211 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
212 cf::map cf::party cf::region 254 cf::party cf::region
213)) { 255)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 257}
217 258
218$Event::DIED = sub { 259$EV::DIED = sub {
219 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
220}; 261};
221 262
222############################################################################# 263#############################################################################
223 264
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 288 $d
248 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
249} 290}
250 291
251=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
252 293
253Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
254 295
255=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
256 297
257Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
258 299
259=cut 300=cut
260 301
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 303
263sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
265 306
266=item cf::lock_wait $string 307=item cf::lock_wait $string
267 308
268Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
269 310
325 366
326 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
327} 368}
328 369
329sub freeze_mainloop { 370sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
331 372
332 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
333 $TICK_WATCHER->start; 374}
334 }; 375
335 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
336 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
337} 389}
338 390
339=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
340 392
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 404our @SLOT_QUEUE;
353our $SLOT_QUEUE; 405our $SLOT_QUEUE;
354 406
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 407$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 408$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager");
410
357 my $signal = new Coro::Signal; 411 my $signal = new Coro::Signal;
358 412
359 while () { 413 while () {
360 next_job: 414 next_job:
361 my $avail = cf::till_tick; 415 my $avail = cf::till_tick;
369 } 423 }
370 } 424 }
371 } 425 }
372 426
373 if (@SLOT_QUEUE) { 427 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 428 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 429 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 430 $signal->wait;
377 } else { 431 } else {
378 Coro::schedule; 432 Coro::schedule;
379 } 433 }
380 } 434 }
381}; 435};
382 436
383sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
384 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
385 441
386 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
388 444
402 458
403BEGIN { *async = \&Coro::async_pool } 459BEGIN { *async = \&Coro::async_pool }
404 460
405=item cf::sync_job { BLOCK } 461=item cf::sync_job { BLOCK }
406 462
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 463The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 464is 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 465partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 466acceptable.
411 467
412If it must be done, put the blocking parts into C<sync_job>. This will run 468If 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 469the given BLOCK in another coroutine while waiting for the result. The
418 474
419sub sync_job(&) { 475sub sync_job(&) {
420 my ($job) = @_; 476 my ($job) = @_;
421 477
422 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 479 my $time = EV::time;
424 480
425 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
427 483
428 # TODO: use suspend/resume instead 484 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 485
430 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
431 487
432 my $busy = 1; 488 my $busy = 1;
433 my @res; 489 my @res;
434 490
435 (async { 491 (async {
492 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 493 @res = eval { $job->() };
437 warn $@ if $@; 494 warn $@ if $@;
438 undef $busy; 495 undef $busy;
439 })->prio (Coro::PRIO_MAX); 496 })->prio (Coro::PRIO_MAX);
440 497
441 while ($busy) { 498 while ($busy) {
442 Coro::cede or Event::one_event; 499 if (Coro::nready) {
500 Coro::cede_notself;
501 } else {
502 EV::loop EV::LOOP_ONESHOT;
443 } 503 }
504 }
444 505
445 $time = Event::time - $time; 506 my $time = EV::time - $time;
446 507
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 508 $TICK_START += $time; # do not account sync jobs to server load
451 509
452 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
453 } else { 511 } else {
454 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
455 513
480=item fork_call { }, $args 538=item fork_call { }, $args
481 539
482Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
486 544
487=cut 545=cut
488 546
489sub fork_call(&@) { 547sub fork_call(&@) {
490 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
499 }, @args; 557 }, @args;
500 558
501 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
502} 560}
503 561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
587}
588
504=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
505 590
506Returns a single value from the environment database. 591Returns a single value from the environment database.
507 592
508=item cf::db_put $family => $key => $value 593=item cf::db_put $family => $key => $value
509 594
510Stores the given C<$value> in the family. It can currently store binary 595Stores 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). 596data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 597
598=item $db = cf::db_table "name"
599
600Create and/or open a new database table. The string must not be "db" and must be unique
601within each server.
602
513=cut 603=cut
604
605sub db_table($) {
606 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV;
608
609 eval {
610 $db->set_flags (BDB::CHKSUM);
611
612 utf8::encode $name;
613 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
614 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
615 cf::cleanup "db_open(db): $!" if $!;
616 };
617 cf::cleanup "db_open(db): $@" if $@;
618
619 $db
620}
514 621
515our $DB; 622our $DB;
516 623
517sub db_init { 624sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 625 cf::sync_job {
522 eval { 626 $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 } 627 };
532} 628}
533 629
534sub db_get($$) { 630sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 631 my $key = "$_[0]/$_[1]";
536 632
640attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
642 738
643In the following description, CLASS can be any of C<global>, C<object> 739In 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 740C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 741Deliantra).
646 742
647=over 4 743=over 4
648 744
649=item $attachable->attach ($attachment, key => $value...) 745=item $attachable->attach ($attachment, key => $value...)
650 746
932 } 1028 }
933 1029
934 0 1030 0
935} 1031}
936 1032
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1034
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1036
941Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
942 1038
948 1044
949=cut 1045=cut
950 1046
951############################################################################# 1047#############################################################################
952# object support 1048# object support
953#
954 1049
1050sub _object_equal($$);
1051sub _object_equal($$) {
1052 my ($a, $b) = @_;
1053
1054 return 0 unless (ref $a) eq (ref $b);
1055
1056 if ("HASH" eq ref $a) {
1057 my @ka = keys %$a;
1058 my @kb = keys %$b;
1059
1060 return 0 if @ka != @kb;
1061
1062 for (0 .. $#ka) {
1063 return 0 unless $ka[$_] eq $kb[$_];
1064 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1065 }
1066
1067 } elsif ("ARRAY" eq ref $a) {
1068
1069 return 0 if @$a != @$b;
1070
1071 for (0 .. $#$a) {
1072 return 0 unless _object_equal $a->[$_], $b->[$_];
1073 }
1074
1075 } elsif ($a ne $b) {
1076 return 0;
1077 }
1078
1079 1
1080}
1081
1082our $SLOW_MERGES;#d#
955sub _can_merge { 1083sub _can_merge {
956 my ($ob1, $ob2) = @_; 1084 my ($ob1, $ob2) = @_;
957 1085
958 local $Storable::canonical = 1; 1086 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1087
962 $fob1 eq $fob2 1088 # we do the slow way here
1089 return _object_equal $ob1, $ob2
963} 1090}
964 1091
965sub reattach { 1092sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1094 my ($obj) = @_;
968 1095
1096 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1098
971 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
972 1100
973 @$registry = (); 1101 @$registry = ();
974 1102
989cf::attachable->attach ( 1117cf::attachable->attach (
990 prio => -1000000, 1118 prio => -1000000,
991 on_instantiate => sub { 1119 on_instantiate => sub {
992 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
993 1121
994 $data = from_json $data; 1122 $data = decode_json $data;
995 1123
996 for (@$data) { 1124 for (@$data) {
997 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
998 1126
999 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1013); 1141);
1014 1142
1015sub object_freezer_save { 1143sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1144 my ($filename, $rdata, $objs) = @_;
1017 1145
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1146 sync_job {
1021 if (length $$rdata) { 1147 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1024 1151
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1156 aio_close $fh;
1030 1157
1031 if (@$objs) { 1158 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1164 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1166 }
1040 } else { 1167 } else {
1041 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1042 } 1169 }
1048 } else { 1175 } else {
1049 aio_unlink $filename; 1176 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1051 } 1178 }
1052 }; 1179 };
1053
1054 undef $guard;
1055} 1180}
1056 1181
1057sub object_freezer_as_string { 1182sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1059 1184
1064 1189
1065sub object_thawer_load { 1190sub object_thawer_load {
1066 my ($filename) = @_; 1191 my ($filename) = @_;
1067 1192
1068 my ($data, $av); 1193 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1194
1072 (aio_load $filename, $data) >= 0 1195 (aio_load $filename, $data) >= 0
1073 or return; 1196 or return;
1074 1197
1075 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1200 or return;
1078 1201
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1081 } 1204 }
1082 1205
1206 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1085 1209
1086 ($data, $av) 1210 ($data, $av)
1087} 1211}
1088 1212
1089=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1214 1338
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1341
1218 $ext{source} = 1342 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1221 . $source 1345 . $source
1222 . "\n};\n1"; 1346 . "\n};\n1";
1223 1347
1224 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1242 1366
1243 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1368 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1370 }
1248 1371
1249 warn $msg; 1372 warn $msg;
1250 } 1373 }
1251 1374
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1461 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1462
1340 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1464 or return;
1342 1465
1343 $f->next;
1344 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1345 or return; 1467 or return;
1468
1346 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1348 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1349 } 1472 }
1350 } 1473 }
1360 1483
1361 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1362 1485
1363 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1364 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1365 1490
1366 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1367 cf::cede_to_tick; 1492 cf::cede_to_tick;
1368} 1493}
1369 1494
1401 my ($pl) = @_; 1526 my ($pl) = @_;
1402 1527
1403 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1404 1529
1405 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1406 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1407 1532
1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1409 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1410 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1411 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1412 1539
1413 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1414 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1453 1580
1454 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1455 my $path = path $login; 1582 my $path = path $login;
1456 1583
1457 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1460 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1461 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 } 1590 }
1463 1591
1498 1626
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500 1628
1501Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1502 1630
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
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}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1550=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1551 1632
1552Sends an ext reply to the player. 1633Sends an ext reply to the player.
1553 1634
1554=cut 1635=cut
1620our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1621our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1622 1703
1623sub generate_random_map { 1704sub generate_random_map {
1624 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1625 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1626 $self->_create_random_map ( 1710 $self->_create_random_map (
1627 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1628 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1629 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1751 1835
1752# the temporary/swap location 1836# the temporary/swap location
1753sub save_path { 1837sub save_path {
1754 my ($self) = @_; 1838 my ($self) = @_;
1755 1839
1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1757 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1758} 1842}
1759 1843
1760# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1761sub uniq_path { 1845sub uniq_path {
1762 my ($self) = @_; 1846 my ($self) = @_;
1763 1847
1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1765 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1766} 1850}
1767 1851
1768# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1769# all maps in C++... 1853# all maps in C++...
1867 1951
1868 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1869 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1870 1954
1871 $cf::MAP{$path} || do { 1955 $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 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1874 1958
1875 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1876 or return; 1960 or return;
1877 1961
1878 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1881 or return; 1965 or return;
1882 1966
1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1884 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1885 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1886 undef $guard1; 1971 undef $guard1;
1887 undef $guard2;
1888 $map->reset; 1972 $map->reset;
1889 return find $path; 1973 return find $path;
1890 } 1974 }
1891 1975
1892 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1919 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block; 2004 $f->skip_block;
1921 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
1922 or return; 2006 or return;
1923 2007
1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1925 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1926 2010
1927 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1928 utf8::encode $uniq; 2012 utf8::encode $uniq;
1929 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
1955 } 2039 }
1956 2040
1957 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
1959 2043
1960 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
1961 } 2045 }
1962 2046
1963 $self->post_load; 2047 $self->post_load;
1964} 2048}
1965 2049
2023 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2024 2108
2025 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2026 2110
2027 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2029 } 2113 }
2030 2114
2031 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2032 2116
2033 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2118 $Coro::current->{desc} = "map prefetcher";
2119
2034 while (%MAP_PREFETCH) { 2120 while (%MAP_PREFETCH) {
2035 while (my ($k, $v) = each %MAP_PREFETCH) { 2121 while (my ($k, $v) = each %MAP_PREFETCH) {
2036 if (my $map = find $k) { 2122 if (my $map = find $k) {
2037 $map->load if $v; 2123 $map->load if $v;
2038 } 2124 }
2064 return if $self->{deny_save}; 2150 return if $self->{deny_save};
2065 2151
2066 local $self->{last_access} = $self->last_access;#d# 2152 local $self->{last_access} = $self->last_access;#d#
2067 2153
2068 cf::async { 2154 cf::async {
2155 $Coro::current->{desc} = "map player save";
2069 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2070 }; 2157 };
2158
2159 cf::get_slot 0.02;
2071 2160
2072 if ($uniq) { 2161 if ($uniq) {
2073 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2074 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2075 } else { 2164 } else {
2084 $self->save; 2173 $self->save;
2085 2174
2086 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2087 2176
2088 return if $self->players; 2177 return if $self->players;
2089 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2090 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2091 2180
2092 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2093 2182
2094 $self->deactivate; 2183 $self->deactivate;
2212 2301
2213sub unique_maps() { 2302sub unique_maps() {
2214 [ 2303 [
2215 map { 2304 map {
2216 utf8::decode $_; 2305 utf8::decode $_;
2217 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2218 ? normalise $_ 2309 : normalise $_
2219 : ()
2220 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2221 ] 2311 ]
2222} 2312}
2223 2313
2224package cf;
2225
2226=back 2314=back
2227 2315
2228=head3 cf::object 2316=head3 cf::object
2229 2317
2230=cut 2318=cut
2233 2321
2234=over 4 2322=over 4
2235 2323
2236=item $ob->inv_recursive 2324=item $ob->inv_recursive
2237 2325
2238Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2239 2328
2240=cut 2329=cut
2241 2330
2242sub inv_recursive_; 2331sub inv_recursive_;
2243sub inv_recursive_ { 2332sub inv_recursive_ {
2248 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2249} 2338}
2250 2339
2251=item $ref = $ob->ref 2340=item $ref = $ob->ref
2252 2341
2253creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2254 2343
2255=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2256 2345
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block. 2347even if the object actually exists. May block.
2260=cut 2349=cut
2261 2350
2262sub deref { 2351sub deref {
2263 my ($ref) = @_; 2352 my ($ref) = @_;
2264 2353
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2354 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2); 2355 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2356 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return; 2357 or return;
2272 $pl->ob->uuid eq $uuid 2358 $pl->ob->uuid eq $uuid
2273 or return; 2359 or return;
2293can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2294dialogue with the given NPC character. 2380dialogue with the given NPC character.
2295 2381
2296=cut 2382=cut
2297 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2298# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2299# with dialog boxes. 2399# with dialog boxes.
2300#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2301sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2302 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
2313 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315 2415
2316 } else { 2416 } else {
2317 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2318 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2319 } 2419 }
2320 } 2420 }
2321} 2421}
2322 2422
2323=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2431her, loading and preparing them map, calling the provided $check callback 2531her, loading and preparing them map, calling the provided $check callback
2432that has to return the map if sucecssful, and then unfreezes the player on 2532that 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 2533the new (success) or old (failed) map position. In either case, $done will
2434be called at the end of this process. 2534be called at the end of this process.
2435 2535
2536Note that $check will be called with a potentially non-loaded map, so if
2537it needs a loaded map it has to call C<< ->load >>.
2538
2436=cut 2539=cut
2437 2540
2438our $GOTOGEN; 2541our $GOTOGEN;
2439 2542
2440sub cf::object::player::goto { 2543sub cf::object::player::goto {
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2445 2548
2446 $self->enter_link; 2549 $self->enter_link;
2447 2550
2448 (async { 2551 (async {
2552 $Coro::current->{desc} = "player::goto $path $x $y";
2553
2554 # *tag paths override both path and x|y
2555 if ($path =~ /^\*(.*)$/) {
2556 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2557 my $ob = $obs[rand @obs];
2558
2559 # see if we actually can go there
2560 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2561 $ob = $obs[rand @obs];
2562 } else {
2563 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2564 }
2565 # else put us there anyways for now #d#
2566
2567 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2568 } else {
2569 ($path, $x, $y) = (undef, undef, undef);
2570 }
2571 }
2572
2449 my $map = eval { 2573 my $map = eval {
2450 my $map = cf::map::find $path; 2574 my $map = defined $path ? cf::map::find $path : undef;
2451 2575
2452 if ($map) { 2576 if ($map) {
2453 $map = $map->customise_for ($self); 2577 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map; 2578 $map = $check->($map) if $check && $map;
2455 } else { 2579 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2457 } 2581 }
2458 2582
2459 $map 2583 $map
2460 }; 2584 };
2461 2585
2497} 2621}
2498 2622
2499sub prepare_random_map { 2623sub prepare_random_map {
2500 my ($exit) = @_; 2624 my ($exit) = @_;
2501 2625
2502 my $guard = cf::lock_acquire "exit_prepare:$exit";
2503
2504 # all this does is basically replace the /! path by 2626 # all this does is basically replace the /! path by
2505 # a new random map path (?random/...) with a seed 2627 # a new random map path (?random/...) with a seed
2506 # that depends on the exit object 2628 # that depends on the exit object
2507 2629
2508 my $rmp = parse_random_map_params $exit->msg; 2630 my $rmp = parse_random_map_params $exit->msg;
2510 if ($exit->map) { 2632 if ($exit->map) {
2511 $rmp->{region} = $exit->region->name; 2633 $rmp->{region} = $exit->region->name;
2512 $rmp->{origin_map} = $exit->map->path; 2634 $rmp->{origin_map} = $exit->map->path;
2513 $rmp->{origin_x} = $exit->x; 2635 $rmp->{origin_x} = $exit->x;
2514 $rmp->{origin_y} = $exit->y; 2636 $rmp->{origin_y} = $exit->y;
2637
2638 $exit->map->touch;
2515 } 2639 }
2516 2640
2517 $rmp->{random_seed} ||= $exit->random_seed; 2641 $rmp->{random_seed} ||= $exit->random_seed;
2518 2642
2519 my $data = cf::to_json $rmp; 2643 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2520 my $md5 = Digest::MD5::md5_hex $data; 2644 my $md5 = Digest::MD5::md5_hex $data;
2521 my $meta = "$RANDOMDIR/$md5.meta"; 2645 my $meta = "$RANDOMDIR/$md5.meta";
2522 2646
2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2524 aio_write $fh, 0, (length $data), $data, 0; 2648 aio_write $fh, 0, (length $data), $data, 0;
2525 undef $fh; 2649 undef $fh;
2526 aio_rename "$meta~", $meta; 2650 aio_rename "$meta~", $meta;
2527 2651
2652 my $slaying = "?random/$md5";
2653
2654 if ($exit->valid) {
2528 $exit->slaying ("?random/$md5"); 2655 $exit->slaying ("?random/$md5");
2529 $exit->msg (undef); 2656 $exit->msg (undef);
2657 }
2530 } 2658 }
2531} 2659}
2532 2660
2533sub cf::object::player::enter_exit { 2661sub cf::object::player::enter_exit {
2534 my ($self, $exit) = @_; 2662 my ($self, $exit) = @_;
2535 2663
2536 return unless $self->type == cf::PLAYER; 2664 return unless $self->type == cf::PLAYER;
2537 2665
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; 2666 $self->enter_link;
2550 2667
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 { 2668 (async {
2556 $self->deactivate_recursive; # just to be sure 2669 $Coro::current->{desc} = "enter_exit";
2670
2557 unless (eval { 2671 unless (eval {
2672 $self->deactivate_recursive; # just to be sure
2673
2674 # random map handling
2675 {
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 prepare_random_map $exit
2679 if $exit->slaying eq "/!";
2680 }
2681
2682 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $x = $exit->stats->hp;
2684 my $y = $exit->stats->sp;
2685
2558 $self->goto ($slaying, $hp, $sp); 2686 $self->goto ($map, $x, $y);
2559 2687
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED);
2691
2560 1; 2692 1
2561 }) { 2693 }) {
2562 $self->message ("Something went wrong deep within the crossfire server. " 2694 $self->message ("Something went wrong deep within the crossfire server. "
2563 . "I'll try to bring you back to the map you were before. " 2695 . "I'll try to bring you back to the map you were before. "
2564 . "Please report this to the dungeon master!", 2696 . "Please report this to the dungeon master!",
2565 cf::NDI_UNIQUE | cf::NDI_RED); 2697 cf::NDI_UNIQUE | cf::NDI_RED);
2595the message, with C<log> being the default. If C<$color> is negative, suppress 2727the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet. 2728the message unless the client supports the msg packet.
2597 2729
2598=cut 2730=cut
2599 2731
2732# non-persistent channels (usually the info channel)
2600our %CHANNEL = ( 2733our %CHANNEL = (
2601 "c/identify" => { 2734 "c/identify" => {
2602 id => "identify", 2735 id => "infobox",
2603 title => "Identify", 2736 title => "Identify",
2604 reply => undef, 2737 reply => undef,
2605 tooltip => "Items recently identified", 2738 tooltip => "Items recently identified",
2606 }, 2739 },
2607 "c/examine" => { 2740 "c/examine" => {
2608 id => "examine", 2741 id => "infobox",
2609 title => "Examine", 2742 title => "Examine",
2610 reply => undef, 2743 reply => undef,
2611 tooltip => "Signs and other items you examined", 2744 tooltip => "Signs and other items you examined",
2612 }, 2745 },
2746 "c/book" => {
2747 id => "infobox",
2748 title => "Book",
2749 reply => undef,
2750 tooltip => "The contents of a note or book",
2751 },
2752 "c/lookat" => {
2753 id => "infobox",
2754 title => "Look",
2755 reply => undef,
2756 tooltip => "What you saw there",
2757 },
2758 "c/who" => {
2759 id => "infobox",
2760 title => "Players",
2761 reply => undef,
2762 tooltip => "Shows players who are currently online",
2763 },
2764 "c/body" => {
2765 id => "infobox",
2766 title => "Body Parts",
2767 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available",
2769 },
2770 "c/uptime" => {
2771 id => "infobox",
2772 title => "Uptime",
2773 reply => undef,
2774 tooltip => "How long the server has been running since last restart",
2775 },
2776 "c/mapinfo" => {
2777 id => "infobox",
2778 title => "Map Info",
2779 reply => undef,
2780 tooltip => "Information related to the maps",
2781 },
2782 "c/party" => {
2783 id => "party",
2784 title => "Party",
2785 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party",
2787 },
2613); 2788);
2614 2789
2615sub cf::client::send_msg { 2790sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_; 2791 my ($self, $channel, $msg, $color, @extra) = @_;
2617 2792
2618 $msg = $self->pl->expand_cfpod ($msg); 2793 $msg = $self->pl->expand_cfpod ($msg);
2619 2794
2620 $color &= cf::NDI_CLIENT_MASK; # just in case... 2795 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621 2796
2622 # check predefined channels, for the benefit of C 2797 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2798 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel};
2624 2800
2801 $self->ext_msg (channel_info => $channel)
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id};
2805
2625 if (ref $channel) { 2806 } elsif (ref $channel) {
2626 # send meta info to client, if not yet sent 2807 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) { 2808 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel; 2809 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel) 2810 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg; 2811 if $self->can_msg;
2638 if ($self->can_msg) { 2819 if ($self->can_msg) {
2639 # default colour, mask it out 2820 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF; 2822 if $color & cf::NDI_DEF;
2642 2823
2643 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2824 my $pkt = "msg "
2825 . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 );
2828
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt);
2645 } else { 2840 } else {
2646 if ($color >= 0) { 2841 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones 2842 # replace some tags by gcfclient-compatible ones
2648 for ($msg) { 2843 for ($msg) {
2649 1 while 2844 1 while
2847=pod 3042=pod
2848 3043
2849The following functions and methods are available within a safe environment: 3044The following functions and methods are available within a safe environment:
2850 3045
2851 cf::object 3046 cf::object
2852 contr pay_amount pay_player map x y force_find force_add 3047 contr pay_amount pay_player map x y force_find force_add destroy
2853 insert remove name archname title slaying race decrease_ob_nr 3048 insert remove name archname title slaying race decrease split
2854 3049
2855 cf::object::player 3050 cf::object::player
2856 player 3051 player
2857 3052
2858 cf::player 3053 cf::player
2863 3058
2864=cut 3059=cut
2865 3060
2866for ( 3061for (
2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race 3063 insert remove inv nrof name archname title slaying race
2869 decrease_ob_nr)], 3064 decrease split destroy change_exp)],
2870 ["cf::object::player" => qw(player)], 3065 ["cf::object::player" => qw(player)],
2871 ["cf::player" => qw(peaceful)], 3066 ["cf::player" => qw(peaceful)],
2872 ["cf::map" => qw(trigger)], 3067 ["cf::map" => qw(trigger)],
2873) { 3068) {
2874 no strict 'refs'; 3069 no strict 'refs';
2979 { 3174 {
2980 my $faces = $facedata->{faceinfo}; 3175 my $faces = $facedata->{faceinfo};
2981 3176
2982 while (my ($face, $info) = each %$faces) { 3177 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3178 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179
2984 cf::face::set_visibility $idx, $info->{visibility}; 3180 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap}; 3181 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3182 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}; 3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988 3184
2989 cf::cede_to_tick; 3185 cf::cede_to_tick;
2990 } 3186 }
2991 3187
2992 while (my ($face, $info) = each %$faces) { 3188 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth}; 3189 next unless $info->{smooth};
3190
2994 my $idx = cf::face::find $face 3191 my $idx = cf::face::find $face
2995 or next; 3192 or next;
3193
2996 if (my $smooth = cf::face::find $info->{smooth}) { 3194 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth; 3195 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3196 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else { 3197 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3198 warn "smooth face '$info->{smooth}' not found for face '$face'";
3018 { 3216 {
3019 # TODO: for gcfclient pleasure, we should give resources 3217 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index. 3218 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource}; 3219 my $res = $facedata->{resource};
3022 3220
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) { 3221 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3223 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data; 3224 my $data;
3028 3225
3029 if ($info->{type} & 1) { 3226 if ($info->{type} & 1) {
3030 # prepend meta info 3227 # prepend meta info
3031 3228
3032 my $meta = $enc->encode ({ 3229 my $meta = $enc->encode ({
3033 name => $name, 3230 name => $name,
3034 %{ $info->{meta} || {} }, 3231 %{ $info->{meta} || {} },
3035 }); 3232 });
3036 3233
3037 $data = pack "(w/a*)*", $meta, $info->{data}; 3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type};
3038 } else { 3241 } else {
3039 $data = $info->{data}; 3242 $RESOURCE{$name} = $info;
3040 } 3243 }
3041 3244
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; 3245 cf::cede_to_tick;
3046 } 3246 }
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 } 3247 }
3248
3249 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3066 3250
3067 1 3251 1
3068} 3252}
3253
3254cf::global->attach (on_resource_update => sub {
3255 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3256 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3257
3258 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3259 my $sound = $soundconf->{compat}[$_]
3260 or next;
3261
3262 my $face = cf::face::find "sound/$sound->[1]";
3263 cf::sound::set $sound->[0] => $face;
3264 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3265 }
3266
3267 while (my ($k, $v) = each %{$soundconf->{event}}) {
3268 my $face = cf::face::find "sound/$v";
3269 cf::sound::set $k => $face;
3270 }
3271 }
3272});
3069 3273
3070register_exticmd fx_want => sub { 3274register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_; 3275 my ($ns, $want) = @_;
3072 3276
3073 while (my ($k, $v) = each %$want) { 3277 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v); 3278 $ns->fx_want ($k, $v);
3075 } 3279 }
3076}; 3280};
3281
3282sub load_resource_file($) {
3283 my $guard = lock_acquire "load_resource_file";
3284
3285 my $status = load_resource_file_ $_[0];
3286 get_slot 0.1, 100;
3287 cf::arch::commit_load;
3288
3289 $status
3290}
3077 3291
3078sub reload_regions { 3292sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework 3293 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?) 3294 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = (); 3295 %ext::player_env::MUSIC_FACE_CACHE = ();
3095} 3309}
3096 3310
3097sub reload_archetypes { 3311sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes" 3312 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n"; 3313 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} 3314}
3106 3315
3107sub reload_treasures { 3316sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures" 3317 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n"; 3318 or die "unable to load treasurelists\n";
3110} 3319}
3111 3320
3112sub reload_resources { 3321sub reload_resources {
3113 warn "reloading resource files...\n"; 3322 warn "reloading resource files...\n";
3114 3323
3324 reload_facedata;
3325 reload_archetypes;
3115 reload_regions; 3326 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures; 3327 reload_treasures;
3120 3328
3121 warn "finished reloading resource files\n"; 3329 warn "finished reloading resource files\n";
3122} 3330}
3123 3331
3124sub init { 3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3125 reload_resources; 3337 reload_resources;
3126} 3338}
3127 3339
3128sub reload_config { 3340sub reload_config {
3129 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3130 or return; 3342 or return;
3131 3343
3132 local $/; 3344 local $/;
3133 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3134 3346
3135 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3136 3348
3137 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $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}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3144 }; 3356 };
3145 warn $@ if $@; 3357 warn $@ if $@;
3146 } 3358 }
3147} 3359}
3148 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3149sub main { 3380sub main {
3381 atomic;
3382
3150 # we must not ever block the main coroutine 3383 # we must not ever block the main coroutine
3151 local $Coro::idle = sub { 3384 local $Coro::idle = sub {
3152 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3153 (async { 3386 (async {
3154 Event::one_event; 3387 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT;
3155 })->prio (Coro::PRIO_MAX); 3389 })->prio (Coro::PRIO_MAX);
3156 }; 3390 };
3157 3391
3392 {
3393 my $guard = freeze_mainloop;
3158 reload_config; 3394 reload_config;
3159 db_init; 3395 db_init;
3160 load_extensions; 3396 load_extensions;
3161 3397
3162 $TICK_WATCHER->start; 3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE;
3402
3403 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405
3163 Event::loop; 3406 EV::loop;
3164} 3407}
3165 3408
3166############################################################################# 3409#############################################################################
3167# initialisation and cleanup 3410# initialisation and cleanup
3168 3411
3169# install some emergency cleanup handlers 3412# install some emergency cleanup handlers
3170BEGIN { 3413BEGIN {
3414 our %SIGWATCHER = ();
3171 for my $signal (qw(INT HUP TERM)) { 3415 for my $signal (qw(INT HUP TERM)) {
3172 Event->signal ( 3416 $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"; 3417 cf::cleanup "SIG$signal";
3179 },
3180 ); 3418 };
3181 } 3419 }
3182} 3420}
3183 3421
3184sub write_runtime { 3422sub write_runtime_sync {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running: 3423 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time. 3424 # the fsync below can take a very very long time.
3189 3425
3190 IO::AIO::aio_utime $runtime, undef, undef; 3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3191 3427
3192 my $guard = cf::lock_acquire "write_runtime"; 3428 my $guard = cf::lock_acquire "write_runtime";
3193 3429
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3195 or return; 3431 or return;
3196 3432
3197 my $value = $cf::RUNTIME + 90 + 10; 3433 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock 3434 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server. 3435 # 60 allows for the watchdog to kill the server.
3209 aio_utime $fh, undef, undef; 3445 aio_utime $fh, undef, undef;
3210 3446
3211 close $fh 3447 close $fh
3212 or return; 3448 or return;
3213 3449
3214 aio_rename "$runtime~", $runtime 3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3215 and return; 3451 and return;
3216 3452
3217 warn "runtime file written.\n"; 3453 warn "runtime file written.\n";
3218 3454
3219 1 3455 1
3456}
3457
3458our $uuid_lock;
3459our $uuid_skip;
3460
3461sub write_uuid_sync($) {
3462 $uuid_skip ||= $_[0];
3463
3464 return if $uuid_lock;
3465 local $uuid_lock = 1;
3466
3467 my $uuid = "$LOCALDIR/uuid";
3468
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return;
3471
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3473 $uuid_skip = 0;
3474
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return;
3477
3478 # always fsync - this file is important
3479 aio_fsync $fh
3480 and return;
3481
3482 close $fh
3483 or return;
3484
3485 aio_rename "$uuid~", $uuid
3486 and return;
3487
3488 warn "uuid file written ($value).\n";
3489
3490 1
3491
3492}
3493
3494sub write_uuid($$) {
3495 my ($skip, $sync) = @_;
3496
3497 $sync ? write_uuid_sync $skip
3498 : async { write_uuid_sync $skip };
3220} 3499}
3221 3500
3222sub emergency_save() { 3501sub emergency_save() {
3223 my $freeze_guard = cf::freeze_mainloop; 3502 my $freeze_guard = cf::freeze_mainloop;
3224 3503
3230 # and maps saved/destroyed asynchronously. 3509 # and maps saved/destroyed asynchronously.
3231 warn "begin emergency player save\n"; 3510 warn "begin emergency player save\n";
3232 for my $login (keys %cf::PLAYER) { 3511 for my $login (keys %cf::PLAYER) {
3233 my $pl = $cf::PLAYER{$login} or next; 3512 my $pl = $cf::PLAYER{$login} or next;
3234 $pl->valid or next; 3513 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3235 $pl->save; 3515 $pl->save;
3236 } 3516 }
3237 warn "end emergency player save\n"; 3517 warn "end emergency player save\n";
3238 3518
3239 warn "begin emergency map save\n"; 3519 warn "begin emergency map save\n";
3245 warn "end emergency map save\n"; 3525 warn "end emergency map save\n";
3246 3526
3247 warn "begin emergency database checkpoint\n"; 3527 warn "begin emergency database checkpoint\n";
3248 BDB::db_env_txn_checkpoint $DB_ENV; 3528 BDB::db_env_txn_checkpoint $DB_ENV;
3249 warn "end emergency database checkpoint\n"; 3529 warn "end emergency database checkpoint\n";
3530
3531 warn "begin write uuid\n";
3532 write_uuid_sync 1;
3533 warn "end write uuid\n";
3250 }; 3534 };
3251 3535
3252 warn "leave emergency perl save\n"; 3536 warn "leave emergency perl save\n";
3253} 3537}
3254 3538
3255sub post_cleanup { 3539sub post_cleanup {
3256 my ($make_core) = @_; 3540 my ($make_core) = @_;
3257 3541
3258 warn Carp::longmess "post_cleanup backtrace" 3542 warn Carp::longmess "post_cleanup backtrace"
3259 if $make_core; 3543 if $make_core;
3544
3545 my $fh = pidfile;
3546 unlink $PIDFILE if <$fh> == $$;
3260} 3547}
3548
3549# a safer delete_package, copied from Symbol
3550sub clear_package($) {
3551 my $pkg = shift;
3552
3553 # expand to full symbol table name if needed
3554 unless ($pkg =~ /^main::.*::$/) {
3555 $pkg = "main$pkg" if $pkg =~ /^::/;
3556 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3557 $pkg .= '::' unless $pkg =~ /::$/;
3558 }
3559
3560 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3561 my $stem_symtab = *{$stem}{HASH};
3562
3563 defined $stem_symtab and exists $stem_symtab->{$leaf}
3564 or return;
3565
3566 # clear all symbols
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 }
3572 warn "cleared package #$pkg\n";#d#
3573}
3574
3575our $RELOAD; # how many times to reload
3261 3576
3262sub do_reload_perl() { 3577sub do_reload_perl() {
3263 # can/must only be called in main 3578 # can/must only be called in main
3264 if ($Coro::current != $Coro::main) { 3579 if ($Coro::current != $Coro::main) {
3265 warn "can only reload from main coroutine"; 3580 warn "can only reload from main coroutine";
3266 return; 3581 return;
3267 } 3582 }
3268 3583
3584 return if $RELOAD++;
3585
3586 while ($RELOAD) {
3269 warn "reloading..."; 3587 warn "reloading...";
3270 3588
3271 warn "entering sync_job"; 3589 warn "entering sync_job";
3272 3590
3273 cf::sync_job { 3591 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark 3592 cf::write_runtime_sync; # external watchdog should not bark
3275 cf::emergency_save; 3593 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark 3594 cf::write_runtime_sync; # external watchdog should not bark
3277 3595
3278 warn "syncing database to disk"; 3596 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV; 3597 BDB::db_env_txn_checkpoint $DB_ENV;
3280 3598
3281 # if anything goes wrong in here, we should simply crash as we already saved 3599 # if anything goes wrong in here, we should simply crash as we already saved
3282 3600
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"; 3601 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; 3602 while (IO::AIO::nreqs || BDB::nreqs) {
3294 warn "iterate..."; 3603 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 } 3604 }
3320 3605
3321 warn "... nuking $pkg"; 3606 warn "cancelling all extension coros";
3322 Symbol::delete_package $pkg; 3607 $_->cancel for values %EXT_CORO;
3323 } 3608 %EXT_CORO = ();
3324 3609
3325 warn "unloading all perl modules loaded from $LIBDIR"; 3610 warn "removing commands";
3326 while (my ($k, $v) = each %INC) { 3611 %COMMAND = ();
3327 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3328 3612
3613 warn "removing ext/exti commands";
3614 %EXTCMD = ();
3615 %EXTICMD = ();
3616
3617 warn "unloading/nuking all extensions";
3618 for my $pkg (@EXTS) {
3329 warn "... unloading $k"; 3619 warn "... unloading $pkg";
3330 delete $INC{$k};
3331 3620
3332 $k =~ s/\.pm$//;
3333 $k =~ s/\//::/g;
3334
3335 if (my $cb = $k->can ("unload_module")) { 3621 if (my $cb = $pkg->can ("unload")) {
3622 eval {
3336 $cb->(); 3623 $cb->($pkg);
3624 1
3625 } or warn "$pkg unloaded, but with errors: $@";
3626 }
3627
3628 warn "... clearing $pkg";
3629 clear_package $pkg;
3337 } 3630 }
3338 3631
3339 Symbol::delete_package $k; 3632 warn "unloading all perl modules loaded from $LIBDIR";
3633 while (my ($k, $v) = each %INC) {
3634 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3635
3636 warn "... unloading $k";
3637 delete $INC{$k};
3638
3639 $k =~ s/\.pm$//;
3640 $k =~ s/\//::/g;
3641
3642 if (my $cb = $k->can ("unload_module")) {
3643 $cb->();
3644 }
3645
3646 clear_package $k;
3340 } 3647 }
3341 3648
3342 warn "getting rid of safe::, as good as possible"; 3649 warn "getting rid of safe::, as good as possible";
3343 Symbol::delete_package "safe::$_" 3650 clear_package "safe::$_"
3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3345 3652
3346 warn "unloading cf.pm \"a bit\""; 3653 warn "unloading cf.pm \"a bit\"";
3347 delete $INC{"cf.pm"}; 3654 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"}; 3655 delete $INC{"cf/pod.pm"};
3349 3656
3350 # don't, removes xs symbols, too, 3657 # don't, removes xs symbols, too,
3351 # and global variables created in xs 3658 # and global variables created in xs
3352 #Symbol::delete_package __PACKAGE__; 3659 #clear_package __PACKAGE__;
3353 3660
3354 warn "unload completed, starting to reload now"; 3661 warn "unload completed, starting to reload now";
3355 3662
3356 warn "reloading cf.pm"; 3663 warn "reloading cf.pm";
3357 require cf; 3664 require cf;
3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3359 3666
3360 warn "loading config and database again"; 3667 warn "loading config and database again";
3361 cf::reload_config; 3668 cf::reload_config;
3362 3669
3363 warn "loading extensions"; 3670 warn "loading extensions";
3364 cf::load_extensions; 3671 cf::load_extensions;
3365 3672
3366 warn "reattaching attachments to objects/players"; 3673 warn "reattaching attachments to objects/players";
3367 _global_reattach; # objects, sockets 3674 _global_reattach; # objects, sockets
3368 warn "reattaching attachments to maps"; 3675 warn "reattaching attachments to maps";
3369 reattach $_ for values %MAP; 3676 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players"; 3677 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER; 3678 reattach $_ for values %PLAYER;
3372 3679
3373 warn "leaving sync_job"; 3680 warn "leaving sync_job";
3374 3681
3375 1 3682 1
3376 } or do { 3683 } or do {
3377 warn $@; 3684 warn $@;
3378 warn "error while reloading, exiting."; 3685 cf::cleanup "error while reloading, exiting.";
3379 exit 1;
3380 }; 3686 };
3381 3687
3382 warn "reloaded"; 3688 warn "reloaded";
3689 --$RELOAD;
3690 }
3383}; 3691};
3384 3692
3385our $RELOAD_WATCHER; # used only during reload 3693our $RELOAD_WATCHER; # used only during reload
3386 3694
3387sub reload_perl() { 3695sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back, 3696 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here. 3697 # coro crashes during coro_state_free->destroy here.
3390 3698
3391 $RELOAD_WATCHER ||= Event->timer ( 3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl; 3700 do_reload_perl;
3397 undef $RELOAD_WATCHER; 3701 undef $RELOAD_WATCHER;
3398 },
3399 ); 3702 };
3400} 3703}
3401 3704
3402register_command "reload" => sub { 3705register_command "reload" => sub {
3403 my ($who, $arg) = @_; 3706 my ($who, $arg) = @_;
3404 3707
3405 if ($who->flag (FLAG_WIZ)) { 3708 if ($who->flag (FLAG_WIZ)) {
3406 $who->message ("reloading server."); 3709 $who->message ("reloading server.");
3710 async {
3711 $Coro::current->{desc} = "perl_reload";
3407 async { reload_perl }; 3712 reload_perl;
3713 };
3408 } 3714 }
3409}; 3715};
3410 3716
3411unshift @INC, $LIBDIR; 3717unshift @INC, $LIBDIR;
3412 3718
3414 3720
3415our @WAIT_FOR_TICK; 3721our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN; 3722our @WAIT_FOR_TICK_BEGIN;
3417 3723
3418sub wait_for_tick { 3724sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main; 3725 return if tick_inhibit || $Coro::current == $Coro::main;
3421 3726
3422 my $signal = new Coro::Signal; 3727 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal; 3728 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait; 3729 $signal->wait;
3425} 3730}
3426 3731
3427sub wait_for_tick_begin { 3732sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main; 3733 return if tick_inhibit || $Coro::current == $Coro::main;
3430 3734
3431 my $signal = new Coro::Signal; 3735 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal; 3736 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait; 3737 $signal->wait;
3434} 3738}
3435 3739
3436 my $min = 1e6;#d# 3740sub 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) { 3741 if ($Coro::current != $Coro::main) {
3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3742 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3447 unless ++$bug_warning > 10; 3743 unless ++$bug_warning > 10;
3448 return; 3744 return;
3449 } 3745 }
3450 3746
3451 $NOW = $tick_start = Event::time;
3452
3453 cf::server_tick; # one server iteration 3747 cf::server_tick; # one server iteration
3454 3748
3455 0 && sync_job {#d# 3749 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3456 for(1..10) { 3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3457 my $t = Event::time; 3751 Coro::async_pool {
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3752 $Coro::current->{desc} = "runtime saver";
3459 or die; 3753 write_runtime_sync
3460 3754 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 }; 3755 };
3756 }
3477 3757
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) { 3758 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send; 3759 $sig->send;
3494 } 3760 }
3495 while (my $sig = shift @WAIT_FOR_TICK) { 3761 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send; 3762 $sig->send;
3497 } 3763 }
3498 3764
3499 $NOW = Event::time; 3765 $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; 3766 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509 3767
3510 _post_tick; 3768 if (0) {
3511 3769 if ($NEXT_TICK) {
3512 3770 my $jitter = $TICK_START - $NEXT_TICK;
3771 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3772 warn "jitter $JITTER\n";#d#
3773 }
3513 }, 3774 }
3514); 3775}
3515 3776
3516{ 3777{
3517 BDB::max_poll_time $TICK * 0.1; 3778 # configure BDB
3518 $BDB_POLL_WATCHER = Event->io ( 3779
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; 3780 BDB::min_parallel 8;
3527 3781 BDB::max_poll_reqs $TICK * 0.1;
3528 BDB::set_sync_prepare { 3782 $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 3783
3543 unless ($DB_ENV) { 3784 unless ($DB_ENV) {
3544 $DB_ENV = BDB::db_env_create; 3785 $DB_ENV = BDB::db_env_create;
3786 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3787 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3788 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3789 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3790 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 3791
3546 cf::sync_job { 3792 cf::sync_job {
3547 eval { 3793 eval {
3548 BDB::db_env_open 3794 BDB::db_env_open
3549 $DB_ENV, 3795 $DB_ENV,
3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3797 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3798 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3553 0666; 3799 0666;
3554 3800
3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3801 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 }; 3802 };
3560 3803
3561 cf::cleanup "db_env_open(db): $@" if $@; 3804 cf::cleanup "db_env_open(db): $@" if $@;
3562 }; 3805 };
3563 } 3806 }
3807
3808 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3809 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3810 };
3811 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3812 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3813 };
3814 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3815 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3816 };
3564} 3817}
3565 3818
3566{ 3819{
3820 # configure IO::AIO
3821
3567 IO::AIO::min_parallel 8; 3822 IO::AIO::min_parallel 8;
3568
3569 undef $Coro::AIO::WATCHER;
3570 IO::AIO::max_poll_time $TICK * 0.1; 3823 IO::AIO::max_poll_time $TICK * 0.1;
3571 $AIO_POLL_WATCHER = Event->io ( 3824 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} 3825}
3580 3826
3581my $_log_backtrace; 3827my $_log_backtrace;
3582 3828
3583sub _log_backtrace { 3829sub _log_backtrace {
3587 3833
3588 # limit the # of concurrent backtraces 3834 # limit the # of concurrent backtraces
3589 if ($_log_backtrace < 2) { 3835 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace; 3836 ++$_log_backtrace;
3591 async { 3837 async {
3838 $Coro::current->{desc} = "abt $msg";
3839
3592 my @bt = fork_call { 3840 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr; 3841 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3842 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3843 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!"; 3844 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines