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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines