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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.452 by root, Tue Sep 23 00:24:52 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 1.4 (); 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
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 113our $DB_ENV;
86 114
87our %CFG; 115our %CFG;
88 116
89our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 118our $RUNTIME;
119our $NOW;
91 120
92our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
95 124
96# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 127
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
102 132
103binmode STDOUT; 133binmode STDOUT;
104binmode STDERR; 134binmode STDERR;
105 135
106# read virtual server time, if available 136# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
111} 141}
112 142
113mkdir $_ 143mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 189
160The raw value load value from the last tick. 190The raw value load value from the last tick.
161 191
162=item %cf::CFG 192=item %cf::CFG
163 193
164Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 195from wherever your confdir points to.
166 196
167=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
168 198
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 199These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 217 $msg .= "\n"
188 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
189 219
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 221
192 utf8::encode $msg;
193 LOG llevError, $msg; 222 LOG llevError, $msg;
194 }; 223 };
195} 224}
225
226$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "=="
228
229 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d#
232 }#d#
233
234 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate
237};
238
239$SIG{__DIE__} = sub { }; #d#?
196 240
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 251for my $pkg (qw(
208 cf::global cf::attachable 252 cf::global cf::attachable
209 cf::object cf::object::player 253 cf::object cf::object::player
210 cf::client cf::player 254 cf::client cf::player
211 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
212 cf::map cf::party cf::region 257 cf::party cf::region
213)) { 258)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 260}
217 261
218$Event::DIED = sub { 262$EV::DIED = sub {
219 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
220}; 264};
221 265
222############################################################################# 266#############################################################################
223 267
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 290 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 291 $d
248 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
249} 293}
250 294
251=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
252 296
253Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
254 298
255=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
256 300
257Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
258 302
259=cut 303=cut
260 304
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 306
263sub to_json ($) { $json_coder->encode ($_[0]) } 307sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 308sub decode_json($) { $json_coder->decode ($_[0]) }
265 309
266=item cf::lock_wait $string 310=item cf::lock_wait $string
267 311
268Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
269 313
272Wait until the given lock is available and then acquires it and returns 316Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 317a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
275returned. 319returned.
276 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
277Lock names should begin with a unique identifier (for example, cf::map::find 324Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
279 326
280=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
281 328
282Return true if the lock is currently active, i.e. somebody has locked it. 329Return true if the lock is currently active, i.e. somebody has locked it.
283 330
284=cut 331=cut
285 332
286our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
287 335
288sub lock_wait($) { 336sub lock_wait($) {
289 my ($key) = @_; 337 my ($key) = @_;
290 338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
291 # wait for lock, if any 344 # wait for lock, if any
292 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
293 push @{ $LOCK{$key} }, $Coro::current; 347 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 348 Coro::schedule;
295 } 349 }
296} 350}
297 351
300 354
301 # wait, to be sure we are not locked 355 # wait, to be sure we are not locked
302 lock_wait $key; 356 lock_wait $key;
303 357
304 $LOCK{$key} = []; 358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
305 360
306 Coro::guard { 361 Coro::guard {
362 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 363 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 364 $_->ready for @{ delete $LOCK{$key} };
309 } 365 }
310} 366}
311 367
314 370
315 ! ! $LOCK{$key} 371 ! ! $LOCK{$key}
316} 372}
317 373
318sub freeze_mainloop { 374sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 375 tick_inhibit_inc;
320 376
321 my $guard = Coro::guard { 377 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 378}
323 }; 379
324 $TICK_WATCHER->stop; 380=item cf::periodic $interval, $cb
325 $guard 381
382Like EV::periodic, but randomly selects a starting point so that the actions
383get spread over timer.
384
385=cut
386
387sub periodic($$) {
388 my ($interval, $cb) = @_;
389
390 my $start = rand List::Util::min 180, $interval;
391
392 EV::periodic $start, $interval, 0, $cb
326} 393}
327 394
328=item cf::get_slot $time[, $priority[, $name]] 395=item cf::get_slot $time[, $priority[, $name]]
329 396
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 397Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 408our @SLOT_QUEUE;
342our $SLOT_QUEUE; 409our $SLOT_QUEUE;
343 410
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 411$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 412$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager");
414
346 my $signal = new Coro::Signal; 415 my $signal = new Coro::Signal;
347 416
348 while () { 417 while () {
349 next_job: 418 next_job:
350 my $avail = cf::till_tick; 419 my $avail = cf::till_tick;
358 } 427 }
359 } 428 }
360 } 429 }
361 430
362 if (@SLOT_QUEUE) { 431 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 432 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 433 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 434 $signal->wait;
366 } else { 435 } else {
367 Coro::schedule; 436 Coro::schedule;
368 } 437 }
369 } 438 }
370}; 439};
371 440
372sub get_slot($;$$) { 441sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main;
443
373 my ($time, $pri, $name) = @_; 444 my ($time, $pri, $name) = @_;
374 445
375 $time = $TICK * .6 if $time > $TICK * .6; 446 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 447 my $sig = new Coro::Signal;
377 448
391 462
392BEGIN { *async = \&Coro::async_pool } 463BEGIN { *async = \&Coro::async_pool }
393 464
394=item cf::sync_job { BLOCK } 465=item cf::sync_job { BLOCK }
395 466
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 467The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 468is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 469partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 470acceptable.
400 471
401If it must be done, put the blocking parts into C<sync_job>. This will run 472If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 473the given BLOCK in another coroutine while waiting for the result. The
407 478
408sub sync_job(&) { 479sub sync_job(&) {
409 my ($job) = @_; 480 my ($job) = @_;
410 481
411 if ($Coro::current == $Coro::main) { 482 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 483 my $time = EV::time;
413 484
414 # this is the main coro, too bad, we have to block 485 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 486 # till the operation succeeds, freezing the server :/
416 487
417 # TODO: use suspend/resume instead 488 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 489
419 my $freeze_guard = freeze_mainloop; 490 my $freeze_guard = freeze_mainloop;
420 491
421 my $busy = 1; 492 my $busy = 1;
422 my @res; 493 my @res;
423 494
424 (async { 495 (async {
496 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 497 @res = eval { $job->() };
426 warn $@ if $@; 498 warn $@ if $@;
427 undef $busy; 499 undef $busy;
428 })->prio (Coro::PRIO_MAX); 500 })->prio (Coro::PRIO_MAX);
429 501
430 while ($busy) { 502 while ($busy) {
431 Coro::cede or Event::one_event; 503 if (Coro::nready) {
504 Coro::cede_notself;
505 } else {
506 EV::loop EV::LOOP_ONESHOT;
432 } 507 }
508 }
433 509
434 $time = Event::time - $time; 510 my $time = EV::time - $time;
435 511
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 512 $TICK_START += $time; # do not account sync jobs to server load
440 513
441 wantarray ? @res : $res[0] 514 wantarray ? @res : $res[0]
442 } else { 515 } else {
443 # we are in another coroutine, how wonderful, everything just works 516 # we are in another coroutine, how wonderful, everything just works
444 517
469=item fork_call { }, $args 542=item fork_call { }, $args
470 543
471Executes the given code block with the given arguments in a seperate 544Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 545process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 546Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 547never block itself or use any form of event handling.
475 548
476=cut 549=cut
477 550
478sub fork_call(&@) { 551sub fork_call(&@) {
479 my ($cb, @args) = @_; 552 my ($cb, @args) = @_;
480 553
481 # we seemingly have to make a local copy of the whole thing, 554 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 555 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 556 # TODO: investigate and fix (likely this will be rather laborious)
484 557
485 my @res = Coro::Util::fork_eval { 558 my @res = Coro::Util::fork_eval {
486 reset_signals; 559 reset_signals;
487 &$cb 560 &$cb
488 }, @args; 561 }, @args;
489 562
490 wantarray ? @res : $res[-1] 563 wantarray ? @res : $res[-1]
491} 564}
492 565
566=item $coin = coin_from_name $name
567
568=cut
569
570our %coin_alias = (
571 "silver" => "silvercoin",
572 "silvercoin" => "silvercoin",
573 "silvercoins" => "silvercoin",
574 "gold" => "goldcoin",
575 "goldcoin" => "goldcoin",
576 "goldcoins" => "goldcoin",
577 "platinum" => "platinacoin",
578 "platinumcoin" => "platinacoin",
579 "platinumcoins" => "platinacoin",
580 "platina" => "platinacoin",
581 "platinacoin" => "platinacoin",
582 "platinacoins" => "platinacoin",
583 "royalty" => "royalty",
584 "royalties" => "royalty",
585);
586
587sub coin_from_name($) {
588 $coin_alias{$_[0]}
589 ? cf::arch::find $coin_alias{$_[0]}
590 : undef
591}
592
493=item $value = cf::db_get $family => $key 593=item $value = cf::db_get $family => $key
494 594
495Returns a single value from the environment database. 595Returns a single value from the environment database.
496 596
497=item cf::db_put $family => $key => $value 597=item cf::db_put $family => $key => $value
498 598
499Stores the given C<$value> in the family. It can currently store binary 599Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 600data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 601
602=item $db = cf::db_table "name"
603
604Create and/or open a new database table. The string must not be "db" and must be unique
605within each server.
606
502=cut 607=cut
608
609sub db_table($) {
610 my ($name) = @_;
611 my $db = BDB::db_create $DB_ENV;
612
613 eval {
614 $db->set_flags (BDB::CHKSUM);
615
616 utf8::encode $name;
617 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
618 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
619 cf::cleanup "db_open(db): $!" if $!;
620 };
621 cf::cleanup "db_open(db): $@" if $@;
622
623 $db
624}
503 625
504our $DB; 626our $DB;
505 627
506sub db_init { 628sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 629 cf::sync_job {
511 eval { 630 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 631 };
521} 632}
522 633
523sub db_get($$) { 634sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 635 my $key = "$_[0]/$_[1]";
525 636
575 if (1) { 686 if (1) {
576 $md5 = 687 $md5 =
577 join "\x00", 688 join "\x00",
578 $processversion, 689 $processversion,
579 map { 690 map {
580 Coro::cede; 691 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 692 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 693 } 0.. $#$src;
583 694
584 695
585 my $dbmd5 = db_get cache => "$id/md5"; 696 my $dbmd5 = db_get cache => "$id/md5";
623 734
624############################################################################# 735#############################################################################
625 736
626=head2 ATTACHABLE OBJECTS 737=head2 ATTACHABLE OBJECTS
627 738
628Many objects in crossfire are so-called attachable objects. That means you can 739Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 740attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 741to it. All such attachable objects support the following methods.
631 742
632In the following description, CLASS can be any of C<global>, C<object> 743In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 744C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 745Deliantra).
635 746
636=over 4 747=over 4
637 748
638=item $attachable->attach ($attachment, key => $value...) 749=item $attachable->attach ($attachment, key => $value...)
639 750
683=item cf::CLASS::attachment $name, ... 794=item cf::CLASS::attachment $name, ...
684 795
685Register an attachment by C<$name> through which attachable objects of the 796Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 797given CLASS can refer to this attachment.
687 798
688Some classes such as crossfire maps and objects can specify attachments 799Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 800that are attached at load/instantiate time, thus the need for a name.
690 801
691These calls expect any number of the following handler/hook descriptions: 802These calls expect any number of the following handler/hook descriptions:
692 803
693=over 4 804=over 4
921 } 1032 }
922 1033
923 0 1034 0
924} 1035}
925 1036
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1037=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1038
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1039=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1040
930Generate an object-specific event with the given arguments. 1041Generate an object-specific event with the given arguments.
931 1042
937 1048
938=cut 1049=cut
939 1050
940############################################################################# 1051#############################################################################
941# object support 1052# object support
942#
943 1053
1054sub _object_equal($$);
1055sub _object_equal($$) {
1056 my ($a, $b) = @_;
1057
1058 return 0 unless (ref $a) eq (ref $b);
1059
1060 if ("HASH" eq ref $a) {
1061 my @ka = keys %$a;
1062 my @kb = keys %$b;
1063
1064 return 0 if @ka != @kb;
1065
1066 for (0 .. $#ka) {
1067 return 0 unless $ka[$_] eq $kb[$_];
1068 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1069 }
1070
1071 } elsif ("ARRAY" eq ref $a) {
1072
1073 return 0 if @$a != @$b;
1074
1075 for (0 .. $#$a) {
1076 return 0 unless _object_equal $a->[$_], $b->[$_];
1077 }
1078
1079 } elsif ($a ne $b) {
1080 return 0;
1081 }
1082
1083 1
1084}
1085
1086our $SLOW_MERGES;#d#
944sub _can_merge { 1087sub _can_merge {
945 my ($ob1, $ob2) = @_; 1088 my ($ob1, $ob2) = @_;
946 1089
947 local $Storable::canonical = 1; 1090 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1091
951 $fob1 eq $fob2 1092 # we do the slow way here
1093 return _object_equal $ob1, $ob2
952} 1094}
953 1095
954sub reattach { 1096sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1097 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1098 my ($obj) = @_;
957 1099
1100 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1101 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1102
960 my $registry = $obj->registry; 1103 my $registry = $obj->registry;
961 1104
962 @$registry = (); 1105 @$registry = ();
963 1106
978cf::attachable->attach ( 1121cf::attachable->attach (
979 prio => -1000000, 1122 prio => -1000000,
980 on_instantiate => sub { 1123 on_instantiate => sub {
981 my ($obj, $data) = @_; 1124 my ($obj, $data) = @_;
982 1125
983 $data = from_json $data; 1126 $data = decode_json $data;
984 1127
985 for (@$data) { 1128 for (@$data) {
986 my ($name, $args) = @$_; 1129 my ($name, $args) = @$_;
987 1130
988 $obj->attach ($name, %{$args || {} }); 1131 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1147sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1148 my ($filename, $rdata, $objs) = @_;
1006 1149
1007 sync_job { 1150 sync_job {
1008 if (length $$rdata) { 1151 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1153 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1154 $decname, length $$rdata, scalar @$objs;
1011 1155
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1160 aio_close $fh;
1017 1161
1018 if (@$objs) { 1162 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1167 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1168 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1169 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1170 }
1027 } else { 1171 } else {
1028 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
1029 } 1173 }
1034 } 1178 }
1035 } else { 1179 } else {
1036 aio_unlink $filename; 1180 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1038 } 1182 }
1039 } 1183 };
1040} 1184}
1041 1185
1042sub object_freezer_as_string { 1186sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
1044 1188
1056 or return; 1200 or return;
1057 1201
1058 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1204 or return;
1205
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1062 } 1208 }
1063 1209
1210 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1066 return ($data, $av); 1214 ($data, $av)
1067} 1215}
1068 1216
1069=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1070 1218
1071=over 4 1219=over 4
1149 my ($type, $reply, @payload) = 1297 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1298 "ARRAY" eq ref $msg
1151 ? @$msg 1299 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1301
1302 my @reply;
1303
1154 if (my $cb = $EXTCMD{$type}) { 1304 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1305 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1306 }
1307
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
1160 } else { 1311 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1313 }
1163 1314
1164 cf::override; 1315 cf::override;
1191 1342
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1345
1195 $ext{source} = 1346 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1348 . "#line 1 \"$path\"\n{\n"
1198 . $source 1349 . $source
1199 . "\n};\n1"; 1350 . "\n};\n1";
1200 1351
1201 $todo{$base} = \%ext; 1352 $todo{$base} = \%ext;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1368 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1369 : "$v->{base}: extension inactive.\n";
1219 1370
1220 if (exists $v->{meta}{mandatory}) { 1371 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1372 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1373 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1374 }
1225 1375
1226 warn $msg; 1376 warn $msg;
1227 } 1377 }
1228 1378
1242 1392
1243=back 1393=back
1244 1394
1245=head2 CORE EXTENSIONS 1395=head2 CORE EXTENSIONS
1246 1396
1247Functions and methods that extend core crossfire objects. 1397Functions and methods that extend core deliantra objects.
1248 1398
1249=cut 1399=cut
1250 1400
1251package cf::player; 1401package cf::player;
1252 1402
1253use Coro::AIO; 1403use Coro::AIO;
1254 1404
1255=head3 cf::player 1405=head3 cf::player
1256 1406
1257=over 4 1407=over 4
1408
1409=item cf::player::num_playing
1410
1411Returns the official number of playing players, as per the Crossfire metaserver rules.
1412
1413=cut
1414
1415sub num_playing {
1416 scalar grep
1417 $_->ob->map
1418 && !$_->hidden
1419 && !$_->ob->flag (cf::FLAG_WIZ),
1420 cf::player::list
1421}
1258 1422
1259=item cf::player::find $login 1423=item cf::player::find $login
1260 1424
1261Returns the given player object, loading it if necessary (might block). 1425Returns the given player object, loading it if necessary (might block).
1262 1426
1281 1445
1282sub exists($) { 1446sub exists($) {
1283 my ($login) = @_; 1447 my ($login) = @_;
1284 1448
1285 $cf::PLAYER{$login} 1449 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1450 or !aio_stat path $login
1287} 1451}
1288 1452
1289sub find($) { 1453sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1454 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1455 my $login = $_[0];
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1462 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1463 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1464 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1465 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1466
1303 my $pl = load_pl path $login 1467 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1468 or return;
1469
1470 my $pl = cf::player::load_pl $f
1471 or return;
1472
1473 local $cf::PLAYER_LOADING{$login} = $pl;
1474 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1475 $cf::PLAYER{$login} = $pl
1306 } 1476 }
1307 } 1477 }
1308} 1478}
1309 1479
1318 return if $pl->{deny_save}; 1488 return if $pl->{deny_save};
1319 1489
1320 aio_mkdir playerdir $pl, 0770; 1490 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1491 $pl->{last_save} = $cf::RUNTIME;
1322 1492
1493 cf::get_slot 0.01;
1494
1323 $pl->save_pl ($path); 1495 $pl->save_pl ($path);
1324 Coro::cede; 1496 cf::cede_to_tick;
1325} 1497}
1326 1498
1327sub new($) { 1499sub new($) {
1328 my ($login) = @_; 1500 my ($login) = @_;
1329 1501
1358 my ($pl) = @_; 1530 my ($pl) = @_;
1359 1531
1360 my $name = $pl->ob->name; 1532 my $name = $pl->ob->name;
1361 1533
1362 $pl->{deny_save} = 1; 1534 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1535 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1364 1536
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1538 $pl->deactivate;
1539 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1540 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1541 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1542 $pl->ns->destroy if $pl->ns;
1369 1543
1370 my $path = playerdir $pl; 1544 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1545 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1581 or return [];
1408 1582
1409 my @logins; 1583 my @logins;
1410 1584
1411 for my $login (@$dirs) { 1585 for my $login (@$dirs) {
1586 my $path = path $login;
1587
1588 # a .pst is a dead give-away for a valid player
1589 # if no pst file found, open and chekc for blocked users
1590 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1591 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1592 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1593 $buf !~ /^password -------------$/m or next; # official not-valid tag
1594 }
1415 1595
1416 utf8::decode $login; 1596 utf8::decode $login;
1417 push @logins, $login; 1597 push @logins, $login;
1418 } 1598 }
1419 1599
1446 } 1626 }
1447 1627
1448 \@paths 1628 \@paths
1449} 1629}
1450 1630
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1631=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1632
1453Expand crossfire pod fragments into protocol xml. 1633Expand deliantra pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500 1634
1501=item $player->ext_reply ($msgid, @msg) 1635=item $player->ext_reply ($msgid, @msg)
1502 1636
1503Sends an ext reply to the player. 1637Sends an ext reply to the player.
1504 1638
1505=cut 1639=cut
1506 1640
1507sub ext_reply($$@) { 1641sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1642 my ($self, $id, @msg) = @_;
1509 1643
1510 if ($self->ns->extcmd == 2) { 1644 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1645}
1518 1646
1519=item $player->ext_msg ($type, @msg) 1647=item $player->ext_msg ($type, @msg)
1520 1648
1521Sends an ext event to the client. 1649Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1705our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1706our $DEFAULT_RESET = 3000;
1579 1707
1580sub generate_random_map { 1708sub generate_random_map {
1581 my ($self, $rmp) = @_; 1709 my ($self, $rmp) = @_;
1710
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712
1582 # mit "rum" bekleckern, nicht 1713 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1714 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1839
1709# the temporary/swap location 1840# the temporary/swap location
1710sub save_path { 1841sub save_path {
1711 my ($self) = @_; 1842 my ($self) = @_;
1712 1843
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1844 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1845 "$TMPDIR/$path.map"
1715} 1846}
1716 1847
1717# the unique path, undef == no special unique path 1848# the unique path, undef == no special unique path
1718sub uniq_path { 1849sub uniq_path {
1719 my ($self) = @_; 1850 my ($self) = @_;
1720 1851
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1853 "$UNIQUEDIR/$path"
1723} 1854}
1724 1855
1725# and all this just because we cannot iterate over 1856# and all this just because we cannot iterate over
1726# all maps in C++... 1857# all maps in C++...
1749 1880
1750sub load_header_from($) { 1881sub load_header_from($) {
1751 my ($self, $path) = @_; 1882 my ($self, $path) = @_;
1752 1883
1753 utf8::encode $path; 1884 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1885 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1886 or return;
1887
1888 $self->_load_header ($f)
1889 or return;
1890
1891 local $MAP_LOADING{$self->{path}} = $self;
1892 $f->resolve_delayed_derefs;
1759 1893
1760 $self->{load_path} = $path; 1894 $self->{load_path} = $path;
1761 1895
1762 1 1896 1
1763} 1897}
1817sub find { 1951sub find {
1818 my ($path, $origin) = @_; 1952 my ($path, $origin) = @_;
1819 1953
1820 $path = normalise $path, $origin && $origin->path; 1954 $path = normalise $path, $origin && $origin->path;
1821 1955
1956 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1957 cf::lock_wait "map_find:$path";
1823 1958
1824 $cf::MAP{$path} || do { 1959 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1825 my $guard = cf::lock_acquire "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1826 my $map = new_from_path cf::map $path 1963 my $map = new_from_path cf::map $path
1827 or return; 1964 or return;
1828 1965
1829 $map->{last_save} = $cf::RUNTIME; 1966 $map->{last_save} = $cf::RUNTIME;
1830 1967
1832 or return; 1969 or return;
1833 1970
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1971 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1972 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1973 #$cf::WAIT_FOR_TICK->wait;
1974 undef $guard2;
1975 undef $guard1;
1837 $map->reset; 1976 $map->reset;
1838 undef $guard;
1839 return find $path; 1977 return find $path;
1840 } 1978 }
1841 1979
1842 $cf::MAP{$path} = $map 1980 $cf::MAP{$path} = $map
1843 } 1981 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 1990 local $self->{deny_reset} = 1; # loading can take a long time
1853 1991
1854 my $path = $self->{path}; 1992 my $path = $self->{path};
1855 1993
1856 { 1994 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1995 my $guard = cf::lock_acquire "map_data:$path";
1858 1996
1997 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1998 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1999
1861 $self->in_memory (cf::MAP_LOADING); 2000 $self->in_memory (cf::MAP_LOADING);
1862 2001
1863 $self->alloc; 2002 $self->alloc;
1864 2003
1865 $self->pre_load; 2004 $self->pre_load;
1866 Coro::cede; 2005 cf::cede_to_tick;
1867 2006
2007 my $f = new_from_file cf::object::thawer $self->{load_path};
2008 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2009 $self->_load_objects ($f)
1869 or return; 2010 or return;
1870 2011
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2012 $self->post_load_original
1872 if delete $self->{load_original}; 2013 if delete $self->{load_original};
1873 2014
1874 if (my $uniq = $self->uniq_path) { 2015 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2016 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2017 unless (aio_stat $uniq) {
2018 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2019 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2020 $self->_load_objects ($f);
2021 $f->resolve_delayed_derefs;
2022 }
1879 } 2023 }
1880 } 2024 }
1881 2025
1882 Coro::cede; 2026 $f->resolve_delayed_derefs;
2027
2028 cf::cede_to_tick;
1883 # now do the right thing for maps 2029 # now do the right thing for maps
1884 $self->link_multipart_objects; 2030 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2031 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2032 unless $self->difficulty;
1887 Coro::cede; 2033 cf::cede_to_tick;
1888 2034
1889 unless ($self->{deny_activate}) { 2035 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2036 $self->decay_objects;
1891 $self->fix_auto_apply; 2037 $self->fix_auto_apply;
1892 $self->update_buttons; 2038 $self->update_buttons;
1893 Coro::cede; 2039 cf::cede_to_tick;
1894 $self->set_darkness_map; 2040 $self->set_darkness_map;
1895 Coro::cede; 2041 cf::cede_to_tick;
1896 $self->activate; 2042 $self->activate;
1897 } 2043 }
1898 2044
1899 $self->{last_save} = $cf::RUNTIME; 2045 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2046 $self->last_access ($cf::RUNTIME);
1901 2047
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2048 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2049 }
1904 2050
1905 $self->post_load; 2051 $self->post_load;
1906} 2052}
1907 2053
1916 2062
1917 $self 2063 $self
1918} 2064}
1919 2065
1920# find and load all maps in the 3x3 area around a map 2066# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2067sub load_neighbours {
1922 my ($map) = @_; 2068 my ($map) = @_;
1923 2069
1924 my @diag; # diagonal neighbours 2070 my @neigh; # diagonal neighbours
1925 2071
1926 for (0 .. 3) { 2072 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2073 my $neigh = $map->tile_path ($_)
1928 or next; 2074 or next;
1929 $neigh = find $neigh, $map 2075 $neigh = find $neigh, $map
1930 or next; 2076 or next;
1931 $neigh->load; 2077 $neigh->load;
1932 2078
2079 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2080 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2081 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2082 }
1936 2083
1937 for (@diag) { 2084 for (grep defined $_->[0], @neigh) {
2085 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2086 my $neigh = find $path, $origin
1939 or next; 2087 or next;
1940 $neigh->load; 2088 $neigh->load;
1941 } 2089 }
1942} 2090}
1943 2091
1948} 2096}
1949 2097
1950sub do_load_sync { 2098sub do_load_sync {
1951 my ($map) = @_; 2099 my ($map) = @_;
1952 2100
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main;
2103
1953 cf::sync_job { $map->load }; 2104 cf::sync_job { $map->load };
1954} 2105}
1955 2106
1956our %MAP_PREFETCH; 2107our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2108our $MAP_PREFETCHER = undef;
1958 2109
1959sub find_async { 2110sub find_async {
1960 my ($path, $origin) = @_; 2111 my ($path, $origin, $load) = @_;
1961 2112
1962 $path = normalise $path, $origin && $origin->{path}; 2113 $path = normalise $path, $origin && $origin->{path};
1963 2114
1964 if (my $map = $cf::MAP{$path}) { 2115 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2117 }
1967 2118
1968 undef $MAP_PREFETCH{$path}; 2119 $MAP_PREFETCH{$path} |= $load;
2120
1969 $MAP_PREFETCHER ||= cf::async { 2121 $MAP_PREFETCHER ||= cf::async {
2122 $Coro::current->{desc} = "map prefetcher";
2123
1970 while (%MAP_PREFETCH) { 2124 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2125 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2126 if (my $map = find $k) {
1973 $map->load; 2127 $map->load if $v;
1974 } 2128 }
1975 2129
1976 delete $MAP_PREFETCH{$path}; 2130 delete $MAP_PREFETCH{$k};
1977 } 2131 }
1978 } 2132 }
1979 undef $MAP_PREFETCHER; 2133 undef $MAP_PREFETCHER;
1980 }; 2134 };
1981 $MAP_PREFETCHER->prio (6); 2135 $MAP_PREFETCHER->prio (6);
1984} 2138}
1985 2139
1986sub save { 2140sub save {
1987 my ($self) = @_; 2141 my ($self) = @_;
1988 2142
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2144
1991 $self->{last_save} = $cf::RUNTIME; 2145 $self->{last_save} = $cf::RUNTIME;
1992 2146
1993 return unless $self->dirty; 2147 return unless $self->dirty;
1994 2148
2000 return if $self->{deny_save}; 2154 return if $self->{deny_save};
2001 2155
2002 local $self->{last_access} = $self->last_access;#d# 2156 local $self->{last_access} = $self->last_access;#d#
2003 2157
2004 cf::async { 2158 cf::async {
2159 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2160 $_->contr->save for $self->players;
2006 }; 2161 };
2162
2163 cf::get_slot 0.02;
2007 2164
2008 if ($uniq) { 2165 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2167 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2168 } else {
2017 my ($self) = @_; 2174 my ($self) = @_;
2018 2175
2019 # save first because save cedes 2176 # save first because save cedes
2020 $self->save; 2177 $self->save;
2021 2178
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2180
2024 return if $self->players; 2181 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2027 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2189 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2190}
2031 2191
2032sub reset_at { 2192sub reset_at {
2033 my ($self) = @_; 2193 my ($self) = @_;
2034 2194
2066 if $uniq; 2226 if $uniq;
2067 } 2227 }
2068 2228
2069 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2070 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2233 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2234
2075 $self->unlink_save; 2235 $self->unlink_save;
2076 $self->destroy; 2236 $self->destroy;
2077} 2237}
2078 2238
2079my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2080 2240
2081sub nuke { 2241sub nuke {
2082 my ($self) = @_; 2242 my ($self) = @_;
2083 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2084 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2085 2248
2086 $self->unlink_save; 2249 $self->unlink_save;
2087 2250
2088 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2256
2094 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2095 2259
2096 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2097} 2261}
2098 2262
2099=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
2141 2305
2142sub unique_maps() { 2306sub unique_maps() {
2143 [ 2307 [
2144 map { 2308 map {
2145 utf8::decode $_; 2309 utf8::decode $_;
2146 /\.map$/ 2310 s/\.map$//; # TODO future compatibility hack
2311 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2312 ? ()
2147 ? normalise $_ 2313 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2314 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2315 ]
2151} 2316}
2152 2317
2153package cf;
2154
2155=back 2318=back
2156 2319
2157=head3 cf::object 2320=head3 cf::object
2158 2321
2159=cut 2322=cut
2162 2325
2163=over 4 2326=over 4
2164 2327
2165=item $ob->inv_recursive 2328=item $ob->inv_recursive
2166 2329
2167Returns the inventory of the object _and_ their inventories, recursively. 2330Returns the inventory of the object I<and> their inventories, recursively,
2331but I<not> the object itself.
2168 2332
2169=cut 2333=cut
2170 2334
2171sub inv_recursive_; 2335sub inv_recursive_;
2172sub inv_recursive_ { 2336sub inv_recursive_ {
2175 2339
2176sub inv_recursive { 2340sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2178} 2342}
2179 2343
2344=item $ref = $ob->ref
2345
2346Creates and returns a persistent reference to an object that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2180package cf; 2372package cf;
2181 2373
2182=back 2374=back
2183 2375
2184=head3 cf::object::player 2376=head3 cf::object::player
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2382Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can be C<undef>. Does the right thing when the player is currently in a 2383can be C<undef>. Does the right thing when the player is currently in a
2192dialogue with the given NPC character. 2384dialogue with the given NPC character.
2193 2385
2194=cut 2386=cut
2387
2388our $SAY_CHANNEL = {
2389 id => "say",
2390 title => "Map",
2391 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2393};
2394
2395our $CHAT_CHANNEL = {
2396 id => "chat",
2397 title => "Chat",
2398 reply => "chat ",
2399 tooltip => "Player chat and shouts, global to the server.",
2400};
2195 2401
2196# rough implementation of a future "reply" method that works 2402# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2403# with dialog boxes.
2198#TODO: the first argument must go, split into a $npc->reply_to ( method 2404#TODO: the first argument must go, split into a $npc->reply_to ( method
2199sub cf::object::player::reply($$$;$) { 2405sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2417 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213 2419
2214 } else { 2420 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2421 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2422 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2423 }
2218 } 2424 }
2219} 2425}
2220 2426
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2427=item $object->send_msg ($channel, $msg, $color, [extra...])
2246 2452
2247=item $player_object->enter_link 2453=item $player_object->enter_link
2248 2454
2249Freezes the player and moves him/her to a special map (C<{link}>). 2455Freezes the player and moves him/her to a special map (C<{link}>).
2250 2456
2251The player should be reasonably safe there for short amounts of time. You 2457The player should be reasonably safe there for short amounts of time (e.g.
2252I<MUST> call C<leave_link> as soon as possible, though. 2458for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link
2460map.
2253 2461
2254Will never block. 2462Will never block.
2255 2463
2256=item $player_object->leave_link ($map, $x, $y) 2464=item $player_object->leave_link ($map, $x, $y)
2257 2465
2312 # use -1 or undef as default coordinates, not 0, 0 2520 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2521 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2522 if $x <=0 && $y <= 0;
2315 2523
2316 $map->load; 2524 $map->load;
2317 $map->load_diag; 2525 $map->load_neighbours;
2318 2526
2319 return unless $self->contr->active; 2527 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2320 $self->activate_recursive; 2529 $self->activate_recursive;
2321 2530
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2323 $self->enter_map ($map, $x, $y); 2532 $self->enter_map ($map, $x, $y);
2324} 2533}
2329her, loading and preparing them map, calling the provided $check callback 2538her, loading and preparing them map, calling the provided $check callback
2330that has to return the map if sucecssful, and then unfreezes the player on 2539that has to return the map if sucecssful, and then unfreezes the player on
2331the new (success) or old (failed) map position. In either case, $done will 2540the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process. 2541be called at the end of this process.
2333 2542
2543Note that $check will be called with a potentially non-loaded map, so if
2544it needs a loaded map it has to call C<< ->load >>.
2545
2334=cut 2546=cut
2335 2547
2336our $GOTOGEN; 2548our $GOTOGEN;
2337 2549
2338sub cf::object::player::goto { 2550sub cf::object::player::goto {
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2555
2344 $self->enter_link; 2556 $self->enter_link;
2345 2557
2346 (async { 2558 (async {
2559 $Coro::current->{desc} = "player::goto $path $x $y";
2560
2561 # *tag paths override both path and x|y
2562 if ($path =~ /^\*(.*)$/) {
2563 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2564 my $ob = $obs[rand @obs];
2565
2566 # see if we actually can go there
2567 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2568 $ob = $obs[rand @obs];
2569 } else {
2570 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2571 }
2572 # else put us there anyways for now #d#
2573
2574 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2575 } else {
2576 ($path, $x, $y) = (undef, undef, undef);
2577 }
2578 }
2579
2347 my $map = eval { 2580 my $map = eval {
2348 my $map = cf::map::find $path; 2581 my $map = defined $path ? cf::map::find $path : undef;
2349 2582
2350 if ($map) { 2583 if ($map) {
2351 $map = $map->customise_for ($self); 2584 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2585 $map = $check->($map) if $check && $map;
2353 } else { 2586 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2588 }
2356 2589
2357 $map 2590 $map
2358 }; 2591 };
2359 2592
2395} 2628}
2396 2629
2397sub prepare_random_map { 2630sub prepare_random_map {
2398 my ($exit) = @_; 2631 my ($exit) = @_;
2399 2632
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2633 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2634 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2635 # that depends on the exit object
2405 2636
2406 my $rmp = parse_random_map_params $exit->msg; 2637 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2639 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2640 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2641 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2642 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2643 $rmp->{origin_y} = $exit->y;
2644
2645 $exit->map->touch;
2413 } 2646 }
2414 2647
2415 $rmp->{random_seed} ||= $exit->random_seed; 2648 $rmp->{random_seed} ||= $exit->random_seed;
2416 2649
2417 my $data = cf::to_json $rmp; 2650 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2651 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2652 my $meta = "$RANDOMDIR/$md5.meta";
2420 2653
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2655 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2656 undef $fh;
2424 aio_rename "$meta~", $meta; 2657 aio_rename "$meta~", $meta;
2425 2658
2659 my $slaying = "?random/$md5";
2660
2661 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2662 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2663 $exit->msg (undef);
2664 }
2428 } 2665 }
2429} 2666}
2430 2667
2431sub cf::object::player::enter_exit { 2668sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2669 my ($self, $exit) = @_;
2433 2670
2434 return unless $self->type == cf::PLAYER; 2671 return unless $self->type == cf::PLAYER;
2435 2672
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2673 $self->enter_link;
2448 2674
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2675 (async {
2454 $self->deactivate_recursive; # just to be sure 2676 $Coro::current->{desc} = "enter_exit";
2677
2455 unless (eval { 2678 unless (eval {
2679 $self->deactivate_recursive; # just to be sure
2680
2681 # random map handling
2682 {
2683 my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685 prepare_random_map $exit
2686 if $exit->slaying eq "/!";
2687 }
2688
2689 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2690 my $x = $exit->stats->hp;
2691 my $y = $exit->stats->sp;
2692
2456 $self->goto ($slaying, $hp, $sp); 2693 $self->goto ($map, $x, $y);
2457 2694
2695 # if exit is damned, update players death & WoR home-position
2696 $self->contr->savebed ($map, $x, $y)
2697 if $exit->flag (cf::FLAG_DAMNED);
2698
2458 1; 2699 1
2459 }) { 2700 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2701 $self->message ("Something went wrong deep within the deliantra server. "
2461 . "I'll try to bring you back to the map you were before. " 2702 . "I'll try to bring you back to the map you were before. "
2462 . "Please report this to the dungeon master!", 2703 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2704 cf::NDI_UNIQUE | cf::NDI_RED);
2464 2705
2465 warn "ERROR in enter_exit: $@"; 2706 warn "ERROR in enter_exit: $@";
2493the message, with C<log> being the default. If C<$color> is negative, suppress 2734the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet. 2735the message unless the client supports the msg packet.
2495 2736
2496=cut 2737=cut
2497 2738
2739# non-persistent channels (usually the info channel)
2740our %CHANNEL = (
2741 "c/identify" => {
2742 id => "infobox",
2743 title => "Identify",
2744 reply => undef,
2745 tooltip => "Items recently identified",
2746 },
2747 "c/examine" => {
2748 id => "infobox",
2749 title => "Examine",
2750 reply => undef,
2751 tooltip => "Signs and other items you examined",
2752 },
2753 "c/book" => {
2754 id => "infobox",
2755 title => "Book",
2756 reply => undef,
2757 tooltip => "The contents of a note or book",
2758 },
2759 "c/lookat" => {
2760 id => "infobox",
2761 title => "Look",
2762 reply => undef,
2763 tooltip => "What you saw there",
2764 },
2765 "c/who" => {
2766 id => "infobox",
2767 title => "Players",
2768 reply => undef,
2769 tooltip => "Shows players who are currently online",
2770 },
2771 "c/body" => {
2772 id => "infobox",
2773 title => "Body Parts",
2774 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available",
2776 },
2777 "c/skills" => {
2778 id => "infobox",
2779 title => "Skills",
2780 reply => undef,
2781 tooltip => "Shows your experience per skill and item power",
2782 },
2783 "c/uptime" => {
2784 id => "infobox",
2785 title => "Uptime",
2786 reply => undef,
2787 tooltip => "How long the server has been running since last restart",
2788 },
2789 "c/mapinfo" => {
2790 id => "infobox",
2791 title => "Map Info",
2792 reply => undef,
2793 tooltip => "Information related to the maps",
2794 },
2795 "c/party" => {
2796 id => "party",
2797 title => "Party",
2798 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party",
2800 },
2801);
2802
2498sub cf::client::send_msg { 2803sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2805
2501 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg)
2807 unless $color & cf::NDI_VERBATIM;
2502 2808
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2809 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2810
2811 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel};
2814
2815 $self->ext_msg (channel_info => $channel)
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id};
2819
2505 if (ref $channel) { 2820 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2821 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2822 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2823 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2824 $self->ext_msg (channel_info => $channel)
2825 if $self->can_msg;
2510 } 2826 }
2511 2827
2512 $channel = $channel->{id}; 2828 $channel = $channel->{id};
2513 } 2829 }
2514 2830
2517 if ($self->can_msg) { 2833 if ($self->can_msg) {
2518 # default colour, mask it out 2834 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 2836 if $color & cf::NDI_DEF;
2521 2837
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2838 my $pkt = "msg "
2839 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 );
2842
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt);
2524 } else { 2854 } else {
2525 if ($color >= 0) { 2855 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones 2856 # replace some tags by gcfclient-compatible ones
2527 for ($msg) { 2857 for ($msg) {
2528 1 while 2858 1 while
2555=cut 2885=cut
2556 2886
2557sub cf::client::ext_msg($$@) { 2887sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2888 my ($self, $type, @msg) = @_;
2559 2889
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2890 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2892 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2893 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 }
2896}
2897
2898=item $client->ext_reply ($msgid, @msg)
2899
2900Sends an ext reply to the client.
2901
2902=cut
2903
2904sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_;
2906
2907 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2913 }
2568} 2914}
2569 2915
2570=item $success = $client->query ($flags, "text", \&cb) 2916=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 2978 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2979 "ARRAY" eq ref $msg
2634 ? @$msg 2980 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2981 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2982
2983 my @reply;
2984
2637 if (my $cb = $EXTICMD{$type}) { 2985 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2986 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2987 }
2988
2989 $ns->ext_reply ($reply, @reply)
2990 if $reply;
2991
2643 } else { 2992 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2994 }
2646 2995
2647 cf::override; 2996 cf::override;
2707=pod 3056=pod
2708 3057
2709The following functions and methods are available within a safe environment: 3058The following functions and methods are available within a safe environment:
2710 3059
2711 cf::object 3060 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3061 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove name archname title slaying race 3062 insert remove name archname title slaying race decrease split
2714 3063
2715 cf::object::player 3064 cf::object::player
2716 player 3065 player
2717 3066
2718 cf::player 3067 cf::player
2723 3072
2724=cut 3073=cut
2725 3074
2726for ( 3075for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 3077 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3079 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3080 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3081 ["cf::map" => qw(trigger)],
2732) { 3082) {
2733 no strict 'refs'; 3083 no strict 'refs';
2809# the server's init and main functions 3159# the server's init and main functions
2810 3160
2811sub load_facedata($) { 3161sub load_facedata($) {
2812 my ($path) = @_; 3162 my ($path) = @_;
2813 3163
3164 # HACK to clear player env face cache, we need some signal framework
3165 # for this (global event?)
3166 %ext::player_env::MUSIC_FACE_CACHE = ();
3167
3168 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169
2814 warn "loading facedata from $path\n"; 3170 warn "loading facedata from $path\n";
2815 3171
2816 my $facedata; 3172 my $facedata;
2817 0 < aio_load $path, $facedata 3173 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3174 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3176 $facedata = Coro::Storable::thaw $facedata;
2821 3177
2822 $facedata->{version} == 2 3178 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3179 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3180
3181 # patch in the exptable
3182 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3185 };
3186 cf::cede_to_tick;
3187
2825 { 3188 {
2826 my $faces = $facedata->{faceinfo}; 3189 my $faces = $facedata->{faceinfo};
2827 3190
2828 while (my ($face, $info) = each %$faces) { 3191 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3192 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193
2830 cf::face::set_visibility $idx, $info->{visibility}; 3194 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3195 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3198
2835 cf::cede_to_tick; 3199 cf::cede_to_tick;
2836 } 3200 }
2837 3201
2838 while (my ($face, $info) = each %$faces) { 3202 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3203 next unless $info->{smooth};
3204
2840 my $idx = cf::face::find $face 3205 my $idx = cf::face::find $face
2841 or next; 3206 or next;
3207
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3208 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3209 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3211 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3212 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3229
2864 { 3230 {
2865 # TODO: for gcfclient pleasure, we should give resources 3231 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3232 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3233 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3234
2872 while (my ($name, $info) = each %$res) { 3235 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3236 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3237 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
2879 3239
2880 if ($info->{type} & 1) { 3240 if ($info->{type} & 1) {
2881 # prepend meta info 3241 # prepend meta info
2882 3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3248 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3249 } else {
3250 $data = $info->{data};
3251 }
2885 3252
2886 cf::face::set_data $idx, 0, $data, $chk; 3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type};
2887 } else { 3255 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3256 $RESOURCE{$name} = $info;
2889 } 3257 }
2890 3258
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3259 cf::cede_to_tick;
2894 } 3260 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3261 }
3262
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3264
2915 1 3265 1
2916} 3266}
3267
3268cf::global->attach (on_resource_update => sub {
3269 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273 my $sound = $soundconf->{compat}[$_]
3274 or next;
3275
3276 my $face = cf::face::find "sound/$sound->[1]";
3277 cf::sound::set $sound->[0] => $face;
3278 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279 }
3280
3281 while (my ($k, $v) = each %{$soundconf->{event}}) {
3282 my $face = cf::face::find "sound/$v";
3283 cf::sound::set $k => $face;
3284 }
3285 }
3286});
2917 3287
2918register_exticmd fx_want => sub { 3288register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3289 my ($ns, $want) = @_;
2920 3290
2921 while (my ($k, $v) = each %$want) { 3291 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3292 $ns->fx_want ($k, $v);
2923 } 3293 }
2924}; 3294};
2925 3295
3296sub load_resource_file($) {
3297 my $guard = lock_acquire "load_resource_file";
3298
3299 my $status = load_resource_file_ $_[0];
3300 get_slot 0.1, 100;
3301 cf::arch::commit_load;
3302
3303 $status
3304}
3305
2926sub reload_regions { 3306sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = ();
3310
2927 load_resource_file "$MAPDIR/regions" 3311 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3312 or die "unable to load regions file\n";
2929 3313
2930 for (cf::region::list) { 3314 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3315 $_->{match} = qr/$_->{match}/
2939} 3323}
2940 3324
2941sub reload_archetypes { 3325sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3326 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3327 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3328}
2950 3329
2951sub reload_treasures { 3330sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3331 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3332 or die "unable to load treasurelists\n";
2954} 3333}
2955 3334
2956sub reload_resources { 3335sub reload_resources {
2957 warn "reloading resource files...\n"; 3336 warn "reloading resource files...\n";
2958 3337
3338 reload_facedata;
3339 reload_archetypes;
2959 reload_regions; 3340 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3341 reload_treasures;
2964 3342
2965 warn "finished reloading resource files\n"; 3343 warn "finished reloading resource files\n";
2966} 3344}
2967 3345
2968sub init { 3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
2969 reload_resources; 3351 reload_resources;
2970} 3352}
2971 3353
2972sub cfg_load { 3354sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3356 or return;
2975 3357
2976 local $/; 3358 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
2978 3360
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3362
2981 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2982 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2988 }; 3370 };
2989 warn $@ if $@; 3371 warn $@ if $@;
2990 } 3372 }
2991} 3373}
2992 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
2993sub main { 3394sub main {
3395 atomic;
3396
2994 # we must not ever block the main coroutine 3397 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3398 local $Coro::idle = sub {
2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async { 3400 (async {
2998 Event::one_event; 3401 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3403 })->prio (Coro::PRIO_MAX);
3000 }; 3404 };
3001 3405
3002 cfg_load; 3406 {
3407 my $guard = freeze_mainloop;
3408 reload_config;
3003 db_init; 3409 db_init;
3004 load_extensions; 3410 load_extensions;
3005 3411
3006 $TICK_WATCHER->start; 3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE;
3416
3417 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419
3007 Event::loop; 3420 EV::loop;
3008} 3421}
3009 3422
3010############################################################################# 3423#############################################################################
3011# initialisation and cleanup 3424# initialisation and cleanup
3012 3425
3013# install some emergency cleanup handlers 3426# install some emergency cleanup handlers
3014BEGIN { 3427BEGIN {
3428 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3429 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3430 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3431 cf::cleanup "SIG$signal";
3023 },
3024 ); 3432 };
3025 } 3433 }
3026} 3434}
3027 3435
3028sub write_runtime { 3436sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime";
3030
3031 # first touch the runtime file to show we are still running: 3437 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3438 # the fsync below can take a very very long time.
3033 3439
3034 IO::AIO::aio_utime $runtime, undef, undef; 3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3035 3441
3036 my $guard = cf::lock_acquire "write_runtime"; 3442 my $guard = cf::lock_acquire "write_runtime";
3037 3443
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3039 or return; 3445 or return;
3040 3446
3041 my $value = $cf::RUNTIME + 90 + 10; 3447 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock 3448 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server. 3449 # 60 allows for the watchdog to kill the server.
3053 aio_utime $fh, undef, undef; 3459 aio_utime $fh, undef, undef;
3054 3460
3055 close $fh 3461 close $fh
3056 or return; 3462 or return;
3057 3463
3058 aio_rename "$runtime~", $runtime 3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3059 and return; 3465 and return;
3060 3466
3061 warn "runtime file written.\n"; 3467 warn "runtime file written.\n";
3062 3468
3063 1 3469 1
3470}
3471
3472our $uuid_lock;
3473our $uuid_skip;
3474
3475sub write_uuid_sync($) {
3476 $uuid_skip ||= $_[0];
3477
3478 return if $uuid_lock;
3479 local $uuid_lock = 1;
3480
3481 my $uuid = "$LOCALDIR/uuid";
3482
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return;
3485
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3487 $uuid_skip = 0;
3488
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return;
3491
3492 # always fsync - this file is important
3493 aio_fsync $fh
3494 and return;
3495
3496 close $fh
3497 or return;
3498
3499 aio_rename "$uuid~", $uuid
3500 and return;
3501
3502 warn "uuid file written ($value).\n";
3503
3504 1
3505
3506}
3507
3508sub write_uuid($$) {
3509 my ($skip, $sync) = @_;
3510
3511 $sync ? write_uuid_sync $skip
3512 : async { write_uuid_sync $skip };
3064} 3513}
3065 3514
3066sub emergency_save() { 3515sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3516 my $freeze_guard = cf::freeze_mainloop;
3068 3517
3074 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3524 warn "begin emergency player save\n";
3076 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3527 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3529 $pl->save;
3080 } 3530 }
3081 warn "end emergency player save\n"; 3531 warn "end emergency player save\n";
3082 3532
3083 warn "begin emergency map save\n"; 3533 warn "begin emergency map save\n";
3089 warn "end emergency map save\n"; 3539 warn "end emergency map save\n";
3090 3540
3091 warn "begin emergency database checkpoint\n"; 3541 warn "begin emergency database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3543 warn "end emergency database checkpoint\n";
3544
3545 warn "begin write uuid\n";
3546 write_uuid_sync 1;
3547 warn "end write uuid\n";
3094 }; 3548 };
3095 3549
3096 warn "leave emergency perl save\n"; 3550 warn "leave emergency perl save\n";
3097} 3551}
3098 3552
3099sub post_cleanup { 3553sub post_cleanup {
3100 my ($make_core) = @_; 3554 my ($make_core) = @_;
3101 3555
3102 warn Carp::longmess "post_cleanup backtrace" 3556 warn Carp::longmess "post_cleanup backtrace"
3103 if $make_core; 3557 if $make_core;
3558
3559 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$;
3561}
3562
3563# a safer delete_package, copied from Symbol
3564sub clear_package($) {
3565 my $pkg = shift;
3566
3567 # expand to full symbol table name if needed
3568 unless ($pkg =~ /^main::.*::$/) {
3569 $pkg = "main$pkg" if $pkg =~ /^::/;
3570 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3571 $pkg .= '::' unless $pkg =~ /::$/;
3572 }
3573
3574 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3575 my $stem_symtab = *{$stem}{HASH};
3576
3577 defined $stem_symtab and exists $stem_symtab->{$leaf}
3578 or return;
3579
3580 # clear all symbols
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 }
3586 warn "cleared package $pkg\n";#d#
3104} 3587}
3105 3588
3106sub do_reload_perl() { 3589sub do_reload_perl() {
3107 # can/must only be called in main 3590 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3591 if ($Coro::current != $Coro::main) {
3109 warn "can only reload from main coroutine"; 3592 warn "can only reload from main coroutine";
3110 return; 3593 return;
3111 } 3594 }
3112 3595
3596 return if $RELOAD++;
3597
3598 while ($RELOAD) {
3113 warn "reloading..."; 3599 warn "reloading...";
3114 3600
3115 warn "entering sync_job"; 3601 warn "entering sync_job";
3116 3602
3117 cf::sync_job { 3603 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3605 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
3121 3607
3122 warn "syncing database to disk"; 3608 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3610
3125 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
3126 3612
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3614 while (IO::AIO::nreqs || BDB::nreqs) {
3138 warn "iterate..."; 3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = ();
3146
3147 warn "removing commands";
3148 %COMMAND = ();
3149
3150 warn "removing ext/exti commands";
3151 %EXTCMD = ();
3152 %EXTICMD = ();
3153
3154 warn "unloading/nuking all extensions";
3155 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg";
3157
3158 if (my $cb = $pkg->can ("unload")) {
3159 eval {
3160 $cb->($pkg);
3161 1
3162 } or warn "$pkg unloaded, but with errors: $@";
3163 } 3616 }
3164 3617
3165 warn "... nuking $pkg"; 3618 warn "cancelling all extension coros";
3166 Symbol::delete_package $pkg; 3619 $_->cancel for values %EXT_CORO;
3167 } 3620 %EXT_CORO = ();
3168 3621
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3622 warn "removing commands";
3170 while (my ($k, $v) = each %INC) { 3623 %COMMAND = ();
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3173 warn "... unloading $k"; 3631 warn "... unloading $pkg";
3174 delete $INC{$k};
3175 3632
3176 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g;
3178
3179 if (my $cb = $k->can ("unload_module")) { 3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3180 $cb->(); 3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 }
3639
3640 warn "... clearing $pkg";
3641 clear_package $pkg;
3181 } 3642 }
3182 3643
3183 Symbol::delete_package $k; 3644 warn "unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647
3648 warn "... unloading $k";
3649 delete $INC{$k};
3650
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) {
3655 $cb->();
3656 }
3657
3658 clear_package $k;
3184 } 3659 }
3185 3660
3186 warn "getting rid of safe::, as good as possible"; 3661 warn "getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 3662 clear_package "safe::$_"
3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3189 3664
3190 warn "unloading cf.pm \"a bit\""; 3665 warn "unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 3666 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 3667 delete $INC{"cf/pod.pm"};
3193 3668
3194 # don't, removes xs symbols, too, 3669 # don't, removes xs symbols, too,
3195 # and global variables created in xs 3670 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 3671 #clear_package __PACKAGE__;
3197 3672
3198 warn "unload completed, starting to reload now"; 3673 warn "unload completed, starting to reload now";
3199 3674
3200 warn "reloading cf.pm"; 3675 warn "reloading cf.pm";
3201 require cf; 3676 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3678
3204 warn "loading config and database again"; 3679 warn "loading config and database again";
3205 cf::cfg_load; 3680 cf::reload_config;
3206 3681
3207 warn "loading extensions"; 3682 warn "loading extensions";
3208 cf::load_extensions; 3683 cf::load_extensions;
3209 3684
3210 warn "reattaching attachments to objects/players"; 3685 warn "reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 3686 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 3687 warn "reattaching attachments to maps";
3213 reattach $_ for values %MAP; 3688 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 3689 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 3690 reattach $_ for values %PLAYER;
3216 3691
3217 warn "leaving sync_job"; 3692 warn "leaving sync_job";
3218 3693
3219 1 3694 1
3220 } or do { 3695 } or do {
3221 warn $@; 3696 warn $@;
3222 warn "error while reloading, exiting."; 3697 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3698 };
3225 3699
3226 warn "reloaded"; 3700 warn "reloaded";
3701 --$RELOAD;
3702 }
3227}; 3703};
3228 3704
3229our $RELOAD_WATCHER; # used only during reload 3705our $RELOAD_WATCHER; # used only during reload
3230 3706
3231sub reload_perl() { 3707sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3234 3710
3235 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3236 reentrant => 0,
3237 after => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => sub {
3240 do_reload_perl; 3712 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3242 },
3243 ); 3714 };
3244} 3715}
3245 3716
3246register_command "reload" => sub { 3717register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3248 3719
3249 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3724 reload_perl;
3725 };
3252 } 3726 }
3253}; 3727};
3254 3728
3255unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3256 3730
3258 3732
3259our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3261 3735
3262sub wait_for_tick { 3736sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3738
3266 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3741 $signal->wait;
3269} 3742}
3270 3743
3271sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3746
3275 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3749 $signal->wait;
3278} 3750}
3279 3751
3280 my $min = 1e6;#d# 3752sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3292 return; 3756 return;
3293 } 3757 }
3294 3758
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3298 3760
3299 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3763 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3303 or die; 3765 write_runtime_sync
3304 3766 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3767 };
3768 }
3321 3769
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3771 $sig->send;
3338 } 3772 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3774 $sig->send;
3341 } 3775 }
3342 3776
3343 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3779
3354 _post_tick; 3780 if (0) {
3355 3781 if ($NEXT_TICK) {
3356 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3357 }, 3786 }
3358); 3787}
3359 3788
3360{ 3789{
3361 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3791
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3371 3793 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3795
3387 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3800 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3801 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3802 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3803
3390 cf::sync_job { 3804 cf::sync_job {
3391 eval { 3805 eval {
3392 BDB::db_env_open 3806 BDB::db_env_open
3393 $DB_ENV, 3807 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3809 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3810 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3811 0666;
3398 3812
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3813 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3814 };
3404 3815
3405 cf::cleanup "db_env_open(db): $@" if $@; 3816 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3817 };
3407 } 3818 }
3819
3820 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3821 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3822 };
3823 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3824 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3825 };
3826 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3827 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3828 };
3408} 3829}
3409 3830
3410{ 3831{
3832 # configure IO::AIO
3833
3411 IO::AIO::min_parallel 8; 3834 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3835 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3836 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3837}
3424 3838
3425my $_log_backtrace; 3839my $_log_backtrace;
3426 3840
3427sub _log_backtrace { 3841sub _log_backtrace {
3430 $msg =~ s/\n//; 3844 $msg =~ s/\n//;
3431 3845
3432 # limit the # of concurrent backtraces 3846 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3847 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3848 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg;
3435 async { 3850 async {
3851 $Coro::current->{desc} = "abt $msg";
3852
3436 my @bt = fork_call { 3853 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3854 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3855 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3856 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3857 or die "addr2line: $!";
3448 } 3865 }
3449 3866
3450 @funcs 3867 @funcs
3451 }; 3868 };
3452 3869
3453 LOG llevInfo, "[ABT] $msg\n"; 3870 LOG llevInfo, "[ABT] $perl_bt\n";
3871 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt; 3872 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace; 3873 --$_log_backtrace;
3456 }; 3874 };
3457 } else { 3875 } else {
3458 LOG llevInfo, "[ABT] $msg\n"; 3876 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines