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.330 by elmex, Fri Aug 10 10:35:07 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines