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.311 by root, Fri Jul 20 16:11:10 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 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;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::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
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
74 98
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 101our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
86our %CFG; 109our %CFG;
87 110
88our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 112our $RUNTIME;
113our $NOW;
90 114
91our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
94 118
95# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 121
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
101 126
102binmode STDOUT; 127binmode STDOUT;
103binmode STDERR; 128binmode STDERR;
104 129
105# read virtual server time, if available 130# read virtual server time, if available
158 183
159The raw value load value from the last tick. 184The raw value load value from the last tick.
160 185
161=item %cf::CFG 186=item %cf::CFG
162 187
163Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 189from wherever your confdir points to.
165 190
166=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
167 192
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 211 $msg .= "\n"
187 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
188 213
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 215
191 utf8::encode $msg;
192 LOG llevError, $msg; 216 LOG llevError, $msg;
193 }; 217 };
194} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
195 234
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 245for my $pkg (qw(
207 cf::global cf::attachable 246 cf::global cf::attachable
208 cf::object cf::object::player 247 cf::object cf::object::player
209 cf::client cf::player 248 cf::client cf::player
210 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
211 cf::map cf::party cf::region 251 cf::party cf::region
212)) { 252)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 254}
216 255
217$Event::DIED = sub { 256$EV::DIED = sub {
218 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
219}; 258};
220 259
221############################################################################# 260#############################################################################
222 261
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 285 $d
247 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
248} 287}
249 288
250=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
251 290
252Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
253 292
254=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
255 294
256Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
257 296
258=cut 297=cut
259 298
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 300
262sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
264 303
265=item cf::lock_wait $string 304=item cf::lock_wait $string
266 305
267Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
268 307
271Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
274returned. 313returned.
275 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
276Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
278 320
279=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
280 322
281Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
282 324
283=cut 325=cut
284 326
285our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
286 329
287sub lock_wait($) { 330sub lock_wait($) {
288 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
289 337
290 # wait for lock, if any 338 # wait for lock, if any
291 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 341 Coro::schedule;
299 347
300 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
301 lock_wait $key; 349 lock_wait $key;
302 350
303 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
304 353
305 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
308 } 358 }
309} 359}
310 360
313 363
314 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
315} 365}
316 366
317sub freeze_mainloop { 367sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
319 369
320 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
322 }; 431 }
323 $TICK_WATCHER->stop; 432};
324 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
325} 446}
326 447
327=item cf::async { BLOCK } 448=item cf::async { BLOCK }
328 449
329Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
334 455
335BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
336 457
337=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
338 459
339The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
340is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable. 463acceptable.
343 464
344If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
345the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
350 471
351sub sync_job(&) { 472sub sync_job(&) {
352 my ($job) = @_; 473 my ($job) = @_;
353 474
354 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
355 my $time = Event::time; 476 my $time = EV::time;
356 477
357 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
358 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
359 480
360 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
361 # (but this is cancel-safe) 482
362 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
363 484
364 my $busy = 1; 485 my $busy = 1;
365 my @res; 486 my @res;
366 487
367 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
368 @res = eval { $job->() }; 490 @res = eval { $job->() };
369 warn $@ if $@; 491 warn $@ if $@;
370 undef $busy; 492 undef $busy;
371 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
372 494
373 while ($busy) { 495 while ($busy) {
374 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
375 } 500 }
501 }
376 502
377 $time = Event::time - $time; 503 my $time = EV::time - $time;
378 504
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
383 506
384 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
385 } else { 508 } else {
386 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
387 510
412=item fork_call { }, $args 535=item fork_call { }, $args
413 536
414Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
415process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
418 541
419=cut 542=cut
420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429 543
430sub fork_call(&@) { 544sub fork_call(&@) {
431 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
432 546
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
436 or die "pipe: $!";
437 550
438 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 552 reset_signals;
452 local $SIG{__WARN__}; 553 &$cb
453 local $SIG{__DIE__}; 554 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 555
460 eval { 556 wantarray ? @res : $res[-1]
461 close $fh1; 557}
462 558
463 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
464 560
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
466 close $fh2;
467 };
468 562
469 warn $@ if $@; 563our %coin_alias = (
470 _exit 0; 564 "silver" => "silvercoin",
471 } 565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
472} 584}
473 585
474=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
475 587
476Returns a single value from the environment database. 588Returns a single value from the environment database.
478=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
479 591
480Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
483=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
484 618
485our $DB; 619our $DB;
486 620
487sub db_init { 621sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job { 622 cf::sync_job {
492 eval { 623 $DB ||= db_table "db";
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 } 624 };
502} 625}
503 626
504sub db_get($$) { 627sub db_get($$) {
505 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
506 629
556 if (1) { 679 if (1) {
557 $md5 = 680 $md5 =
558 join "\x00", 681 join "\x00",
559 $processversion, 682 $processversion,
560 map { 683 map {
561 Coro::cede; 684 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 686 } 0.. $#$src;
564 687
565 688
566 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
610attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
611to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
612 735
613In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
614C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
615Crossfire TRT). 738Deliantra).
616 739
617=over 4 740=over 4
618 741
619=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
620 743
902 } 1025 }
903 1026
904 0 1027 0
905} 1028}
906 1029
907=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
908 1031
909=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
910 1033
911Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
912 1035
919=cut 1042=cut
920 1043
921############################################################################# 1044#############################################################################
922# object support 1045# object support
923 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
1088
924sub reattach { 1089sub reattach {
925 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 1091 my ($obj) = @_;
927 1092
1093 # no longer needed after getting rid of delete_package?
928 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
929 1095
930 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
931 1097
932 @$registry = (); 1098 @$registry = ();
933 1099
948cf::attachable->attach ( 1114cf::attachable->attach (
949 prio => -1000000, 1115 prio => -1000000,
950 on_instantiate => sub { 1116 on_instantiate => sub {
951 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
952 1118
953 $data = from_json $data; 1119 $data = decode_json $data;
954 1120
955 for (@$data) { 1121 for (@$data) {
956 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
957 1123
958 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
974sub object_freezer_save { 1140sub object_freezer_save {
975 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
976 1142
977 sync_job { 1143 sync_job {
978 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
979 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
980 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
981 1148
982 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
984 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
985 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
986 close $fh; 1153 aio_close $fh;
987 1154
988 if (@$objs) { 1155 if (@$objs) {
989 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
990 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
991 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
992 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
993 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
994 close $fh; 1161 aio_close $fh;
995 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
996 } 1163 }
997 } else { 1164 } else {
998 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
999 } 1166 }
1004 } 1171 }
1005 } else { 1172 } else {
1006 aio_unlink $filename; 1173 aio_unlink $filename;
1007 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1008 } 1175 }
1009 } 1176 };
1010} 1177}
1011 1178
1012sub object_freezer_as_string { 1179sub object_freezer_as_string {
1013 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1014 1181
1026 or return; 1193 or return;
1027 1194
1028 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1029 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1030 or return; 1197 or return;
1198
1031 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1032 } 1201 }
1033 1202
1203 utf8::decode (my $decname = $filename);
1034 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1035 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1036 return ($data, $av); 1207 ($data, $av)
1037} 1208}
1038 1209
1039=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1040 1211
1041=over 4 1212=over 4
1114 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
1115 1286
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1288
1118 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1124 } else { 1304 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1306 }
1127 1307
1128 cf::override; 1308 cf::override;
1155 1335
1156 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1157 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1158 1338
1159 $ext{source} = 1339 $ext{source} =
1160 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1161 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1162 . $source 1342 . $source
1163 . "\n};\n1"; 1343 . "\n};\n1";
1164 1344
1165 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1181 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1182 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1183 1363
1184 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1185 warn $msg; 1365 warn $msg;
1186 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1187 exit 1;
1188 } 1367 }
1189 1368
1190 warn $msg; 1369 warn $msg;
1191 } 1370 }
1192 1371
1217use Coro::AIO; 1396use Coro::AIO;
1218 1397
1219=head3 cf::player 1398=head3 cf::player
1220 1399
1221=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1222 1415
1223=item cf::player::find $login 1416=item cf::player::find $login
1224 1417
1225Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1226 1419
1262 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1263 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1264 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1265 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1266 1459
1267 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1268 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1269 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1270 } 1469 }
1271 } 1470 }
1272} 1471}
1273 1472
1282 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1283 1482
1284 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1286 1485
1486 cf::get_slot 0.01;
1487
1287 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1288 Coro::cede; 1489 cf::cede_to_tick;
1289} 1490}
1290 1491
1291sub new($) { 1492sub new($) {
1292 my ($login) = @_; 1493 my ($login) = @_;
1293 1494
1299 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1300 1501
1301 $self 1502 $self
1302} 1503}
1303 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1304=item $pl->quit_character 1515=item $pl->quit_character
1305 1516
1306Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1307be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1308 1519
1316 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1317 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1318 1529
1319 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1320 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1321 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1322 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1323 1536
1324 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1325 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1361 or return []; 1574 or return [];
1362 1575
1363 my @logins; 1576 my @logins;
1364 1577
1365 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1369 1588
1370 utf8::decode $login; 1589 utf8::decode $login;
1371 push @logins, $login; 1590 push @logins, $login;
1372 } 1591 }
1373 1592
1406 1625
1407Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1408 1627
1409=cut 1628=cut
1410 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1411sub expand_cfpod { 1641sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1413 1643
1414 # escape & and < 1644 my $xml;
1415 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g;
1417 1645
1418 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1419 1649
1420 1 while 1650 $group =~ s/&/&amp;/g;
1421 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1425 # replace G<male|female> tags 1655 ([BCGHITU])
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1656 <
1427 $self->gender ? $2 : $1 1657 (?:
1428 }ge 1658 ([^<>]*) (?{ $group = $^N })
1429 # replace H<hint text> 1659 | < $interior >
1430 || s{H<([^\>]*)>} 1660 )
1661 >
1662 %gcsx
1431 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "") 1683 "")
1435 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1436 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1437 1695
1696 for ($xml) {
1438 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1439 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1440 1699
1441 # compress some whitespace 1700 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1446 1706
1447 $_ 1707 $xml
1448} 1708}
1709
1710no re 'eval';
1449 1711
1450sub hintmode { 1712sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1714 $_[0]{hintmode}
1453} 1715}
1454 1716
1455=item $player->ext_reply ($msgid, %msg) 1717=item $player->ext_reply ($msgid, @msg)
1456 1718
1457Sends an ext reply to the player. 1719Sends an ext reply to the player.
1458 1720
1459=cut 1721=cut
1460 1722
1461sub ext_reply($$%) { 1723sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1724 my ($self, $id, @msg) = @_;
1463 1725
1464 $msg{msgid} = $id; 1726 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1727}
1467 1728
1468=item $player->ext_event ($type, %msg) 1729=item $player->ext_msg ($type, @msg)
1469 1730
1470Sends an ext event to the client. 1731Sends an ext event to the client.
1471 1732
1472=cut 1733=cut
1473 1734
1474sub ext_event($$%) { 1735sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1736 my ($self, $type, @msg) = @_;
1476 1737
1477 $self->ns->ext_event ($type, %msg); 1738 $self->ns->ext_msg ($type, @msg);
1478} 1739}
1479 1740
1480=head3 cf::region 1741=head3 cf::region
1481 1742
1482=over 4 1743=over 4
1526our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1527our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1528 1789
1529sub generate_random_map { 1790sub generate_random_map {
1530 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1531 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1532 $self->_create_random_map ( 1796 $self->_create_random_map (
1533 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1534 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1535 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1657 1921
1658# the temporary/swap location 1922# the temporary/swap location
1659sub save_path { 1923sub save_path {
1660 my ($self) = @_; 1924 my ($self) = @_;
1661 1925
1662 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1663 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1664} 1928}
1665 1929
1666# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1667sub uniq_path { 1931sub uniq_path {
1668 my ($self) = @_; 1932 my ($self) = @_;
1669 1933
1670 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1671 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1672} 1936}
1673 1937
1674# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1675# all maps in C++... 1939# all maps in C++...
1698 1962
1699sub load_header_from($) { 1963sub load_header_from($) {
1700 my ($self, $path) = @_; 1964 my ($self, $path) = @_;
1701 1965
1702 utf8::encode $path; 1966 utf8::encode $path;
1703 #aio_open $path, O_RDONLY, 0 1967 my $f = new_from_file cf::object::thawer $path
1704 # or return;
1705
1706 $self->_load_header ($path)
1707 or return; 1968 or return;
1969
1970 $self->_load_header ($f)
1971 or return;
1972
1973 local $MAP_LOADING{$self->{path}} = $self;
1974 $f->resolve_delayed_derefs;
1708 1975
1709 $self->{load_path} = $path; 1976 $self->{load_path} = $path;
1710 1977
1711 1 1978 1
1712} 1979}
1766sub find { 2033sub find {
1767 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1768 2035
1769 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1770 2037
2038 cf::lock_wait "map_data:$path";#d#remove
1771 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1772 2040
1773 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1774 my $guard = cf::lock_acquire "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
1775 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1776 or return; 2046 or return;
1777 2047
1778 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1779 2049
1781 or return; 2051 or return;
1782 2052
1783 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1784 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1785 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2057 undef $guard1;
1786 $map->reset; 2058 $map->reset;
1787 undef $guard;
1788 return find $path; 2059 return find $path;
1789 } 2060 }
1790 2061
1791 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1792 } 2063 }
1801 local $self->{deny_reset} = 1; # loading can take a long time 2072 local $self->{deny_reset} = 1; # loading can take a long time
1802 2073
1803 my $path = $self->{path}; 2074 my $path = $self->{path};
1804 2075
1805 { 2076 {
1806 my $guard = cf::lock_acquire "map_load:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1807 2078
2079 return unless $self->valid;
1808 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1809 2081
1810 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1811 2083
1812 $self->alloc; 2084 $self->alloc;
1813 2085
1814 $self->pre_load; 2086 $self->pre_load;
1815 Coro::cede; 2087 cf::cede_to_tick;
1816 2088
2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2090 $f->skip_block;
1817 $self->_load_objects ($self->{load_path}, 1) 2091 $self->_load_objects ($f)
1818 or return; 2092 or return;
1819 2093
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1821 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1822 2096
1823 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1824 utf8::encode $uniq; 2098 utf8::encode $uniq;
1825 if (aio_open $uniq, O_RDONLY, 0) { 2099 unless (aio_stat $uniq) {
2100 if (my $f = new_from_file cf::object::thawer $uniq) {
1826 $self->clear_unique_items; 2101 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 2102 $self->_load_objects ($f);
2103 $f->resolve_delayed_derefs;
2104 }
1828 } 2105 }
1829 } 2106 }
1830 2107
1831 Coro::cede; 2108 $f->resolve_delayed_derefs;
2109
2110 cf::cede_to_tick;
1832 # now do the right thing for maps 2111 # now do the right thing for maps
1833 $self->link_multipart_objects; 2112 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 2113 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 2114 unless $self->difficulty;
1836 Coro::cede; 2115 cf::cede_to_tick;
1837 2116
1838 unless ($self->{deny_activate}) { 2117 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 2118 $self->decay_objects;
1840 $self->fix_auto_apply; 2119 $self->fix_auto_apply;
1841 $self->update_buttons; 2120 $self->update_buttons;
1842 Coro::cede; 2121 cf::cede_to_tick;
1843 $self->set_darkness_map; 2122 $self->set_darkness_map;
1844 Coro::cede; 2123 cf::cede_to_tick;
1845 $self->activate; 2124 $self->activate;
1846 } 2125 }
1847 2126
2127 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME);
2129
1848 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1849 } 2131 }
1850 2132
1851 $self->post_load; 2133 $self->post_load;
1852} 2134}
1853 2135
1862 2144
1863 $self 2145 $self
1864} 2146}
1865 2147
1866# find and load all maps in the 3x3 area around a map 2148# find and load all maps in the 3x3 area around a map
1867sub load_diag { 2149sub load_neighbours {
1868 my ($map) = @_; 2150 my ($map) = @_;
1869 2151
1870 my @diag; # diagonal neighbours 2152 my @neigh; # diagonal neighbours
1871 2153
1872 for (0 .. 3) { 2154 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 2155 my $neigh = $map->tile_path ($_)
1874 or next; 2156 or next;
1875 $neigh = find $neigh, $map 2157 $neigh = find $neigh, $map
1876 or next; 2158 or next;
1877 $neigh->load; 2159 $neigh->load;
1878 2160
2161 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2162 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2163 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 2164 }
1882 2165
1883 for (@diag) { 2166 for (grep defined $_->[0], @neigh) {
2167 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 2168 my $neigh = find $path, $origin
1885 or next; 2169 or next;
1886 $neigh->load; 2170 $neigh->load;
1887 } 2171 }
1888} 2172}
1889 2173
1894} 2178}
1895 2179
1896sub do_load_sync { 2180sub do_load_sync {
1897 my ($map) = @_; 2181 my ($map) = @_;
1898 2182
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main;
2185
1899 cf::sync_job { $map->load }; 2186 cf::sync_job { $map->load };
1900} 2187}
1901 2188
1902our %MAP_PREFETCH; 2189our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 2190our $MAP_PREFETCHER = undef;
1904 2191
1905sub find_async { 2192sub find_async {
1906 my ($path, $origin) = @_; 2193 my ($path, $origin, $load) = @_;
1907 2194
1908 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
1909 2196
1910 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1912 } 2199 }
1913 2200
1914 undef $MAP_PREFETCH{$path}; 2201 $MAP_PREFETCH{$path} |= $load;
2202
1915 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
1916 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 2208 if (my $map = find $k) {
1919 $map->load; 2209 $map->load if $v;
1920 } 2210 }
1921 2211
1922 delete $MAP_PREFETCH{$path}; 2212 delete $MAP_PREFETCH{$k};
1923 } 2213 }
1924 } 2214 }
1925 undef $MAP_PREFETCHER; 2215 undef $MAP_PREFETCHER;
1926 }; 2216 };
1927 $MAP_PREFETCHER->prio (6); 2217 $MAP_PREFETCHER->prio (6);
1930} 2220}
1931 2221
1932sub save { 2222sub save {
1933 my ($self) = @_; 2223 my ($self) = @_;
1934 2224
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2226
1937 $self->{last_save} = $cf::RUNTIME; 2227 $self->{last_save} = $cf::RUNTIME;
1938 2228
1939 return unless $self->dirty; 2229 return unless $self->dirty;
1940 2230
1946 return if $self->{deny_save}; 2236 return if $self->{deny_save};
1947 2237
1948 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
1949 2239
1950 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
1951 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
1952 }; 2243 };
2244
2245 cf::get_slot 0.02;
1953 2246
1954 if ($uniq) { 2247 if ($uniq) {
1955 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1956 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1957 } else { 2250 } else {
1963 my ($self) = @_; 2256 my ($self) = @_;
1964 2257
1965 # save first because save cedes 2258 # save first because save cedes
1966 $self->save; 2259 $self->save;
1967 2260
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2262
1970 return if $self->players; 2263 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
1972 return if $self->{deny_save}; 2265 return if $self->{deny_save};
1973 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1974 $self->clear; 2271 $self->clear;
1975 $self->in_memory (cf::MAP_SWAPPED);
1976} 2272}
1977 2273
1978sub reset_at { 2274sub reset_at {
1979 my ($self) = @_; 2275 my ($self) = @_;
1980 2276
2012 if $uniq; 2308 if $uniq;
2013 } 2309 }
2014 2310
2015 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
2016 2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2017 $self->clear; 2315 $self->clear;
2018
2019 $_->clear_links_to ($self) for values %cf::MAP;
2020 2316
2021 $self->unlink_save; 2317 $self->unlink_save;
2022 $self->destroy; 2318 $self->destroy;
2023} 2319}
2024 2320
2025my $nuke_counter = "aaaa"; 2321my $nuke_counter = "aaaa";
2026 2322
2027sub nuke { 2323sub nuke {
2028 my ($self) = @_; 2324 my ($self) = @_;
2029 2325
2326 {
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2030 delete $cf::MAP{$self->path}; 2329 delete $cf::MAP{$self->path};
2031 2330
2032 $self->unlink_save; 2331 $self->unlink_save;
2033 2332
2034 bless $self, "cf::map"; 2333 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2334 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2335 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2336 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2338
2040 $cf::MAP{$self->path} = $self; 2339 $cf::MAP{$self->path} = $self;
2340 }
2041 2341
2042 $self->reset; # polite request, might not happen 2342 $self->reset; # polite request, might not happen
2043} 2343}
2044 2344
2045=item $maps = cf::map::tmp_maps 2345=item $maps = cf::map::tmp_maps
2087 2387
2088sub unique_maps() { 2388sub unique_maps() {
2089 [ 2389 [
2090 map { 2390 map {
2091 utf8::decode $_; 2391 utf8::decode $_;
2092 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2093 ? normalise $_ 2395 : normalise $_
2094 : ()
2095 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2096 ] 2397 ]
2097} 2398}
2098 2399
2099package cf;
2100
2101=back 2400=back
2102 2401
2103=head3 cf::object 2402=head3 cf::object
2104 2403
2105=cut 2404=cut
2108 2407
2109=over 4 2408=over 4
2110 2409
2111=item $ob->inv_recursive 2410=item $ob->inv_recursive
2112 2411
2113Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2114 2414
2115=cut 2415=cut
2116 2416
2117sub inv_recursive_; 2417sub inv_recursive_;
2118sub inv_recursive_ { 2418sub inv_recursive_ {
2121 2421
2122sub inv_recursive { 2422sub inv_recursive {
2123 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2124} 2424}
2125 2425
2426=item $ref = $ob->ref
2427
2428Creates and returns a persistent reference to an object that can be stored as a string.
2429
2430=item $ob = cf::object::deref ($refstring)
2431
2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2433even if the object actually exists. May block.
2434
2435=cut
2436
2437sub deref {
2438 my ($ref) = @_;
2439
2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2441 my ($uuid, $name) = ($1, $2);
2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2443 or return;
2444 $pl->ob->uuid eq $uuid
2445 or return;
2446
2447 $pl->ob
2448 } else {
2449 warn "$ref: cannot resolve object reference\n";
2450 undef
2451 }
2452}
2453
2126package cf; 2454package cf;
2127 2455
2128=back 2456=back
2129 2457
2130=head3 cf::object::player 2458=head3 cf::object::player
2136Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2464Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2137can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2138dialogue with the given NPC character. 2466dialogue with the given NPC character.
2139 2467
2140=cut 2468=cut
2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2141 2483
2142# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2143# with dialog boxes. 2485# with dialog boxes.
2144#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2145sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2152 2494
2153 } else { 2495 } else {
2154 my $pl = $self->contr; 2496 my $pl = $self->contr;
2155 2497
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2498 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2501
2165 } else { 2502 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2168 } 2505 }
2169 } 2506 }
2507}
2508
2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2510
2511=cut
2512
2513sub cf::object::send_msg {
2514 my $pl = shift->contr
2515 or return;
2516 $pl->send_msg (@_);
2170} 2517}
2171 2518
2172=item $player_object->may ("access") 2519=item $player_object->may ("access")
2173 2520
2174Returns wether the given player is authorized to access resource "access" 2521Returns wether the given player is authorized to access resource "access"
2253 # use -1 or undef as default coordinates, not 0, 0 2600 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2601 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2602 if $x <=0 && $y <= 0;
2256 2603
2257 $map->load; 2604 $map->load;
2258 $map->load_diag; 2605 $map->load_neighbours;
2259 2606
2260 return unless $self->contr->active; 2607 return unless $self->contr->active;
2261 $self->activate_recursive; 2608 $self->activate_recursive;
2262 2609
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2270her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2271that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2272the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process. 2620be called at the end of this process.
2274 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2275=cut 2625=cut
2276 2626
2277our $GOTOGEN; 2627our $GOTOGEN;
2278 2628
2279sub cf::object::player::goto { 2629sub cf::object::player::goto {
2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2284 2634
2285 $self->enter_link; 2635 $self->enter_link;
2286 2636
2287 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
2288 my $map = eval { 2659 my $map = eval {
2289 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2290 2661
2291 if ($map) { 2662 if ($map) {
2292 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2293 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2294 } else { 2665 } else {
2295 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2296 } 2667 }
2297 2668
2298 $map 2669 $map
2299 }; 2670 };
2300 2671
2336} 2707}
2337 2708
2338sub prepare_random_map { 2709sub prepare_random_map {
2339 my ($exit) = @_; 2710 my ($exit) = @_;
2340 2711
2341 my $guard = cf::lock_acquire "exit_prepare:$exit";
2342
2343 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2344 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2345 # that depends on the exit object 2714 # that depends on the exit object
2346 2715
2347 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2349 if ($exit->map) { 2718 if ($exit->map) {
2350 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2351 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2352 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2353 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2354 } 2725 }
2355 2726
2356 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2357 2728
2358 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2359 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2360 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2361 2732
2362 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2363 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2364 undef $fh; 2735 undef $fh;
2365 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2366 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2367 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2368 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2369 } 2744 }
2370} 2745}
2371 2746
2372sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2373 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2374 2749
2375 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2376 2751
2377 if ($exit->slaying eq "/!") {
2378 #TODO: this should de-fi-ni-te-ly not be a sync-job
2379 # the problem is that $exit might not survive long enough
2380 # so it needs to be done right now, right here
2381 cf::sync_job { prepare_random_map $exit };
2382 }
2383
2384 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2385 my $hp = $exit->stats->hp;
2386 my $sp = $exit->stats->sp;
2387
2388 $self->enter_link; 2752 $self->enter_link;
2389 2753
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2394 (async { 2754 (async {
2395 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2396 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2397 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2398 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2399 1; 2778 1
2400 }) { 2779 }) {
2401 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2402 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2403 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2404 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2436 2815
2437=cut 2816=cut
2438 2817
2818# non-persistent channels (usually the info channel)
2819our %CHANNEL = (
2820 "c/identify" => {
2821 id => "infobox",
2822 title => "Identify",
2823 reply => undef,
2824 tooltip => "Items recently identified",
2825 },
2826 "c/examine" => {
2827 id => "infobox",
2828 title => "Examine",
2829 reply => undef,
2830 tooltip => "Signs and other items you examined",
2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2874);
2875
2439sub cf::client::send_msg { 2876sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2878
2442 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2443 2880
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2882
2883 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2448 if (ref $channel) { 2892 } elsif (ref $channel) {
2449 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2896 $self->ext_msg (channel_info => $channel)
2897 if $self->can_msg;
2453 } 2898 }
2454 2899
2455 $channel = $channel->{id}; 2900 $channel = $channel->{id};
2456 } 2901 }
2457 2902
2903 return unless @extra || length $msg;
2904
2458 if ($self->can_msg) { 2905 if ($self->can_msg) {
2906 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF;
2909
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2910 $self->send_packet ("msg " . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2912 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 if ($color >= 0) { 2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923
2924 $color &= cf::NDI_COLOR_MASK;
2925
2926 utf8::encode $msg;
2927
2472 if (0 && $msg =~ /\[/) { 2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2931 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2933 $self->send_packet ("drawinfo $color $msg")
2477 } 2934 }
2478 } 2935 }
2479 } 2936 }
2480} 2937}
2481 2938
2482=item $client->ext_event ($type, %msg) 2939=item $client->ext_msg ($type, @msg)
2483 2940
2484Sends an ext event to the client. 2941Sends an ext event to the client.
2485 2942
2486=cut 2943=cut
2487 2944
2488sub cf::client::ext_event($$%) { 2945sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2946 my ($self, $type, @msg) = @_;
2490 2947
2491 return unless $self->extcmd; 2948 if ($self->extcmd == 2) {
2492 2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2951 push @msg, msgtype => "event_$type";
2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 }
2954}
2955
2956=item $client->ext_reply ($msgid, @msg)
2957
2958Sends an ext reply to the client.
2959
2960=cut
2961
2962sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_;
2964
2965 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 }
2495} 2972}
2496 2973
2497=item $success = $client->query ($flags, "text", \&cb) 2974=item $success = $client->query ($flags, "text", \&cb)
2498 2975
2499Queues a query to the client, calling the given callback with 2976Queues a query to the client, calling the given callback with
2554 my ($ns, $buf) = @_; 3031 my ($ns, $buf) = @_;
2555 3032
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3033 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 3034
2558 if (ref $msg) { 3035 if (ref $msg) {
3036 my ($type, $reply, @payload) =
3037 "ARRAY" eq ref $msg
3038 ? @$msg
3039 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3040
3041 my @reply;
3042
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3043 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 3044 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 3045 }
3046
3047 $ns->ext_reply ($reply, @reply)
3048 if $reply;
3049
2565 } else { 3050 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3051 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 } 3052 }
2568 3053
2569 cf::override; 3054 cf::override;
2616our $safe = new Safe "safe"; 3101our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 3102our $safe_hole = new Safe::Hole;
2618 3103
2619$SIG{FPE} = 'IGNORE'; 3104$SIG{FPE} = 'IGNORE';
2620 3105
2621$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3106$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math
3108 grepstart grepwhile mapstart mapwhile
3109 sort time
3110));
2622 3111
2623# here we export the classes and methods available to script code 3112# here we export the classes and methods available to script code
2624 3113
2625=pod 3114=pod
2626 3115
2627The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2628 3117
2629 cf::object 3118 cf::object
2630 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2631 insert remove 3120 insert remove name archname title slaying race decrease split
2632 3121
2633 cf::object::player 3122 cf::object::player
2634 player 3123 player
2635 3124
2636 cf::player 3125 cf::player
2641 3130
2642=cut 3131=cut
2643 3132
2644for ( 3133for (
2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)], 3135 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)],
2647 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2650) { 3140) {
2651 no strict 'refs'; 3141 no strict 'refs';
2727# the server's init and main functions 3217# the server's init and main functions
2728 3218
2729sub load_facedata($) { 3219sub load_facedata($) {
2730 my ($path) = @_; 3220 my ($path) = @_;
2731 3221
3222 # HACK to clear player env face cache, we need some signal framework
3223 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = ();
3225
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227
2732 warn "loading facedata from $path\n"; 3228 warn "loading facedata from $path\n";
2733 3229
2734 my $facedata; 3230 my $facedata;
2735 0 < aio_load $path, $facedata 3231 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 3232 or die "$path: $!";
2738 $facedata = Coro::Storable::thaw $facedata; 3234 $facedata = Coro::Storable::thaw $facedata;
2739 3235
2740 $facedata->{version} == 2 3236 $facedata->{version} == 2
2741 or cf::cleanup "$path: version mismatch, cannot proceed."; 3237 or cf::cleanup "$path: version mismatch, cannot proceed.";
2742 3238
3239 # patch in the exptable
3240 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC,
3242 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3243 };
3244 cf::cede_to_tick;
3245
2743 { 3246 {
2744 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
2745 3248
2746 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
2748 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 3256
2753 cf::cede_to_tick; 3257 cf::cede_to_tick;
2754 } 3258 }
2755 3259
2756 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
2757 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
2758 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
2759 or next; 3264 or next;
3265
2760 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2763 } else { 3269 } else {
2764 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
2781 3287
2782 { 3288 {
2783 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787 3292
2788 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({ 3294 if (defined $info->{type}) {
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
2796 3297
2797 if ($name =~ /\.jpg$/) { 3298 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3299 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
2800 } else { 3313 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 3314 $RESOURCE{$name} = $info;
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 3315 }
2807 3316
2808 cf::cede_to_tick; 3317 cf::cede_to_tick;
2809 } 3318 }
2810 } 3319 }
2811 3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322
2812 1 3323 1
2813} 3324}
2814 3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345
3346register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_;
3348
3349 while (my ($k, $v) = each %$want) {
3350 $ns->fx_want ($k, $v);
3351 }
3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
2815sub reload_regions { 3364sub reload_regions {
3365 # HACK to clear player env face cache, we need some signal framework
3366 # for this (global event?)
3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3368
2816 load_resource_file "$MAPDIR/regions" 3369 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 3370 or die "unable to load regions file\n";
2818 3371
2819 for (cf::region::list) { 3372 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3373 $_->{match} = qr/$_->{match}/
2828} 3381}
2829 3382
2830sub reload_archetypes { 3383sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2836 load_resource_file "$DATADIR/archetypes"
2837 or die "unable to load archetypes\n";
2838} 3386}
2839 3387
2840sub reload_treasures { 3388sub reload_treasures {
2841 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
2842 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
2843} 3391}
2844 3392
2845sub reload_resources { 3393sub reload_resources {
2846 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
2847 3395
3396 reload_facedata;
3397 reload_archetypes;
2848 reload_regions; 3398 reload_regions;
2849 reload_facedata;
2850 #reload_archetypes;#d#
2851 reload_archetypes;
2852 reload_treasures; 3399 reload_treasures;
2853 3400
2854 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
2855} 3402}
2856 3403
2857sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
2858 reload_resources; 3409 reload_resources;
2859} 3410}
2860 3411
2861sub cfg_load { 3412sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3414 or return;
2864 3415
2865 local $/; 3416 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
2867 3418
2868 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2869 3420
2870 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2871 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2882sub main { 3433sub main {
2883 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
2884 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
2885 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2886 (async { 3437 (async {
2887 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
2888 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
2889 }; 3441 };
2890 3442
2891 cfg_load; 3443 {
3444 my $guard = freeze_mainloop;
3445 reload_config;
2892 db_init; 3446 db_init;
2893 load_extensions; 3447 load_extensions;
2894 3448
2895 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
2896 Event::loop; 3452 EV::loop;
2897} 3453}
2898 3454
2899############################################################################# 3455#############################################################################
2900# initialisation and cleanup 3456# initialisation and cleanup
2901 3457
2902# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
2903BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
2904 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
2905 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2906 reentrant => 0,
2907 data => WF_AUTOCANCEL,
2908 signal => $signal,
2909 prio => 0,
2910 cb => sub {
2911 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
2912 },
2913 ); 3464 };
2914 } 3465 }
2915} 3466}
2916 3467
2917sub write_runtime { 3468sub write_runtime_sync {
2918 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
2919 3470
2920 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
2921 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
2922 3473
2948 and return; 3499 and return;
2949 3500
2950 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
2951 3502
2952 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
2953} 3547}
2954 3548
2955sub emergency_save() { 3549sub emergency_save() {
2956 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2957 3551
2963 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
2964 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
2965 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
2966 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
2967 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2968 $pl->save; 3563 $pl->save;
2969 } 3564 }
2970 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
2971 3566
2972 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
2978 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
2979 3574
2980 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
2981 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
2982 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
2983 }; 3582 };
2984 3583
2985 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
2986} 3585}
2987 3586
2989 my ($make_core) = @_; 3588 my ($make_core) = @_;
2990 3589
2991 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
2992 if $make_core; 3591 if $make_core;
2993} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
2994 3621
2995sub do_reload_perl() { 3622sub do_reload_perl() {
2996 # can/must only be called in main 3623 # can/must only be called in main
2997 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
2998 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
2999 return; 3626 return;
3000 } 3627 }
3001 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3002 warn "reloading..."; 3632 warn "reloading...";
3003 3633
3004 warn "entering sync_job"; 3634 warn "entering sync_job";
3005 3635
3006 cf::sync_job { 3636 cf::sync_job {
3007 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3008 cf::emergency_save; 3638 cf::emergency_save;
3009 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3010 3640
3011 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3012 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3013 3643
3014 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3015 3645
3016 warn "cancelling all WF_AUTOCANCEL watchers";
3017 for (Event::all_watchers) {
3018 $_->cancel if $_->data & WF_AUTOCANCEL;
3019 }
3020
3021 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3022 for (;;) {
3023 BDB::flush;
3024 IO::AIO::flush;
3025 Coro::cede;
3026 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3027 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3028 }
3029
3030 ++$RELOAD;
3031
3032 warn "cancelling all extension coros";
3033 $_->cancel for values %EXT_CORO;
3034 %EXT_CORO = ();
3035
3036 warn "removing commands";
3037 %COMMAND = ();
3038
3039 warn "removing ext/exti commands";
3040 %EXTCMD = ();
3041 %EXTICMD = ();
3042
3043 warn "unloading/nuking all extensions";
3044 for my $pkg (@EXTS) {
3045 warn "... unloading $pkg";
3046
3047 if (my $cb = $pkg->can ("unload")) {
3048 eval {
3049 $cb->($pkg);
3050 1
3051 } or warn "$pkg unloaded, but with errors: $@";
3052 } 3649 }
3053 3650
3054 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3055 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3056 } 3653 %EXT_CORO = ();
3057 3654
3058 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3059 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3060 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3061 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3062 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3063 delete $INC{$k};
3064 3665
3065 $k =~ s/\.pm$//;
3066 $k =~ s/\//::/g;
3067
3068 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3069 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3070 } 3675 }
3071 3676
3072 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3073 } 3692 }
3074 3693
3075 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3076 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3077 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3078 3697
3079 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3080 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3081 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3082 3701
3083 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3084 # and global variables created in xs 3703 # and global variables created in xs
3085 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3086 3705
3087 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3088 3707
3089 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3090 require cf; 3709 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3711
3093 warn "loading config and database again"; 3712 warn "loading config and database again";
3094 cf::cfg_load; 3713 cf::reload_config;
3095 3714
3096 warn "loading extensions"; 3715 warn "loading extensions";
3097 cf::load_extensions; 3716 cf::load_extensions;
3098 3717
3099 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3100 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3101 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3102 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3103 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3104 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3105 3724
3106 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3107 3726
3108 1 3727 1
3109 } or do { 3728 } or do {
3110 warn $@; 3729 warn $@;
3111 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3112 exit 1;
3113 }; 3731 };
3114 3732
3115 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3116}; 3736};
3117 3737
3118our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3119 3739
3120sub reload_perl() { 3740sub reload_perl() {
3121 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3122 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3123 3743
3124 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3125 reentrant => 0,
3126 after => 0,
3127 data => WF_AUTOCANCEL,
3128 cb => sub {
3129 do_reload_perl; 3745 do_reload_perl;
3130 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3131 },
3132 ); 3747 };
3133} 3748}
3134 3749
3135register_command "reload" => sub { 3750register_command "reload" => sub {
3136 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3137 3752
3138 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3139 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3140 async { reload_perl }; 3757 reload_perl;
3758 };
3141 } 3759 }
3142}; 3760};
3143 3761
3144unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3145 3763
3147 3765
3148our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3149our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3150 3768
3151sub wait_for_tick { 3769sub wait_for_tick {
3152 return unless $TICK_WATCHER->is_active;
3153 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3154 3771
3155 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3156 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3157 $signal->wait; 3774 $signal->wait;
3158} 3775}
3159 3776
3160sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3161 return unless $TICK_WATCHER->is_active;
3162 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3163 3779
3164 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3165 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3166 $signal->wait; 3782 $signal->wait;
3167} 3783}
3168 3784
3169 my $min = 1e6;#d# 3785sub tick {
3170 my $avg = 10;
3171$TICK_WATCHER = Event->timer (
3172 reentrant => 0,
3173 parked => 1,
3174 prio => 0,
3175 at => $NEXT_TICK || $TICK,
3176 data => WF_AUTOCANCEL,
3177 cb => sub {
3178 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3179 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3180 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3181 return; 3789 return;
3182 } 3790 }
3183 3791
3184 $NOW = $tick_start = Event::time;
3185
3186 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3187 3793
3188 0 && sync_job {#d# 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3189 for(1..10) { 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3190 my $t = Event::time; 3796 Coro::async_pool {
3191 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3797 $Coro::current->{desc} = "runtime saver";
3192 or die; 3798 write_runtime_sync
3193 3799 or warn "ERROR: unable to write runtime file: $!";
3194 $map->width (50);
3195 $map->height (50);
3196 $map->alloc;
3197 $map->_load_objects ("/tmp/x.map", 1);
3198 my $t = Event::time - $t;
3199
3200 #next unless $t < 0.0013;#d#
3201 if ($t < $min) {
3202 $min = $t;
3203 }
3204 $avg = $avg * 0.99 + $t * 0.01;
3205 }
3206 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3207 exit 0;
3208 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3209 }; 3800 };
3801 }
3210 3802
3211 $RUNTIME += $TICK;
3212 $NEXT_TICK += $TICK;
3213
3214 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3215 $NEXT_RUNTIME_WRITE = $NOW + 10;
3216 Coro::async_pool {
3217 write_runtime
3218 or warn "ERROR: unable to write runtime file: $!";
3219 };
3220 }
3221
3222# my $AFTER = Event::time;
3223# warn $AFTER - $NOW;#d#
3224
3225 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3226 $sig->send; 3804 $sig->send;
3227 } 3805 }
3228 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3229 $sig->send; 3807 $sig->send;
3230 } 3808 }
3231 3809
3232 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3233
3234 # if we are delayed by four ticks or more, skip them all
3235 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3236
3237 $TICK_WATCHER->at ($NEXT_TICK);
3238 $TICK_WATCHER->start;
3239
3240 $LOAD = ($NOW - $tick_start) / $TICK;
3241 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3242 3812
3243 _post_tick; 3813 if (0) {
3244 3814 if ($NEXT_TICK) {
3245 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3246 }, 3819 }
3247); 3820}
3248 3821
3249{ 3822{
3250 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
3251 $BDB_POLL_WATCHER = Event->io ( 3824
3252 reentrant => 0,
3253 fd => BDB::poll_fileno,
3254 poll => 'r',
3255 prio => 0,
3256 data => WF_AUTOCANCEL,
3257 cb => \&BDB::poll_cb,
3258 );
3259 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3260 3826 BDB::max_poll_reqs $TICK * 0.1;
3261 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
3262 my $status;
3263 my $current = $Coro::current;
3264 (
3265 sub {
3266 $status = $!;
3267 $current->ready; undef $current;
3268 },
3269 sub {
3270 Coro::schedule while defined $current;
3271 $! = $status;
3272 },
3273 )
3274 };
3275 3828
3276 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3277 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3278 3836
3279 cf::sync_job { 3837 cf::sync_job {
3280 eval { 3838 eval {
3281 BDB::db_env_open 3839 BDB::db_env_open
3282 $DB_ENV, 3840 $DB_ENV,
3284 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3285 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3286 0666; 3844 0666;
3287 3845
3288 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3289
3290 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3291 $DB_ENV->set_lk_detect;
3292 }; 3847 };
3293 3848
3294 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3295 }; 3850 };
3296 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
3297} 3862}
3298 3863
3299{ 3864{
3865 # configure IO::AIO
3866
3300 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3301
3302 undef $Coro::AIO::WATCHER;
3303 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3304 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3305 reentrant => 0,
3306 data => WF_AUTOCANCEL,
3307 fd => IO::AIO::poll_fileno,
3308 poll => 'r',
3309 prio => 6,
3310 cb => \&IO::AIO::poll_cb,
3311 );
3312} 3870}
3313 3871
3314my $_log_backtrace; 3872my $_log_backtrace;
3315 3873
3316sub _log_backtrace { 3874sub _log_backtrace {
3320 3878
3321 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3322 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3323 ++$_log_backtrace; 3881 ++$_log_backtrace;
3324 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3325 my @bt = fork_call { 3885 my @bt = fork_call {
3326 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3327 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3328 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3329 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines