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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
25use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
26use BDB (); 50use BDB ();
27use Data::Dumper; 51use Data::Dumper;
28use Digest::MD5; 52use Digest::MD5;
29use Fcntl; 53use Fcntl;
30use YAML::Syck (); 54use YAML ();
31use IO::AIO 2.32 (); 55use IO::AIO ();
32use Time::HiRes; 56use Time::HiRes;
33use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 69
46$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
47 71
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 73
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
73 98
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 101our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
81 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 107our $DB_ENV;
84 108
85our %CFG; 109our %CFG;
86 110
87our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 112our $RUNTIME;
113our $NOW;
89 114
90our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
93 118
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 121
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
100 126
101binmode STDOUT; 127binmode STDOUT;
102binmode STDERR; 128binmode STDERR;
103 129
104# read virtual server time, if available 130# read virtual server time, if available
157 183
158The raw value load value from the last tick. 184The raw value load value from the last tick.
159 185
160=item %cf::CFG 186=item %cf::CFG
161 187
162Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 189from wherever your confdir points to.
164 190
165=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
166 192
167These 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
168returns directly I<after> the tick processing (and consequently, can only wake one process 194returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
202
171=back 203=back
172 204
173=cut 205=cut
174 206
175BEGIN { 207BEGIN {
179 $msg .= "\n" 211 $msg .= "\n"
180 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
181 213
182 $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;
183 215
184 utf8::encode $msg;
185 LOG llevError, $msg; 216 LOG llevError, $msg;
186 }; 217 };
187} 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#?
188 234
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 251)) {
206 no strict 'refs'; 252 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 254}
209 255
210$Event::DIED = sub { 256$EV::DIED = sub {
211 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
212}; 258};
213 259
214############################################################################# 260#############################################################################
215 261
238 $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;
239 $d 285 $d
240 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
241} 287}
242 288
243=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
244 290
245Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
246 292
247=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
248 294
249Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
250 296
251=cut 297=cut
252 298
253our $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
254 300
255sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
257 303
258=item cf::lock_wait $string 304=item cf::lock_wait $string
259 305
260Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
261 307
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
267returned. 313returned.
268 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
269Lock 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
270uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
271 320
272=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
273 322
274Return 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.
275 324
276=cut 325=cut
277 326
278our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
279 329
280sub lock_wait($) { 330sub lock_wait($) {
281 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#
282 337
283 # wait for lock, if any 338 # wait for lock, if any
284 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 341 Coro::schedule;
292 347
293 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
294 lock_wait $key; 349 lock_wait $key;
295 350
296 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
297 353
298 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
301 } 358 }
302} 359}
303 360
306 363
307 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
308} 365}
309 366
310sub freeze_mainloop { 367sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
312 369
313 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 431 }
316 $TICK_WATCHER->stop; 432};
317 $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;
318} 446}
319 447
320=item cf::async { BLOCK } 448=item cf::async { BLOCK }
321 449
322Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
327 455
328BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
329 457
330=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
331 459
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 463acceptable.
336 464
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
343 471
344sub sync_job(&) { 472sub sync_job(&) {
345 my ($job) = @_; 473 my ($job) = @_;
346 474
347 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 476 my $time = EV::time;
349 477
350 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
352 480
353 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 482
355 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
356 484
357 my $busy = 1; 485 my $busy = 1;
358 my @res; 486 my @res;
359 487
360 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 490 @res = eval { $job->() };
362 warn $@ if $@; 491 warn $@ if $@;
363 undef $busy; 492 undef $busy;
364 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
365 494
366 while ($busy) { 495 while ($busy) {
367 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
368 } 500 }
501 }
369 502
370 $time = Event::time - $time; 503 my $time = EV::time - $time;
371 504
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
376 506
377 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
378 } else { 508 } else {
379 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
380 510
405=item fork_call { }, $args 535=item fork_call { }, $args
406 536
407Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
411 541
412=cut 542=cut
413 543
414sub fork_call(&@) { 544sub fork_call(&@) {
415 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
416 546
417# 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,
418# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 550
422 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 552 reset_signals;
436 local $SIG{__WARN__}; 553 &$cb
437 local $SIG{__DIE__}; 554 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 555
443 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
557}
444 558
445 open my $fh, ">", \my $buf 559=item $coin = coin_from_name $name
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449 560
450 warn "writing ", length $buf; 561=cut
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456 562
457 warn $@ if $@; 563our %coin_alias = (
458 _exit 0; 564 "silver" => "silvercoin",
459 } 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
460} 584}
461 585
462=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
463 587
464Returns a single value from the environment database. 588Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
467 591
468Stores 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
469data 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).
470 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
471=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}
472 618
473our $DB; 619our $DB;
474 620
475sub db_init { 621sub db_init {
476 unless ($DB) {
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job { 622 cf::sync_job {
480 eval { 623 $DB ||= db_table "db";
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 } 624 };
490} 625}
491 626
492sub db_get($$) { 627sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
494 629
544 if (1) { 679 if (1) {
545 $md5 = 680 $md5 =
546 join "\x00", 681 join "\x00",
547 $processversion, 682 $processversion,
548 map { 683 map {
549 Coro::cede; 684 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 686 } 0.. $#$src;
552 687
553 688
554 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
598attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
600 735
601In 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>
602C<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
603Crossfire TRT). 738Deliantra).
604 739
605=over 4 740=over 4
606 741
607=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
608 743
860 "; 995 ";
861 die if $@; 996 die if $@;
862} 997}
863 998
864our $override; 999our $override;
865our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
866 1001
867sub override { 1002sub override {
868 $override = 1; 1003 $override = 1;
869 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
870} 1005}
871 1006
872sub do_invoke { 1007sub do_invoke {
873 my $event = shift; 1008 my $event = shift;
874 my $callbacks = shift; 1009 my $callbacks = shift;
875 1010
876 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
877 1012
878 local $override; 1013 local $override;
879 1014
880 for (@$callbacks) { 1015 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
890 } 1025 }
891 1026
892 0 1027 0
893} 1028}
894 1029
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1031
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1033
899Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
900 1035
901This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
902removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
903results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1039
905=back 1040=back
906 1041
907=cut 1042=cut
908 1043
909############################################################################# 1044#############################################################################
910# object support 1045# object support
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}
911 1088
912sub reattach { 1089sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1091 my ($obj) = @_;
915 1092
936cf::attachable->attach ( 1113cf::attachable->attach (
937 prio => -1000000, 1114 prio => -1000000,
938 on_instantiate => sub { 1115 on_instantiate => sub {
939 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
940 1117
941 $data = from_json $data; 1118 $data = decode_json $data;
942 1119
943 for (@$data) { 1120 for (@$data) {
944 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
945 1122
946 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1139sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
964 1141
965 sync_job { 1142 sync_job {
966 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
969 1147
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
974 close $fh; 1152 aio_close $fh;
975 1153
976 if (@$objs) { 1154 if (@$objs) {
977 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
978 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
981 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
982 close $fh; 1160 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
984 } 1162 }
985 } else { 1163 } else {
986 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
987 } 1165 }
992 } 1170 }
993 } else { 1171 } else {
994 aio_unlink $filename; 1172 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
996 } 1174 }
997 } 1175 };
998} 1176}
999 1177
1000sub object_freezer_as_string { 1178sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
1002 1180
1014 or return; 1192 or return;
1015 1193
1016 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1196 or return;
1197
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1020 } 1200 }
1021 1201
1202 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1205
1024 return ($data, $av); 1206 ($data, $av)
1025} 1207}
1026 1208
1027=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
1028 1210
1029=over 4 1211=over 4
1102 my ($pl, $buf) = @_; 1284 my ($pl, $buf) = @_;
1103 1285
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1286 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1287
1106 if (ref $msg) { 1288 if (ref $msg) {
1289 my ($type, $reply, @payload) =
1290 "ARRAY" eq ref $msg
1291 ? @$msg
1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1293
1294 my @reply;
1295
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1296 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1297 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1298 }
1299
1300 $pl->ext_reply ($reply, @reply)
1301 if $reply;
1302
1112 } else { 1303 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1305 }
1115 1306
1116 cf::override; 1307 cf::override;
1169 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1170 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1171 1362
1172 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1173 warn $msg; 1364 warn $msg;
1174 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1175 exit 1;
1176 } 1366 }
1177 1367
1178 warn $msg; 1368 warn $msg;
1179 } 1369 }
1180 1370
1205use Coro::AIO; 1395use Coro::AIO;
1206 1396
1207=head3 cf::player 1397=head3 cf::player
1208 1398
1209=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1210 1414
1211=item cf::player::find $login 1415=item cf::player::find $login
1212 1416
1213Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1214 1418
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1454 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1455 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1456 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1458
1255 my $pl = load_pl path $login 1459 my $f = new_from_file cf::object::thawer path $login
1256 or return; 1460 or return;
1461
1462 my $pl = cf::player::load_pl $f
1463 or return;
1464
1465 local $cf::PLAYER_LOADING{$login} = $pl;
1466 $f->resolve_delayed_derefs;
1257 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1258 } 1468 }
1259 } 1469 }
1260} 1470}
1261 1471
1270 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1271 1481
1272 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1274 1484
1485 cf::get_slot 0.01;
1486
1275 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1276 Coro::cede; 1488 cf::cede_to_tick;
1277} 1489}
1278 1490
1279sub new($) { 1491sub new($) {
1280 my ($login) = @_; 1492 my ($login) = @_;
1281 1493
1287 $cf::PLAYER{$login} = $self; 1499 $cf::PLAYER{$login} = $self;
1288 1500
1289 $self 1501 $self
1290} 1502}
1291 1503
1504=item $player->send_msg ($channel, $msg, $color, [extra...])
1505
1506=cut
1507
1508sub send_msg {
1509 my $ns = shift->ns
1510 or return;
1511 $ns->send_msg (@_);
1512}
1513
1292=item $pl->quit_character 1514=item $pl->quit_character
1293 1515
1294Nukes the player without looking back. If logged in, the connection will 1516Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1517be destroyed. May block for a long time.
1296 1518
1304 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1305 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1306 1528
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1308 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1310 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1311 1535
1312 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
1349 or return []; 1573 or return [];
1350 1574
1351 my @logins; 1575 my @logins;
1352 1576
1353 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1578 my $path = path $login;
1579
1580 # a .pst is a dead give-away for a valid player
1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1586 }
1357 1587
1358 utf8::decode $login; 1588 utf8::decode $login;
1359 push @logins, $login; 1589 push @logins, $login;
1360 } 1590 }
1361 1591
1394 1624
1395Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1396 1626
1397=cut 1627=cut
1398 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1399sub expand_cfpod { 1640sub expand_cfpod {
1400 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1401 1642
1402 # escape & and < 1643 my $xml;
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405 1644
1406 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1407 1648
1408 1 while 1649 $group =~ s/&/&amp;/g;
1409 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1410 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1411 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1412 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1413 # replace G<male|female> tags 1654 ([BCGHITU])
1414 || s{G<([^>|]*)\|([^>]*)>}{ 1655 <
1415 $self->gender ? $2 : $1 1656 (?:
1416 }ge 1657 ([^<>]*) (?{ $group = $^N })
1417 # replace H<hint text> 1658 | < $interior >
1418 || s{H<([^\>]*)>} 1659 )
1660 >
1661 %gcsx
1419 { 1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "") 1682 "")
1423 [$self->{hintmode}] 1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1424 }ge; 1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1425 1694
1695 for ($xml) {
1426 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1428 1698
1429 # compress some whitespace 1699 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends 1700 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines 1701 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines 1702 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines 1703 s/\n+$//; # ending lines
1704 }
1434 1705
1435 $_ 1706 $xml
1436} 1707}
1708
1709no re 'eval';
1437 1710
1438sub hintmode { 1711sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1713 $_[0]{hintmode}
1441} 1714}
1442 1715
1443=item $player->ext_reply ($msgid, %msg) 1716=item $player->ext_reply ($msgid, @msg)
1444 1717
1445Sends an ext reply to the player. 1718Sends an ext reply to the player.
1446 1719
1447=cut 1720=cut
1448 1721
1449sub ext_reply($$%) { 1722sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1723 my ($self, $id, @msg) = @_;
1451 1724
1452 $msg{msgid} = $id; 1725 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1726}
1455 1727
1456=item $player->ext_event ($type, %msg) 1728=item $player->ext_msg ($type, @msg)
1457 1729
1458Sends an ext event to the client. 1730Sends an ext event to the client.
1459 1731
1460=cut 1732=cut
1461 1733
1462sub ext_event($$%) { 1734sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1735 my ($self, $type, @msg) = @_;
1464 1736
1465 $self->ns->ext_event ($type, %msg); 1737 $self->ns->ext_msg ($type, @msg);
1466} 1738}
1467 1739
1468=head3 cf::region 1740=head3 cf::region
1469 1741
1470=over 4 1742=over 4
1483 my ($path) = @_; 1755 my ($path) = @_;
1484 1756
1485 my ($match, $specificity); 1757 my ($match, $specificity);
1486 1758
1487 for my $region (list) { 1759 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1760 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1761 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1762 if $region->specificity > $specificity;
1491 } 1763 }
1492 } 1764 }
1493 1765
1514our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1516 1788
1517sub generate_random_map { 1789sub generate_random_map {
1518 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1519 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1520 $self->_create_random_map ( 1795 $self->_create_random_map (
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1613 $self->init; # pass $1 etc. 1888 $self->init; # pass $1 etc.
1614 return $self; 1889 return $self;
1615 } 1890 }
1616 } 1891 }
1617 1892
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1893 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1894 ()
1620} 1895}
1621 1896
1622sub init { 1897sub init {
1623 my ($self) = @_; 1898 my ($self) = @_;
1645 1920
1646# the temporary/swap location 1921# the temporary/swap location
1647sub save_path { 1922sub save_path {
1648 my ($self) = @_; 1923 my ($self) = @_;
1649 1924
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1652} 1927}
1653 1928
1654# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1655sub uniq_path { 1930sub uniq_path {
1656 my ($self) = @_; 1931 my ($self) = @_;
1657 1932
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1660} 1935}
1661 1936
1662# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1663# all maps in C++... 1938# all maps in C++...
1686 1961
1687sub load_header_from($) { 1962sub load_header_from($) {
1688 my ($self, $path) = @_; 1963 my ($self, $path) = @_;
1689 1964
1690 utf8::encode $path; 1965 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 1966 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 1967 or return;
1968
1969 $self->_load_header ($f)
1970 or return;
1971
1972 local $MAP_LOADING{$self->{path}} = $self;
1973 $f->resolve_delayed_derefs;
1696 1974
1697 $self->{load_path} = $path; 1975 $self->{load_path} = $path;
1698 1976
1699 1 1977 1
1700} 1978}
1754sub find { 2032sub find {
1755 my ($path, $origin) = @_; 2033 my ($path, $origin) = @_;
1756 2034
1757 $path = normalise $path, $origin && $origin->path; 2035 $path = normalise $path, $origin && $origin->path;
1758 2036
2037 cf::lock_wait "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1760 2039
1761 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1762 my $guard = cf::lock_acquire "map_find:$path"; 2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
1763 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1764 or return; 2045 or return;
1765 2046
1766 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
1767 2048
1769 or return; 2050 or return;
1770 2051
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2056 undef $guard1;
1774 $map->reset; 2057 $map->reset;
1775 undef $guard;
1776 return find $path; 2058 return find $path;
1777 } 2059 }
1778 2060
1779 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
1780 } 2062 }
1789 local $self->{deny_reset} = 1; # loading can take a long time 2071 local $self->{deny_reset} = 1; # loading can take a long time
1790 2072
1791 my $path = $self->{path}; 2073 my $path = $self->{path};
1792 2074
1793 { 2075 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1795 2077
2078 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1797 2080
1798 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1799 2082
1800 $self->alloc; 2083 $self->alloc;
1801 2084
1802 $self->pre_load; 2085 $self->pre_load;
1803 Coro::cede; 2086 cf::cede_to_tick;
1804 2087
2088 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block;
1805 $self->_load_objects ($self->{load_path}, 1) 2090 $self->_load_objects ($f)
1806 or return; 2091 or return;
1807 2092
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1809 if delete $self->{load_original}; 2094 if delete $self->{load_original};
1810 2095
1811 if (my $uniq = $self->uniq_path) { 2096 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2097 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2098 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2100 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2101 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs;
2103 }
1816 } 2104 }
1817 } 2105 }
1818 2106
1819 Coro::cede; 2107 $f->resolve_delayed_derefs;
2108
2109 cf::cede_to_tick;
1820 # now do the right thing for maps 2110 # now do the right thing for maps
1821 $self->link_multipart_objects; 2111 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2112 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2113 unless $self->difficulty;
1824 Coro::cede; 2114 cf::cede_to_tick;
1825 2115
1826 unless ($self->{deny_activate}) { 2116 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2117 $self->decay_objects;
1828 $self->fix_auto_apply; 2118 $self->fix_auto_apply;
1829 $self->update_buttons; 2119 $self->update_buttons;
1830 Coro::cede; 2120 cf::cede_to_tick;
1831 $self->set_darkness_map; 2121 $self->set_darkness_map;
1832 Coro::cede; 2122 cf::cede_to_tick;
1833 $self->activate; 2123 $self->activate;
1834 } 2124 }
1835 2125
2126 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME);
2128
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1837 } 2130 }
1838 2131
1839 $self->post_load; 2132 $self->post_load;
1840} 2133}
1841 2134
1850 2143
1851 $self 2144 $self
1852} 2145}
1853 2146
1854# find and load all maps in the 3x3 area around a map 2147# find and load all maps in the 3x3 area around a map
1855sub load_diag { 2148sub load_neighbours {
1856 my ($map) = @_; 2149 my ($map) = @_;
1857 2150
1858 my @diag; # diagonal neighbours 2151 my @neigh; # diagonal neighbours
1859 2152
1860 for (0 .. 3) { 2153 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 2154 my $neigh = $map->tile_path ($_)
1862 or next; 2155 or next;
1863 $neigh = find $neigh, $map 2156 $neigh = find $neigh, $map
1864 or next; 2157 or next;
1865 $neigh->load; 2158 $neigh->load;
1866 2159
2160 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 2163 }
1870 2164
1871 for (@diag) { 2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 2167 my $neigh = find $path, $origin
1873 or next; 2168 or next;
1874 $neigh->load; 2169 $neigh->load;
1875 } 2170 }
1876} 2171}
1877 2172
1882} 2177}
1883 2178
1884sub do_load_sync { 2179sub do_load_sync {
1885 my ($map) = @_; 2180 my ($map) = @_;
1886 2181
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main;
2184
1887 cf::sync_job { $map->load }; 2185 cf::sync_job { $map->load };
1888} 2186}
1889 2187
1890our %MAP_PREFETCH; 2188our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2189our $MAP_PREFETCHER = undef;
1892 2190
1893sub find_async { 2191sub find_async {
1894 my ($path, $origin) = @_; 2192 my ($path, $origin, $load) = @_;
1895 2193
1896 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
1897 2195
1898 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1900 } 2198 }
1901 2199
1902 undef $MAP_PREFETCH{$path}; 2200 $MAP_PREFETCH{$path} |= $load;
2201
1903 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
1904 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2207 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2208 $map->load if $v;
2209 }
1909 2210
1910 delete $MAP_PREFETCH{$path}; 2211 delete $MAP_PREFETCH{$k};
1911 } 2212 }
1912 } 2213 }
1913 undef $MAP_PREFETCHER; 2214 undef $MAP_PREFETCHER;
1914 }; 2215 };
1915 $MAP_PREFETCHER->prio (6); 2216 $MAP_PREFETCHER->prio (6);
1918} 2219}
1919 2220
1920sub save { 2221sub save {
1921 my ($self) = @_; 2222 my ($self) = @_;
1922 2223
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 2225
1925 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
1926 2227
1927 return unless $self->dirty; 2228 return unless $self->dirty;
1928 2229
1934 return if $self->{deny_save}; 2235 return if $self->{deny_save};
1935 2236
1936 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
1937 2238
1938 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
1940 }; 2242 };
2243
2244 cf::get_slot 0.02;
1941 2245
1942 if ($uniq) { 2246 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2249 } else {
1951 my ($self) = @_; 2255 my ($self) = @_;
1952 2256
1953 # save first because save cedes 2257 # save first because save cedes
1954 $self->save; 2258 $self->save;
1955 2259
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2261
1958 return if $self->players; 2262 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
1960 return if $self->{deny_save}; 2264 return if $self->{deny_save};
1961 2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
1962 $self->clear; 2270 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2271}
1965 2272
1966sub reset_at { 2273sub reset_at {
1967 my ($self) = @_; 2274 my ($self) = @_;
1968 2275
2000 if $uniq; 2307 if $uniq;
2001 } 2308 }
2002 2309
2003 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
2004 2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2314 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2315
2009 $self->unlink_save; 2316 $self->unlink_save;
2010 $self->destroy; 2317 $self->destroy;
2011} 2318}
2012 2319
2013my $nuke_counter = "aaaa"; 2320my $nuke_counter = "aaaa";
2014 2321
2015sub nuke { 2322sub nuke {
2016 my ($self) = @_; 2323 my ($self) = @_;
2017 2324
2325 {
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2018 delete $cf::MAP{$self->path}; 2328 delete $cf::MAP{$self->path};
2019 2329
2020 $self->unlink_save; 2330 $self->unlink_save;
2021 2331
2022 bless $self, "cf::map"; 2332 bless $self, "cf::map";
2023 delete $self->{deny_reset}; 2333 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2334 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2335 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2337
2028 $cf::MAP{$self->path} = $self; 2338 $cf::MAP{$self->path} = $self;
2339 }
2029 2340
2030 $self->reset; # polite request, might not happen 2341 $self->reset; # polite request, might not happen
2031} 2342}
2032 2343
2033=item $maps = cf::map::tmp_maps 2344=item $maps = cf::map::tmp_maps
2075 2386
2076sub unique_maps() { 2387sub unique_maps() {
2077 [ 2388 [
2078 map { 2389 map {
2079 utf8::decode $_; 2390 utf8::decode $_;
2080 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2081 ? normalise $_ 2394 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2396 ]
2085} 2397}
2086 2398
2087package cf;
2088
2089=back 2399=back
2090 2400
2091=head3 cf::object 2401=head3 cf::object
2092 2402
2093=cut 2403=cut
2096 2406
2097=over 4 2407=over 4
2098 2408
2099=item $ob->inv_recursive 2409=item $ob->inv_recursive
2100 2410
2101Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2102 2413
2103=cut 2414=cut
2104 2415
2105sub inv_recursive_; 2416sub inv_recursive_;
2106sub inv_recursive_ { 2417sub inv_recursive_ {
2109 2420
2110sub inv_recursive { 2421sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2112} 2423}
2113 2424
2425=item $ref = $ob->ref
2426
2427Creates and returns a persistent reference to an object that can be stored as a string.
2428
2429=item $ob = cf::object::deref ($refstring)
2430
2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2432even if the object actually exists. May block.
2433
2434=cut
2435
2436sub deref {
2437 my ($ref) = @_;
2438
2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2440 my ($uuid, $name) = ($1, $2);
2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2442 or return;
2443 $pl->ob->uuid eq $uuid
2444 or return;
2445
2446 $pl->ob
2447 } else {
2448 warn "$ref: cannot resolve object reference\n";
2449 undef
2450 }
2451}
2452
2114package cf; 2453package cf;
2115 2454
2116=back 2455=back
2117 2456
2118=head3 cf::object::player 2457=head3 cf::object::player
2124Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2463Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2125can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2126dialogue with the given NPC character. 2465dialogue with the given NPC character.
2127 2466
2128=cut 2467=cut
2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2129 2482
2130# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2484# with dialog boxes.
2132#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2133sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2140 2493
2141 } else { 2494 } else {
2142 my $pl = $self->contr; 2495 my $pl = $self->contr;
2143 2496
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2497 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2500
2153 } else { 2501 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2504 }
2157 } 2505 }
2506}
2507
2508=item $object->send_msg ($channel, $msg, $color, [extra...])
2509
2510=cut
2511
2512sub cf::object::send_msg {
2513 my $pl = shift->contr
2514 or return;
2515 $pl->send_msg (@_);
2158} 2516}
2159 2517
2160=item $player_object->may ("access") 2518=item $player_object->may ("access")
2161 2519
2162Returns wether the given player is authorized to access resource "access" 2520Returns wether the given player is authorized to access resource "access"
2241 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2601 if $x <=0 && $y <= 0;
2244 2602
2245 $map->load; 2603 $map->load;
2246 $map->load_diag; 2604 $map->load_neighbours;
2247 2605
2248 return unless $self->contr->active; 2606 return unless $self->contr->active;
2249 $self->activate_recursive; 2607 $self->activate_recursive;
2250 2608
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2610 $self->enter_map ($map, $x, $y);
2253} 2611}
2254 2612
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2614
2257Moves the player to the given map-path and coordinates by first freezing 2615Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2616her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2617that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2618the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process.
2261 2620
2262=cut 2621=cut
2263 2622
2264our $GOTOGEN; 2623our $GOTOGEN;
2265 2624
2266sub cf::object::player::goto { 2625sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2626 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2627
2269 # do generation counting so two concurrent goto's will be executed in-order 2628 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2630
2272 $self->enter_link; 2631 $self->enter_link;
2273 2632
2274 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2275 my $map = eval { 2655 my $map = eval {
2276 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2277 2657
2278 if ($map) { 2658 if ($map) {
2279 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2281 } else { 2661 } else {
2282 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2283 } 2663 }
2284 2664
2285 $map 2665 $map
2286 }; 2666 };
2287 2667
2292 2672
2293 if ($gen == $self->{_goto_generation}) { 2673 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2674 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2675 $self->leave_link ($map, $x, $y);
2296 } 2676 }
2677
2678 $done->() if $done;
2297 })->prio (1); 2679 })->prio (1);
2298} 2680}
2299 2681
2300=item $player_object->enter_exit ($exit_object) 2682=item $player_object->enter_exit ($exit_object)
2301 2683
2321} 2703}
2322 2704
2323sub prepare_random_map { 2705sub prepare_random_map {
2324 my ($exit) = @_; 2706 my ($exit) = @_;
2325 2707
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2710 # that depends on the exit object
2331 2711
2332 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2714 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2339 } 2721 }
2340 2722
2341 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2342 2724
2343 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2346 2728
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2731 undef $fh;
2350 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2351 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2354 } 2740 }
2355} 2741}
2356 2742
2357sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2359 2745
2360 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2361 2747
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2748 $self->enter_link;
2374 2749
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2750 (async {
2380 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2381 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2382 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2383 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2384 1; 2774 1
2385 }) { 2775 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2387 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2388 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
2410 2800
2411 utf8::encode $text; 2801 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2803}
2414 2804
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2805=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2806
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2807Send a drawinfo or msg packet to the client, formatting the msg for the
2418client if neccessary. C<$type> should be a string identifying the type of 2808client if neccessary. C<$type> should be a string identifying the type of
2419the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2421 2811
2422=cut 2812=cut
2423 2813
2814# non-persistent channels (usually the info channel)
2815our %CHANNEL = (
2816 "c/identify" => {
2817 id => "infobox",
2818 title => "Identify",
2819 reply => undef,
2820 tooltip => "Items recently identified",
2821 },
2822 "c/examine" => {
2823 id => "infobox",
2824 title => "Examine",
2825 reply => undef,
2826 tooltip => "Signs and other items you examined",
2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2870);
2871
2424sub cf::client::send_msg { 2872sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2874
2427 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2428 2876
2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878
2879 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2888 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel)
2893 if $self->can_msg;
2894 }
2895
2896 $channel = $channel->{id};
2897 }
2898
2429 return unless @extra || length $msg; 2899 return unless @extra || length $msg;
2430 2900
2431 if ($self->can_msg) { 2901 if ($self->can_msg) {
2902 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF;
2905
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2906 $self->send_packet ("msg " . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2908 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 if ($color >= 0) { 2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919
2920 $color &= cf::NDI_COLOR_MASK;
2921
2922 utf8::encode $msg;
2923
2445 if (0 && $msg =~ /\[/) { 2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2927 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2929 $self->send_packet ("drawinfo $color $msg")
2450 } 2930 }
2451 } 2931 }
2452 } 2932 }
2453} 2933}
2454 2934
2455=item $client->ext_event ($type, %msg) 2935=item $client->ext_msg ($type, @msg)
2456 2936
2457Sends an ext event to the client. 2937Sends an ext event to the client.
2458 2938
2459=cut 2939=cut
2460 2940
2461sub cf::client::ext_event($$%) { 2941sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2942 my ($self, $type, @msg) = @_;
2463 2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2947 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950}
2951
2952=item $client->ext_reply ($msgid, @msg)
2953
2954Sends an ext reply to the client.
2955
2956=cut
2957
2958sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_;
2960
2961 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 }
2466} 2968}
2467 2969
2468=item $success = $client->query ($flags, "text", \&cb) 2970=item $success = $client->query ($flags, "text", \&cb)
2469 2971
2470Queues a query to the client, calling the given callback with 2972Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3027 my ($ns, $buf) = @_;
2526 3028
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3029 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3030
2529 if (ref $msg) { 3031 if (ref $msg) {
3032 my ($type, $reply, @payload) =
3033 "ARRAY" eq ref $msg
3034 ? @$msg
3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3036
3037 my @reply;
3038
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3039 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3040 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3041 }
3042
3043 $ns->ext_reply ($reply, @reply)
3044 if $reply;
3045
2536 } else { 3046 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 3048 }
2539 3049
2540 cf::override; 3050 cf::override;
2587our $safe = new Safe "safe"; 3097our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3098our $safe_hole = new Safe::Hole;
2589 3099
2590$SIG{FPE} = 'IGNORE'; 3100$SIG{FPE} = 'IGNORE';
2591 3101
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3102$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math
3104 grepstart grepwhile mapstart mapwhile
3105 sort time
3106));
2593 3107
2594# here we export the classes and methods available to script code 3108# here we export the classes and methods available to script code
2595 3109
2596=pod 3110=pod
2597 3111
2598The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2599 3113
2600 cf::object 3114 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 3115 contr pay_amount pay_player map x y force_find force_add destroy
2602 insert remove 3116 insert remove name archname title slaying race decrease split
2603 3117
2604 cf::object::player 3118 cf::object::player
2605 player 3119 player
2606 3120
2607 cf::player 3121 cf::player
2612 3126
2613=cut 3127=cut
2614 3128
2615for ( 3129for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 3131 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)],
2618 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2621) { 3136) {
2622 no strict 'refs'; 3137 no strict 'refs';
2698# the server's init and main functions 3213# the server's init and main functions
2699 3214
2700sub load_facedata($) { 3215sub load_facedata($) {
2701 my ($path) = @_; 3216 my ($path) = @_;
2702 3217
3218 # HACK to clear player env face cache, we need some signal framework
3219 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = ();
3221
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223
2703 warn "loading facedata from $path\n"; 3224 warn "loading facedata from $path\n";
2704 3225
2705 my $facedata; 3226 my $facedata;
2706 0 < aio_load $path, $facedata 3227 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 3228 or die "$path: $!";
2709 $facedata = Coro::Storable::thaw $facedata; 3230 $facedata = Coro::Storable::thaw $facedata;
2710 3231
2711 $facedata->{version} == 2 3232 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3233 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 3234
3235 # patch in the exptable
3236 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3239 };
3240 cf::cede_to_tick;
3241
2714 { 3242 {
2715 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2716 3244
2717 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3248 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 3252
3253 cf::cede_to_tick;
2723 } 3254 }
2724 3255
2725 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2727 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2728 or next; 3260 or next;
3261
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3265 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3267 }
2734 Coro::cede; 3268
3269 cf::cede_to_tick;
2735 } 3270 }
2736 } 3271 }
2737 3272
2738 { 3273 {
2739 my $anims = $facedata->{animinfo}; 3274 my $anims = $facedata->{animinfo};
2740 3275
2741 while (my ($anim, $info) = each %$anims) { 3276 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3277 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3278 cf::cede_to_tick;
2744 } 3279 }
2745 3280
2746 cf::anim::invalidate_all; # d'oh 3281 cf::anim::invalidate_all; # d'oh
2747 } 3282 }
2748 3283
3284 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource};
3288
3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293
3294 if ($info->{type} & 1) {
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3309 } else {
3310 $RESOURCE{$name} = $info;
3311 }
3312
3313 cf::cede_to_tick;
3314 }
3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318
2749 1 3319 1
2750} 3320}
2751 3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341
3342register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_;
3344
3345 while (my ($k, $v) = each %$want) {
3346 $ns->fx_want ($k, $v);
3347 }
3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
2752sub reload_regions { 3360sub reload_regions {
3361 # HACK to clear player env face cache, we need some signal framework
3362 # for this (global event?)
3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3364
2753 load_resource_file "$MAPDIR/regions" 3365 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3366 or die "unable to load regions file\n";
3367
3368 for (cf::region::list) {
3369 $_->{match} = qr/$_->{match}/
3370 if exists $_->{match};
3371 }
2755} 3372}
2756 3373
2757sub reload_facedata { 3374sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3375 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3376 or die "unable to load facedata\n";
2760} 3377}
2761 3378
2762sub reload_archetypes { 3379sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3382}
2771 3383
2772sub reload_treasures { 3384sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
2775} 3387}
2776 3388
2777sub reload_resources { 3389sub reload_resources {
2778 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
2779 3391
3392 reload_facedata;
3393 reload_archetypes;
2780 reload_regions; 3394 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3395 reload_treasures;
2785 3396
2786 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
2787} 3398}
2788 3399
2789sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
2790 reload_resources; 3403 reload_resources;
2791} 3404}
2792 3405
2793sub cfg_load { 3406sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3408 or return;
2796 3409
2797 local $/; 3410 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2799 3412
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2801 3414
2802 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2803 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2814sub main { 3427sub main {
2815 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2817 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818 (async { 3431 (async {
2819 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
2821 }; 3435 };
2822 3436
2823 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
2824 db_init; 3440 db_init;
2825 load_extensions; 3441 load_extensions;
2826 3442
2827 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
2828 Event::loop; 3446 EV::loop;
2829} 3447}
2830 3448
2831############################################################################# 3449#############################################################################
2832# initialisation and cleanup 3450# initialisation and cleanup
2833 3451
2834# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
2835BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
2844 },
2845 ); 3458 };
2846 } 3459 }
2847} 3460}
2848 3461
2849sub write_runtime { 3462sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
2851 3464
2852 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
2854 3467
2880 and return; 3493 and return;
2881 3494
2882 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
2883 3496
2884 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
2885} 3541}
2886 3542
2887sub emergency_save() { 3543sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
2889 3545
2895 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
2897 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3557 $pl->save;
2901 } 3558 }
2902 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
2903 3560
2904 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
2910 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
2911 3568
2912 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
2914 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
2915 }; 3576 };
2916 3577
2917 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
2918} 3579}
2919 3580
2934 warn "reloading..."; 3595 warn "reloading...";
2935 3596
2936 warn "entering sync_job"; 3597 warn "entering sync_job";
2937 3598
2938 cf::sync_job { 3599 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2940 cf::emergency_save; 3601 cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
2942 3603
2943 warn "syncing database to disk"; 3604 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
2945 3606
2946 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952 3608
2953 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
2954 for (;;) { 3610 for (;;) {
2955 BDB::flush; 3611 BDB::flush;
2956 IO::AIO::flush; 3612 IO::AIO::flush;
2957 Coro::cede; 3613 Coro::cede_notself;
2958 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate..."; 3615 warn "iterate...";
2960 } 3616 }
2961 3617
2962 ++$RELOAD; 3618 ++$RELOAD;
3021 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
3022 require cf; 3678 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3680
3025 warn "loading config and database again"; 3681 warn "loading config and database again";
3026 cf::cfg_load; 3682 cf::reload_config;
3027 3683
3028 warn "loading extensions"; 3684 warn "loading extensions";
3029 cf::load_extensions; 3685 cf::load_extensions;
3030 3686
3031 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
3038 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3039 3695
3040 1 3696 1
3041 } or do { 3697 } or do {
3042 warn $@; 3698 warn $@;
3043 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3044 exit 1;
3045 }; 3700 };
3046 3701
3047 warn "reloaded"; 3702 warn "reloaded";
3048}; 3703};
3049 3704
3051 3706
3052sub reload_perl() { 3707sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3055 3710
3056 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3057 reentrant => 0,
3058 after => 0,
3059 data => WF_AUTOCANCEL,
3060 cb => sub {
3061 do_reload_perl; 3712 do_reload_perl;
3062 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3063 },
3064 ); 3714 };
3065} 3715}
3066 3716
3067register_command "reload" => sub { 3717register_command "reload" => sub {
3068 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3069 3719
3070 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 3724 reload_perl;
3725 };
3073 } 3726 }
3074}; 3727};
3075 3728
3076unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3077 3730
3079 3732
3080our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3082 3735
3083sub wait_for_tick { 3736sub wait_for_tick {
3084 return unless $TICK_WATCHER->is_active;
3085 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3086 3738
3087 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3088 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait; 3741 $signal->wait;
3090} 3742}
3091 3743
3092sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3093 return unless $TICK_WATCHER->is_active;
3094 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3095 3746
3096 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 3749 $signal->wait;
3099} 3750}
3100 3751
3101 my $min = 1e6;#d# 3752sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3113 return; 3756 return;
3114 } 3757 }
3115 3758
3116 $NOW = $tick_start = Event::time;
3117
3118 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3119 3760
3120 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 3763 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3124 or die; 3765 write_runtime_sync
3125 3766 or warn "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 3767 };
3768 }
3142 3769
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 3771 $sig->send;
3159 } 3772 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3161 $sig->send; 3774 $sig->send;
3162 } 3775 }
3163 3776
3164 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 3779
3175 _post_tick; 3780 if (0) {
3176 3781 if ($NEXT_TICK) {
3177 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3178 }, 3786 }
3179); 3787}
3180 3788
3181{ 3789{
3182 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 3791
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3192 3793 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 3795
3208 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 3802
3211 cf::sync_job { 3803 cf::sync_job {
3212 eval { 3804 eval {
3213 BDB::db_env_open 3805 BDB::db_env_open
3214 $DB_ENV, 3806 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 3810 0666;
3219 3811
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 3813 };
3225 3814
3226 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 3816 };
3228 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3229} 3828}
3230 3829
3231{ 3830{
3831 # configure IO::AIO
3832
3232 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 3836}
3245 3837
3246my $_log_backtrace; 3838my $_log_backtrace;
3247 3839
3248sub _log_backtrace { 3840sub _log_backtrace {
3252 3844
3253 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3255 ++$_log_backtrace; 3847 ++$_log_backtrace;
3256 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3257 my @bt = fork_call { 3851 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!"; 3855 or die "addr2line: $!";
3284# load additional modules 3878# load additional modules
3285use cf::pod; 3879use cf::pod;
3286 3880
3287END { cf::emergency_save } 3881END { cf::emergency_save }
3288 3882
3883evthread_start IO::AIO::poll_fileno;
3884
32891 38851
3290 3886

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines