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.319 by root, Tue Jul 24 15:56:45 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 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
1372 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1373 1501
1374 $self 1502 $self
1375} 1503}
1376 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1377=item $pl->quit_character 1515=item $pl->quit_character
1378 1516
1379Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1381 1519
1385 my ($pl) = @_; 1523 my ($pl) = @_;
1386 1524
1387 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1388 1526
1389 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1391 1529
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1396 1536
1397 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1434 or return []; 1574 or return [];
1435 1575
1436 my @logins; 1576 my @logins;
1437 1577
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1442 1588
1443 utf8::decode $login; 1589 utf8::decode $login;
1444 push @logins, $login; 1590 push @logins, $login;
1445 } 1591 }
1446 1592
1477 1623
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1479 1625
1480Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1481 1627
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527
1528=item $player->ext_reply ($msgid, @msg) 1628=item $player->ext_reply ($msgid, @msg)
1529 1629
1530Sends an ext reply to the player. 1630Sends an ext reply to the player.
1531 1631
1532=cut 1632=cut
1533 1633
1534sub ext_reply($$@) { 1634sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1635 my ($self, $id, @msg) = @_;
1536 1636
1537 if ($self->ns->extcmd == 2) { 1637 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1638}
1545 1639
1546=item $player->ext_msg ($type, @msg) 1640=item $player->ext_msg ($type, @msg)
1547 1641
1548Sends an ext event to the client. 1642Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1698our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1699our $DEFAULT_RESET = 3000;
1606 1700
1607sub generate_random_map { 1701sub generate_random_map {
1608 my ($self, $rmp) = @_; 1702 my ($self, $rmp) = @_;
1703
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705
1609 # mit "rum" bekleckern, nicht 1706 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1707 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1832
1736# the temporary/swap location 1833# the temporary/swap location
1737sub save_path { 1834sub save_path {
1738 my ($self) = @_; 1835 my ($self) = @_;
1739 1836
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1837 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1838 "$TMPDIR/$path.map"
1742} 1839}
1743 1840
1744# the unique path, undef == no special unique path 1841# the unique path, undef == no special unique path
1745sub uniq_path { 1842sub uniq_path {
1746 my ($self) = @_; 1843 my ($self) = @_;
1747 1844
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1846 "$UNIQUEDIR/$path"
1750} 1847}
1751 1848
1752# and all this just because we cannot iterate over 1849# and all this just because we cannot iterate over
1753# all maps in C++... 1850# all maps in C++...
1776 1873
1777sub load_header_from($) { 1874sub load_header_from($) {
1778 my ($self, $path) = @_; 1875 my ($self, $path) = @_;
1779 1876
1780 utf8::encode $path; 1877 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1878 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1879 or return;
1880
1881 $self->_load_header ($f)
1882 or return;
1883
1884 local $MAP_LOADING{$self->{path}} = $self;
1885 $f->resolve_delayed_derefs;
1786 1886
1787 $self->{load_path} = $path; 1887 $self->{load_path} = $path;
1788 1888
1789 1 1889 1
1790} 1890}
1844sub find { 1944sub find {
1845 my ($path, $origin) = @_; 1945 my ($path, $origin) = @_;
1846 1946
1847 $path = normalise $path, $origin && $origin->path; 1947 $path = normalise $path, $origin && $origin->path;
1848 1948
1949 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1950 cf::lock_wait "map_find:$path";
1850 1951
1851 $cf::MAP{$path} || do { 1952 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1852 my $guard = cf::lock_acquire "map_find:$path"; 1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1853 my $map = new_from_path cf::map $path 1956 my $map = new_from_path cf::map $path
1854 or return; 1957 or return;
1855 1958
1856 $map->{last_save} = $cf::RUNTIME; 1959 $map->{last_save} = $cf::RUNTIME;
1857 1960
1859 or return; 1962 or return;
1860 1963
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1964 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1965 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1966 #$cf::WAIT_FOR_TICK->wait;
1967 undef $guard2;
1968 undef $guard1;
1864 $map->reset; 1969 $map->reset;
1865 undef $guard;
1866 return find $path; 1970 return find $path;
1867 } 1971 }
1868 1972
1869 $cf::MAP{$path} = $map 1973 $cf::MAP{$path} = $map
1870 } 1974 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 1983 local $self->{deny_reset} = 1; # loading can take a long time
1880 1984
1881 my $path = $self->{path}; 1985 my $path = $self->{path};
1882 1986
1883 { 1987 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1988 my $guard = cf::lock_acquire "map_data:$path";
1885 1989
1990 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1991 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1992
1888 $self->in_memory (cf::MAP_LOADING); 1993 $self->in_memory (cf::MAP_LOADING);
1889 1994
1890 $self->alloc; 1995 $self->alloc;
1891 1996
1892 $self->pre_load; 1997 $self->pre_load;
1893 Coro::cede; 1998 cf::cede_to_tick;
1894 1999
2000 my $f = new_from_file cf::object::thawer $self->{load_path};
2001 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2002 $self->_load_objects ($f)
1896 or return; 2003 or return;
1897 2004
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2005 $self->post_load_original
1899 if delete $self->{load_original}; 2006 if delete $self->{load_original};
1900 2007
1901 if (my $uniq = $self->uniq_path) { 2008 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2009 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2010 unless (aio_stat $uniq) {
2011 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2012 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2013 $self->_load_objects ($f);
2014 $f->resolve_delayed_derefs;
2015 }
1906 } 2016 }
1907 } 2017 }
1908 2018
1909 Coro::cede; 2019 $f->resolve_delayed_derefs;
2020
2021 cf::cede_to_tick;
1910 # now do the right thing for maps 2022 # now do the right thing for maps
1911 $self->link_multipart_objects; 2023 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2024 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2025 unless $self->difficulty;
1914 Coro::cede; 2026 cf::cede_to_tick;
1915 2027
1916 unless ($self->{deny_activate}) { 2028 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2029 $self->decay_objects;
1918 $self->fix_auto_apply; 2030 $self->fix_auto_apply;
1919 $self->update_buttons; 2031 $self->update_buttons;
1920 Coro::cede; 2032 cf::cede_to_tick;
1921 $self->set_darkness_map; 2033 $self->set_darkness_map;
1922 Coro::cede; 2034 cf::cede_to_tick;
1923 $self->activate; 2035 $self->activate;
1924 } 2036 }
1925 2037
2038 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME);
2040
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2041 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2042 }
1928 2043
1929 $self->post_load; 2044 $self->post_load;
1930} 2045}
1931 2046
1940 2055
1941 $self 2056 $self
1942} 2057}
1943 2058
1944# find and load all maps in the 3x3 area around a map 2059# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2060sub load_neighbours {
1946 my ($map) = @_; 2061 my ($map) = @_;
1947 2062
1948 my @diag; # diagonal neighbours 2063 my @neigh; # diagonal neighbours
1949 2064
1950 for (0 .. 3) { 2065 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2066 my $neigh = $map->tile_path ($_)
1952 or next; 2067 or next;
1953 $neigh = find $neigh, $map 2068 $neigh = find $neigh, $map
1954 or next; 2069 or next;
1955 $neigh->load; 2070 $neigh->load;
1956 2071
2072 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2073 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2074 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2075 }
1960 2076
1961 for (@diag) { 2077 for (grep defined $_->[0], @neigh) {
2078 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2079 my $neigh = find $path, $origin
1963 or next; 2080 or next;
1964 $neigh->load; 2081 $neigh->load;
1965 } 2082 }
1966} 2083}
1967 2084
1972} 2089}
1973 2090
1974sub do_load_sync { 2091sub do_load_sync {
1975 my ($map) = @_; 2092 my ($map) = @_;
1976 2093
2094 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2095 if $Coro::current == $Coro::main;
2096
1977 cf::sync_job { $map->load }; 2097 cf::sync_job { $map->load };
1978} 2098}
1979 2099
1980our %MAP_PREFETCH; 2100our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2101our $MAP_PREFETCHER = undef;
1982 2102
1983sub find_async { 2103sub find_async {
1984 my ($path, $origin) = @_; 2104 my ($path, $origin, $load) = @_;
1985 2105
1986 $path = normalise $path, $origin && $origin->{path}; 2106 $path = normalise $path, $origin && $origin->{path};
1987 2107
1988 if (my $map = $cf::MAP{$path}) { 2108 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2109 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2110 }
1991 2111
1992 undef $MAP_PREFETCH{$path}; 2112 $MAP_PREFETCH{$path} |= $load;
2113
1993 $MAP_PREFETCHER ||= cf::async { 2114 $MAP_PREFETCHER ||= cf::async {
2115 $Coro::current->{desc} = "map prefetcher";
2116
1994 while (%MAP_PREFETCH) { 2117 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2118 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2119 if (my $map = find $k) {
1997 $map->load; 2120 $map->load if $v;
1998 } 2121 }
1999 2122
2000 delete $MAP_PREFETCH{$path}; 2123 delete $MAP_PREFETCH{$k};
2001 } 2124 }
2002 } 2125 }
2003 undef $MAP_PREFETCHER; 2126 undef $MAP_PREFETCHER;
2004 }; 2127 };
2005 $MAP_PREFETCHER->prio (6); 2128 $MAP_PREFETCHER->prio (6);
2008} 2131}
2009 2132
2010sub save { 2133sub save {
2011 my ($self) = @_; 2134 my ($self) = @_;
2012 2135
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2137
2015 $self->{last_save} = $cf::RUNTIME; 2138 $self->{last_save} = $cf::RUNTIME;
2016 2139
2017 return unless $self->dirty; 2140 return unless $self->dirty;
2018 2141
2024 return if $self->{deny_save}; 2147 return if $self->{deny_save};
2025 2148
2026 local $self->{last_access} = $self->last_access;#d# 2149 local $self->{last_access} = $self->last_access;#d#
2027 2150
2028 cf::async { 2151 cf::async {
2152 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2153 $_->contr->save for $self->players;
2030 }; 2154 };
2155
2156 cf::get_slot 0.02;
2031 2157
2032 if ($uniq) { 2158 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2159 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2160 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2161 } else {
2041 my ($self) = @_; 2167 my ($self) = @_;
2042 2168
2043 # save first because save cedes 2169 # save first because save cedes
2044 $self->save; 2170 $self->save;
2045 2171
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2173
2048 return if $self->players; 2174 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2175 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2176 return if $self->{deny_save};
2051 2177
2178 $self->in_memory (cf::MAP_SWAPPED);
2179
2180 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2182 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2183}
2055 2184
2056sub reset_at { 2185sub reset_at {
2057 my ($self) = @_; 2186 my ($self) = @_;
2058 2187
2090 if $uniq; 2219 if $uniq;
2091 } 2220 }
2092 2221
2093 delete $cf::MAP{$self->path}; 2222 delete $cf::MAP{$self->path};
2094 2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2226 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2227
2099 $self->unlink_save; 2228 $self->unlink_save;
2100 $self->destroy; 2229 $self->destroy;
2101} 2230}
2102 2231
2103my $nuke_counter = "aaaa"; 2232my $nuke_counter = "aaaa";
2104 2233
2105sub nuke { 2234sub nuke {
2106 my ($self) = @_; 2235 my ($self) = @_;
2107 2236
2237 {
2238 my $lock = cf::lock_acquire "map_data:$self->{path}";
2239
2108 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2109 2241
2110 $self->unlink_save; 2242 $self->unlink_save;
2111 2243
2112 bless $self, "cf::map"; 2244 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2245 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2246 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2247 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2249
2118 $cf::MAP{$self->path} = $self; 2250 $cf::MAP{$self->path} = $self;
2251 }
2119 2252
2120 $self->reset; # polite request, might not happen 2253 $self->reset; # polite request, might not happen
2121} 2254}
2122 2255
2123=item $maps = cf::map::tmp_maps 2256=item $maps = cf::map::tmp_maps
2165 2298
2166sub unique_maps() { 2299sub unique_maps() {
2167 [ 2300 [
2168 map { 2301 map {
2169 utf8::decode $_; 2302 utf8::decode $_;
2170 /\.map$/ 2303 s/\.map$//; # TODO future compatibility hack
2304 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2305 ? ()
2171 ? normalise $_ 2306 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2307 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2308 ]
2175} 2309}
2176 2310
2177package cf;
2178
2179=back 2311=back
2180 2312
2181=head3 cf::object 2313=head3 cf::object
2182 2314
2183=cut 2315=cut
2186 2318
2187=over 4 2319=over 4
2188 2320
2189=item $ob->inv_recursive 2321=item $ob->inv_recursive
2190 2322
2191Returns the inventory of the object _and_ their inventories, recursively. 2323Returns the inventory of the object I<and> their inventories, recursively,
2324but I<not> the object itself.
2192 2325
2193=cut 2326=cut
2194 2327
2195sub inv_recursive_; 2328sub inv_recursive_;
2196sub inv_recursive_ { 2329sub inv_recursive_ {
2199 2332
2200sub inv_recursive { 2333sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2334 inv_recursive_ inv $_[0]
2202} 2335}
2203 2336
2337=item $ref = $ob->ref
2338
2339Creates and returns a persistent reference to an object that can be stored as a string.
2340
2341=item $ob = cf::object::deref ($refstring)
2342
2343returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2344even if the object actually exists. May block.
2345
2346=cut
2347
2348sub deref {
2349 my ($ref) = @_;
2350
2351 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2352 my ($uuid, $name) = ($1, $2);
2353 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2354 or return;
2355 $pl->ob->uuid eq $uuid
2356 or return;
2357
2358 $pl->ob
2359 } else {
2360 warn "$ref: cannot resolve object reference\n";
2361 undef
2362 }
2363}
2364
2204package cf; 2365package cf;
2205 2366
2206=back 2367=back
2207 2368
2208=head3 cf::object::player 2369=head3 cf::object::player
2214Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2375Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215can be C<undef>. Does the right thing when the player is currently in a 2376can be C<undef>. Does the right thing when the player is currently in a
2216dialogue with the given NPC character. 2377dialogue with the given NPC character.
2217 2378
2218=cut 2379=cut
2380
2381our $SAY_CHANNEL = {
2382 id => "say",
2383 title => "Map",
2384 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2386};
2387
2388our $CHAT_CHANNEL = {
2389 id => "chat",
2390 title => "Chat",
2391 reply => "chat ",
2392 tooltip => "Player chat and shouts, global to the server.",
2393};
2219 2394
2220# rough implementation of a future "reply" method that works 2395# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2396# with dialog boxes.
2222#TODO: the first argument must go, split into a $npc->reply_to ( method 2397#TODO: the first argument must go, split into a $npc->reply_to ( method
2223sub cf::object::player::reply($$$;$) { 2398sub cf::object::player::reply($$$;$) {
2235 my $dialog = $pl->{npc_dialog}; 2410 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2411 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2412
2238 } else { 2413 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2414 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2415 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2416 }
2242 } 2417 }
2418}
2419
2420=item $object->send_msg ($channel, $msg, $color, [extra...])
2421
2422=cut
2423
2424sub cf::object::send_msg {
2425 my $pl = shift->contr
2426 or return;
2427 $pl->send_msg (@_);
2243} 2428}
2244 2429
2245=item $player_object->may ("access") 2430=item $player_object->may ("access")
2246 2431
2247Returns wether the given player is authorized to access resource "access" 2432Returns wether the given player is authorized to access resource "access"
2326 # use -1 or undef as default coordinates, not 0, 0 2511 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2512 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2513 if $x <=0 && $y <= 0;
2329 2514
2330 $map->load; 2515 $map->load;
2331 $map->load_diag; 2516 $map->load_neighbours;
2332 2517
2333 return unless $self->contr->active; 2518 return unless $self->contr->active;
2334 $self->activate_recursive; 2519 $self->activate_recursive;
2335 2520
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2343her, loading and preparing them map, calling the provided $check callback 2528her, loading and preparing them map, calling the provided $check callback
2344that has to return the map if sucecssful, and then unfreezes the player on 2529that has to return the map if sucecssful, and then unfreezes the player on
2345the new (success) or old (failed) map position. In either case, $done will 2530the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process. 2531be called at the end of this process.
2347 2532
2533Note that $check will be called with a potentially non-loaded map, so if
2534it needs a loaded map it has to call C<< ->load >>.
2535
2348=cut 2536=cut
2349 2537
2350our $GOTOGEN; 2538our $GOTOGEN;
2351 2539
2352sub cf::object::player::goto { 2540sub cf::object::player::goto {
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2545
2358 $self->enter_link; 2546 $self->enter_link;
2359 2547
2360 (async { 2548 (async {
2549 $Coro::current->{desc} = "player::goto $path $x $y";
2550
2551 # *tag paths override both path and x|y
2552 if ($path =~ /^\*(.*)$/) {
2553 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2554 my $ob = $obs[rand @obs];
2555
2556 # see if we actually can go there
2557 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2558 $ob = $obs[rand @obs];
2559 } else {
2560 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2561 }
2562 # else put us there anyways for now #d#
2563
2564 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2565 } else {
2566 ($path, $x, $y) = (undef, undef, undef);
2567 }
2568 }
2569
2361 my $map = eval { 2570 my $map = eval {
2362 my $map = cf::map::find $path; 2571 my $map = defined $path ? cf::map::find $path : undef;
2363 2572
2364 if ($map) { 2573 if ($map) {
2365 $map = $map->customise_for ($self); 2574 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2575 $map = $check->($map) if $check && $map;
2367 } else { 2576 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2578 }
2370 2579
2371 $map 2580 $map
2372 }; 2581 };
2373 2582
2409} 2618}
2410 2619
2411sub prepare_random_map { 2620sub prepare_random_map {
2412 my ($exit) = @_; 2621 my ($exit) = @_;
2413 2622
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2623 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2624 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2625 # that depends on the exit object
2419 2626
2420 my $rmp = parse_random_map_params $exit->msg; 2627 my $rmp = parse_random_map_params $exit->msg;
2422 if ($exit->map) { 2629 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2630 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2631 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2632 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2633 $rmp->{origin_y} = $exit->y;
2634
2635 $exit->map->touch;
2427 } 2636 }
2428 2637
2429 $rmp->{random_seed} ||= $exit->random_seed; 2638 $rmp->{random_seed} ||= $exit->random_seed;
2430 2639
2431 my $data = cf::to_json $rmp; 2640 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2641 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2642 my $meta = "$RANDOMDIR/$md5.meta";
2434 2643
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2644 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2645 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2646 undef $fh;
2438 aio_rename "$meta~", $meta; 2647 aio_rename "$meta~", $meta;
2439 2648
2649 my $slaying = "?random/$md5";
2650
2651 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2652 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2653 $exit->msg (undef);
2654 }
2442 } 2655 }
2443} 2656}
2444 2657
2445sub cf::object::player::enter_exit { 2658sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2659 my ($self, $exit) = @_;
2447 2660
2448 return unless $self->type == cf::PLAYER; 2661 return unless $self->type == cf::PLAYER;
2449 2662
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2663 $self->enter_link;
2462 2664
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2665 (async {
2468 $self->deactivate_recursive; # just to be sure 2666 $Coro::current->{desc} = "enter_exit";
2667
2469 unless (eval { 2668 unless (eval {
2669 $self->deactivate_recursive; # just to be sure
2670
2671 # random map handling
2672 {
2673 my $guard = cf::lock_acquire "exit_prepare:$exit";
2674
2675 prepare_random_map $exit
2676 if $exit->slaying eq "/!";
2677 }
2678
2679 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2680 my $x = $exit->stats->hp;
2681 my $y = $exit->stats->sp;
2682
2470 $self->goto ($slaying, $hp, $sp); 2683 $self->goto ($map, $x, $y);
2471 2684
2685 # if exit is damned, update players death & WoR home-position
2686 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED);
2688
2472 1; 2689 1
2473 }) { 2690 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2691 $self->message ("Something went wrong deep within the crossfire server. "
2475 . "I'll try to bring you back to the map you were before. " 2692 . "I'll try to bring you back to the map you were before. "
2476 . "Please report this to the dungeon master!", 2693 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2694 cf::NDI_UNIQUE | cf::NDI_RED);
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2724the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2725the message unless the client supports the msg packet.
2509 2726
2510=cut 2727=cut
2511 2728
2729# non-persistent channels (usually the info channel)
2730our %CHANNEL = (
2731 "c/identify" => {
2732 id => "infobox",
2733 title => "Identify",
2734 reply => undef,
2735 tooltip => "Items recently identified",
2736 },
2737 "c/examine" => {
2738 id => "infobox",
2739 title => "Examine",
2740 reply => undef,
2741 tooltip => "Signs and other items you examined",
2742 },
2743 "c/book" => {
2744 id => "infobox",
2745 title => "Book",
2746 reply => undef,
2747 tooltip => "The contents of a note or book",
2748 },
2749 "c/lookat" => {
2750 id => "infobox",
2751 title => "Look",
2752 reply => undef,
2753 tooltip => "What you saw there",
2754 },
2755 "c/who" => {
2756 id => "infobox",
2757 title => "Players",
2758 reply => undef,
2759 tooltip => "Shows players who are currently online",
2760 },
2761 "c/body" => {
2762 id => "infobox",
2763 title => "Body Parts",
2764 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available",
2766 },
2767 "c/uptime" => {
2768 id => "infobox",
2769 title => "Uptime",
2770 reply => undef,
2771 tooltip => "How long the server has been running since last restart",
2772 },
2773 "c/mapinfo" => {
2774 id => "infobox",
2775 title => "Map Info",
2776 reply => undef,
2777 tooltip => "Information related to the maps",
2778 },
2779 "c/party" => {
2780 id => "party",
2781 title => "Party",
2782 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party",
2784 },
2785);
2786
2512sub cf::client::send_msg { 2787sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2788 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2789
2515 $msg = $self->pl->expand_cfpod ($msg); 2790 $msg = $self->pl->expand_cfpod ($msg);
2516 2791
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2792 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2793
2794 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel};
2797
2798 $self->ext_msg (channel_info => $channel)
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id};
2802
2519 if (ref $channel) { 2803 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2804 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2805 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2806 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2807 $self->ext_msg (channel_info => $channel)
2808 if $self->can_msg;
2524 } 2809 }
2525 2810
2526 $channel = $channel->{id}; 2811 $channel = $channel->{id};
2527 } 2812 }
2528 2813
2529 return unless @extra || length $msg; 2814 return unless @extra || length $msg;
2530 2815
2531 if ($self->can_msg) { 2816 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2817 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF;
2820
2821 my $pkt = "msg "
2822 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 );
2825
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt);
2533 } else { 2837 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2545 if (0 && $msg =~ /\[/) { 2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2856 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2858 $self->send_packet ("drawinfo $color $msg")
2550 } 2859 }
2551 } 2860 }
2559=cut 2868=cut
2560 2869
2561sub cf::client::ext_msg($$@) { 2870sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2871 my ($self, $type, @msg) = @_;
2563 2872
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2873 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2875 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2876 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 }
2879}
2880
2881=item $client->ext_reply ($msgid, @msg)
2882
2883Sends an ext reply to the client.
2884
2885=cut
2886
2887sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_;
2889
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2896 }
2572} 2897}
2573 2898
2574=item $success = $client->query ($flags, "text", \&cb) 2899=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 2961 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2962 "ARRAY" eq ref $msg
2638 ? @$msg 2963 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2964 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2965
2966 my @reply;
2967
2641 if (my $cb = $EXTICMD{$type}) { 2968 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2969 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2970 }
2971
2972 $ns->ext_reply ($reply, @reply)
2973 if $reply;
2974
2647 } else { 2975 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2976 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2977 }
2650 2978
2651 cf::override; 2979 cf::override;
2698our $safe = new Safe "safe"; 3026our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3027our $safe_hole = new Safe::Hole;
2700 3028
2701$SIG{FPE} = 'IGNORE'; 3029$SIG{FPE} = 'IGNORE';
2702 3030
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3031$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math
3033 grepstart grepwhile mapstart mapwhile
3034 sort time
3035));
2704 3036
2705# here we export the classes and methods available to script code 3037# here we export the classes and methods available to script code
2706 3038
2707=pod 3039=pod
2708 3040
2709The following functions and methods are available within a safe environment: 3041The following functions and methods are available within a safe environment:
2710 3042
2711 cf::object 3043 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3044 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3045 insert remove name archname title slaying race decrease split
2714 3046
2715 cf::object::player 3047 cf::object::player
2716 player 3048 player
2717 3049
2718 cf::player 3050 cf::player
2723 3055
2724=cut 3056=cut
2725 3057
2726for ( 3058for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3060 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3062 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3063 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3064 ["cf::map" => qw(trigger)],
2732) { 3065) {
2733 no strict 'refs'; 3066 no strict 'refs';
2809# the server's init and main functions 3142# the server's init and main functions
2810 3143
2811sub load_facedata($) { 3144sub load_facedata($) {
2812 my ($path) = @_; 3145 my ($path) = @_;
2813 3146
3147 # HACK to clear player env face cache, we need some signal framework
3148 # for this (global event?)
3149 %ext::player_env::MUSIC_FACE_CACHE = ();
3150
3151 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3152
2814 warn "loading facedata from $path\n"; 3153 warn "loading facedata from $path\n";
2815 3154
2816 my $facedata; 3155 my $facedata;
2817 0 < aio_load $path, $facedata 3156 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3157 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3159 $facedata = Coro::Storable::thaw $facedata;
2821 3160
2822 $facedata->{version} == 2 3161 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3162 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3163
3164 # patch in the exptable
3165 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3168 };
3169 cf::cede_to_tick;
3170
2825 { 3171 {
2826 my $faces = $facedata->{faceinfo}; 3172 my $faces = $facedata->{faceinfo};
2827 3173
2828 while (my ($face, $info) = each %$faces) { 3174 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3175 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176
2830 cf::face::set_visibility $idx, $info->{visibility}; 3177 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3178 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3181
2835 cf::cede_to_tick; 3182 cf::cede_to_tick;
2836 } 3183 }
2837 3184
2838 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3186 next unless $info->{smooth};
3187
2840 my $idx = cf::face::find $face 3188 my $idx = cf::face::find $face
2841 or next; 3189 or next;
3190
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3191 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3192 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3193 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3194 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3195 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3212
2864 { 3213 {
2865 # TODO: for gcfclient pleasure, we should give resources 3214 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3215 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3216 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3217
2870 while (my ($name, $info) = each %$res) { 3218 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3219 if (defined $info->{type}) {
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3220 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
2877 3222
2878 if ($info->{type} & 1) { 3223 if ($info->{type} & 1) {
2879 # prepend meta info 3224 # prepend meta info
2880 3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
2881 my $data = pack "(w/a*)*", $meta, $info->{data}; 3231 $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3232 } else {
3233 $data = $info->{data};
3234 }
2883 3235
2884 cf::face::set_data $idx, 0, $data, $chk; 3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type};
2885 } else { 3238 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3239 $RESOURCE{$name} = $info;
2887 } 3240 }
2888 3241
2889 cf::face::set_type $idx, $info->{type};
2890
2891 cf::cede_to_tick; 3242 cf::cede_to_tick;
2892 } 3243 }
2893 } 3244 }
2894 3245
3246 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3247
2895 1 3248 1
2896} 3249}
3250
3251cf::global->attach (on_resource_update => sub {
3252 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3253 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3254
3255 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3256 my $sound = $soundconf->{compat}[$_]
3257 or next;
3258
3259 my $face = cf::face::find "sound/$sound->[1]";
3260 cf::sound::set $sound->[0] => $face;
3261 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3262 }
3263
3264 while (my ($k, $v) = each %{$soundconf->{event}}) {
3265 my $face = cf::face::find "sound/$v";
3266 cf::sound::set $k => $face;
3267 }
3268 }
3269});
2897 3270
2898register_exticmd fx_want => sub { 3271register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_; 3272 my ($ns, $want) = @_;
2900 3273
2901 while (my ($k, $v) = each %$want) { 3274 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v); 3275 $ns->fx_want ($k, $v);
2903 } 3276 }
2904}; 3277};
2905 3278
3279sub load_resource_file($) {
3280 my $guard = lock_acquire "load_resource_file";
3281
3282 my $status = load_resource_file_ $_[0];
3283 get_slot 0.1, 100;
3284 cf::arch::commit_load;
3285
3286 $status
3287}
3288
2906sub reload_regions { 3289sub reload_regions {
3290 # HACK to clear player env face cache, we need some signal framework
3291 # for this (global event?)
3292 %ext::player_env::MUSIC_FACE_CACHE = ();
3293
2907 load_resource_file "$MAPDIR/regions" 3294 load_resource_file "$MAPDIR/regions"
2908 or die "unable to load regions file\n"; 3295 or die "unable to load regions file\n";
2909 3296
2910 for (cf::region::list) { 3297 for (cf::region::list) {
2911 $_->{match} = qr/$_->{match}/ 3298 $_->{match} = qr/$_->{match}/
2919} 3306}
2920 3307
2921sub reload_archetypes { 3308sub reload_archetypes {
2922 load_resource_file "$DATADIR/archetypes" 3309 load_resource_file "$DATADIR/archetypes"
2923 or die "unable to load archetypes\n"; 3310 or die "unable to load archetypes\n";
2924 #d# NEED to laod twice to resolve forward references
2925 # this really needs to be done in an extra post-pass
2926 # (which needs to be synchronous, so solve it differently)
2927 load_resource_file "$DATADIR/archetypes"
2928 or die "unable to load archetypes\n";
2929} 3311}
2930 3312
2931sub reload_treasures { 3313sub reload_treasures {
2932 load_resource_file "$DATADIR/treasures" 3314 load_resource_file "$DATADIR/treasures"
2933 or die "unable to load treasurelists\n"; 3315 or die "unable to load treasurelists\n";
2934} 3316}
2935 3317
2936sub reload_resources { 3318sub reload_resources {
2937 warn "reloading resource files...\n"; 3319 warn "reloading resource files...\n";
2938 3320
3321 reload_facedata;
3322 reload_archetypes;
2939 reload_regions; 3323 reload_regions;
2940 reload_facedata;
2941 #reload_archetypes;#d#
2942 reload_archetypes;
2943 reload_treasures; 3324 reload_treasures;
2944 3325
2945 warn "finished reloading resource files\n"; 3326 warn "finished reloading resource files\n";
2946} 3327}
2947 3328
2948sub init { 3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
2949 reload_resources; 3334 reload_resources;
2950} 3335}
2951 3336
2952sub cfg_load { 3337sub reload_config {
2953 open my $fh, "<:utf8", "$CONFDIR/config" 3338 open my $fh, "<:utf8", "$CONFDIR/config"
2954 or return; 3339 or return;
2955 3340
2956 local $/; 3341 local $/;
2957 *CFG = YAML::Syck::Load <$fh>; 3342 *CFG = YAML::Load <$fh>;
2958 3343
2959 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2960 3345
2961 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2962 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2973sub main { 3358sub main {
2974 # we must not ever block the main coroutine 3359 # we must not ever block the main coroutine
2975 local $Coro::idle = sub { 3360 local $Coro::idle = sub {
2976 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2977 (async { 3362 (async {
2978 Event::one_event; 3363 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT;
2979 })->prio (Coro::PRIO_MAX); 3365 })->prio (Coro::PRIO_MAX);
2980 }; 3366 };
2981 3367
2982 cfg_load; 3368 {
3369 my $guard = freeze_mainloop;
3370 reload_config;
2983 db_init; 3371 db_init;
2984 load_extensions; 3372 load_extensions;
2985 3373
2986 $TICK_WATCHER->start; 3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3375 }
3376
2987 Event::loop; 3377 EV::loop;
2988} 3378}
2989 3379
2990############################################################################# 3380#############################################################################
2991# initialisation and cleanup 3381# initialisation and cleanup
2992 3382
2993# install some emergency cleanup handlers 3383# install some emergency cleanup handlers
2994BEGIN { 3384BEGIN {
3385 our %SIGWATCHER = ();
2995 for my $signal (qw(INT HUP TERM)) { 3386 for my $signal (qw(INT HUP TERM)) {
2996 Event->signal ( 3387 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2997 reentrant => 0,
2998 data => WF_AUTOCANCEL,
2999 signal => $signal,
3000 prio => 0,
3001 cb => sub {
3002 cf::cleanup "SIG$signal"; 3388 cf::cleanup "SIG$signal";
3003 },
3004 ); 3389 };
3005 } 3390 }
3006} 3391}
3007 3392
3008sub write_runtime { 3393sub write_runtime_sync {
3009 my $runtime = "$LOCALDIR/runtime"; 3394 my $runtime = "$LOCALDIR/runtime";
3010 3395
3011 # first touch the runtime file to show we are still running: 3396 # first touch the runtime file to show we are still running:
3012 # the fsync below can take a very very long time. 3397 # the fsync below can take a very very long time.
3013 3398
3039 and return; 3424 and return;
3040 3425
3041 warn "runtime file written.\n"; 3426 warn "runtime file written.\n";
3042 3427
3043 1 3428 1
3429}
3430
3431our $uuid_lock;
3432our $uuid_skip;
3433
3434sub write_uuid_sync($) {
3435 $uuid_skip ||= $_[0];
3436
3437 return if $uuid_lock;
3438 local $uuid_lock = 1;
3439
3440 my $uuid = "$LOCALDIR/uuid";
3441
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return;
3444
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3446 $uuid_skip = 0;
3447
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return;
3450
3451 # always fsync - this file is important
3452 aio_fsync $fh
3453 and return;
3454
3455 close $fh
3456 or return;
3457
3458 aio_rename "$uuid~", $uuid
3459 and return;
3460
3461 warn "uuid file written ($value).\n";
3462
3463 1
3464
3465}
3466
3467sub write_uuid($$) {
3468 my ($skip, $sync) = @_;
3469
3470 $sync ? write_uuid_sync $skip
3471 : async { write_uuid_sync $skip };
3044} 3472}
3045 3473
3046sub emergency_save() { 3474sub emergency_save() {
3047 my $freeze_guard = cf::freeze_mainloop; 3475 my $freeze_guard = cf::freeze_mainloop;
3048 3476
3054 # and maps saved/destroyed asynchronously. 3482 # and maps saved/destroyed asynchronously.
3055 warn "begin emergency player save\n"; 3483 warn "begin emergency player save\n";
3056 for my $login (keys %cf::PLAYER) { 3484 for my $login (keys %cf::PLAYER) {
3057 my $pl = $cf::PLAYER{$login} or next; 3485 my $pl = $cf::PLAYER{$login} or next;
3058 $pl->valid or next; 3486 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3059 $pl->save; 3488 $pl->save;
3060 } 3489 }
3061 warn "end emergency player save\n"; 3490 warn "end emergency player save\n";
3062 3491
3063 warn "begin emergency map save\n"; 3492 warn "begin emergency map save\n";
3069 warn "end emergency map save\n"; 3498 warn "end emergency map save\n";
3070 3499
3071 warn "begin emergency database checkpoint\n"; 3500 warn "begin emergency database checkpoint\n";
3072 BDB::db_env_txn_checkpoint $DB_ENV; 3501 BDB::db_env_txn_checkpoint $DB_ENV;
3073 warn "end emergency database checkpoint\n"; 3502 warn "end emergency database checkpoint\n";
3503
3504 warn "begin write uuid\n";
3505 write_uuid_sync 1;
3506 warn "end write uuid\n";
3074 }; 3507 };
3075 3508
3076 warn "leave emergency perl save\n"; 3509 warn "leave emergency perl save\n";
3077} 3510}
3078 3511
3080 my ($make_core) = @_; 3513 my ($make_core) = @_;
3081 3514
3082 warn Carp::longmess "post_cleanup backtrace" 3515 warn Carp::longmess "post_cleanup backtrace"
3083 if $make_core; 3516 if $make_core;
3084} 3517}
3518
3519# a safer delete_package, copied from Symbol
3520sub clear_package($) {
3521 my $pkg = shift;
3522
3523 # expand to full symbol table name if needed
3524 unless ($pkg =~ /^main::.*::$/) {
3525 $pkg = "main$pkg" if $pkg =~ /^::/;
3526 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3527 $pkg .= '::' unless $pkg =~ /::$/;
3528 }
3529
3530 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3531 my $stem_symtab = *{$stem}{HASH};
3532
3533 defined $stem_symtab and exists $stem_symtab->{$leaf}
3534 or return;
3535
3536 # clear all symbols
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 }
3542 warn "cleared package #$pkg\n";#d#
3543}
3544
3545our $RELOAD; # how many times to reload
3085 3546
3086sub do_reload_perl() { 3547sub do_reload_perl() {
3087 # can/must only be called in main 3548 # can/must only be called in main
3088 if ($Coro::current != $Coro::main) { 3549 if ($Coro::current != $Coro::main) {
3089 warn "can only reload from main coroutine"; 3550 warn "can only reload from main coroutine";
3090 return; 3551 return;
3091 } 3552 }
3092 3553
3554 return if $RELOAD++;
3555
3556 while ($RELOAD) {
3093 warn "reloading..."; 3557 warn "reloading...";
3094 3558
3095 warn "entering sync_job"; 3559 warn "entering sync_job";
3096 3560
3097 cf::sync_job { 3561 cf::sync_job {
3098 cf::write_runtime; # external watchdog should not bark 3562 cf::write_runtime_sync; # external watchdog should not bark
3099 cf::emergency_save; 3563 cf::emergency_save;
3100 cf::write_runtime; # external watchdog should not bark 3564 cf::write_runtime_sync; # external watchdog should not bark
3101 3565
3102 warn "syncing database to disk"; 3566 warn "syncing database to disk";
3103 BDB::db_env_txn_checkpoint $DB_ENV; 3567 BDB::db_env_txn_checkpoint $DB_ENV;
3104 3568
3105 # if anything goes wrong in here, we should simply crash as we already saved 3569 # if anything goes wrong in here, we should simply crash as we already saved
3106 3570
3107 warn "cancelling all WF_AUTOCANCEL watchers";
3108 for (Event::all_watchers) {
3109 $_->cancel if $_->data & WF_AUTOCANCEL;
3110 }
3111
3112 warn "flushing outstanding aio requests"; 3571 warn "flushing outstanding aio requests";
3113 for (;;) {
3114 BDB::flush;
3115 IO::AIO::flush;
3116 Coro::cede;
3117 last unless IO::AIO::nreqs || BDB::nreqs; 3572 while (IO::AIO::nreqs || BDB::nreqs) {
3118 warn "iterate..."; 3573 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3119 }
3120
3121 ++$RELOAD;
3122
3123 warn "cancelling all extension coros";
3124 $_->cancel for values %EXT_CORO;
3125 %EXT_CORO = ();
3126
3127 warn "removing commands";
3128 %COMMAND = ();
3129
3130 warn "removing ext/exti commands";
3131 %EXTCMD = ();
3132 %EXTICMD = ();
3133
3134 warn "unloading/nuking all extensions";
3135 for my $pkg (@EXTS) {
3136 warn "... unloading $pkg";
3137
3138 if (my $cb = $pkg->can ("unload")) {
3139 eval {
3140 $cb->($pkg);
3141 1
3142 } or warn "$pkg unloaded, but with errors: $@";
3143 } 3574 }
3144 3575
3145 warn "... nuking $pkg"; 3576 warn "cancelling all extension coros";
3146 Symbol::delete_package $pkg; 3577 $_->cancel for values %EXT_CORO;
3147 } 3578 %EXT_CORO = ();
3148 3579
3149 warn "unloading all perl modules loaded from $LIBDIR"; 3580 warn "removing commands";
3150 while (my ($k, $v) = each %INC) { 3581 %COMMAND = ();
3151 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3152 3582
3583 warn "removing ext/exti commands";
3584 %EXTCMD = ();
3585 %EXTICMD = ();
3586
3587 warn "unloading/nuking all extensions";
3588 for my $pkg (@EXTS) {
3153 warn "... unloading $k"; 3589 warn "... unloading $pkg";
3154 delete $INC{$k};
3155 3590
3156 $k =~ s/\.pm$//;
3157 $k =~ s/\//::/g;
3158
3159 if (my $cb = $k->can ("unload_module")) { 3591 if (my $cb = $pkg->can ("unload")) {
3592 eval {
3160 $cb->(); 3593 $cb->($pkg);
3594 1
3595 } or warn "$pkg unloaded, but with errors: $@";
3596 }
3597
3598 warn "... clearing $pkg";
3599 clear_package $pkg;
3161 } 3600 }
3162 3601
3163 Symbol::delete_package $k; 3602 warn "unloading all perl modules loaded from $LIBDIR";
3603 while (my ($k, $v) = each %INC) {
3604 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3605
3606 warn "... unloading $k";
3607 delete $INC{$k};
3608
3609 $k =~ s/\.pm$//;
3610 $k =~ s/\//::/g;
3611
3612 if (my $cb = $k->can ("unload_module")) {
3613 $cb->();
3614 }
3615
3616 clear_package $k;
3164 } 3617 }
3165 3618
3166 warn "getting rid of safe::, as good as possible"; 3619 warn "getting rid of safe::, as good as possible";
3167 Symbol::delete_package "safe::$_" 3620 clear_package "safe::$_"
3168 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3169 3622
3170 warn "unloading cf.pm \"a bit\""; 3623 warn "unloading cf.pm \"a bit\"";
3171 delete $INC{"cf.pm"}; 3624 delete $INC{"cf.pm"};
3172 delete $INC{"cf/pod.pm"}; 3625 delete $INC{"cf/pod.pm"};
3173 3626
3174 # don't, removes xs symbols, too, 3627 # don't, removes xs symbols, too,
3175 # and global variables created in xs 3628 # and global variables created in xs
3176 #Symbol::delete_package __PACKAGE__; 3629 #clear_package __PACKAGE__;
3177 3630
3178 warn "unload completed, starting to reload now"; 3631 warn "unload completed, starting to reload now";
3179 3632
3180 warn "reloading cf.pm"; 3633 warn "reloading cf.pm";
3181 require cf; 3634 require cf;
3182 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3183 3636
3184 warn "loading config and database again"; 3637 warn "loading config and database again";
3185 cf::cfg_load; 3638 cf::reload_config;
3186 3639
3187 warn "loading extensions"; 3640 warn "loading extensions";
3188 cf::load_extensions; 3641 cf::load_extensions;
3189 3642
3190 warn "reattaching attachments to objects/players"; 3643 warn "reattaching attachments to objects/players";
3191 _global_reattach; # objects, sockets 3644 _global_reattach; # objects, sockets
3192 warn "reattaching attachments to maps"; 3645 warn "reattaching attachments to maps";
3193 reattach $_ for values %MAP; 3646 reattach $_ for values %MAP;
3194 warn "reattaching attachments to players"; 3647 warn "reattaching attachments to players";
3195 reattach $_ for values %PLAYER; 3648 reattach $_ for values %PLAYER;
3196 3649
3197 warn "leaving sync_job"; 3650 warn "leaving sync_job";
3198 3651
3199 1 3652 1
3200 } or do { 3653 } or do {
3201 warn $@; 3654 warn $@;
3202 warn "error while reloading, exiting."; 3655 cf::cleanup "error while reloading, exiting.";
3203 exit 1;
3204 }; 3656 };
3205 3657
3206 warn "reloaded"; 3658 warn "reloaded";
3659 --$RELOAD;
3660 }
3207}; 3661};
3208 3662
3209our $RELOAD_WATCHER; # used only during reload 3663our $RELOAD_WATCHER; # used only during reload
3210 3664
3211sub reload_perl() { 3665sub reload_perl() {
3212 # doing reload synchronously and two reloads happen back-to-back, 3666 # doing reload synchronously and two reloads happen back-to-back,
3213 # coro crashes during coro_state_free->destroy here. 3667 # coro crashes during coro_state_free->destroy here.
3214 3668
3215 $RELOAD_WATCHER ||= Event->timer ( 3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3216 reentrant => 0,
3217 after => 0,
3218 data => WF_AUTOCANCEL,
3219 cb => sub {
3220 do_reload_perl; 3670 do_reload_perl;
3221 undef $RELOAD_WATCHER; 3671 undef $RELOAD_WATCHER;
3222 },
3223 ); 3672 };
3224} 3673}
3225 3674
3226register_command "reload" => sub { 3675register_command "reload" => sub {
3227 my ($who, $arg) = @_; 3676 my ($who, $arg) = @_;
3228 3677
3229 if ($who->flag (FLAG_WIZ)) { 3678 if ($who->flag (FLAG_WIZ)) {
3230 $who->message ("reloading server."); 3679 $who->message ("reloading server.");
3680 async {
3681 $Coro::current->{desc} = "perl_reload";
3231 async { reload_perl }; 3682 reload_perl;
3683 };
3232 } 3684 }
3233}; 3685};
3234 3686
3235unshift @INC, $LIBDIR; 3687unshift @INC, $LIBDIR;
3236 3688
3238 3690
3239our @WAIT_FOR_TICK; 3691our @WAIT_FOR_TICK;
3240our @WAIT_FOR_TICK_BEGIN; 3692our @WAIT_FOR_TICK_BEGIN;
3241 3693
3242sub wait_for_tick { 3694sub wait_for_tick {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 3695 return if tick_inhibit || $Coro::current == $Coro::main;
3245 3696
3246 my $signal = new Coro::Signal; 3697 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK, $signal; 3698 push @WAIT_FOR_TICK, $signal;
3248 $signal->wait; 3699 $signal->wait;
3249} 3700}
3250 3701
3251sub wait_for_tick_begin { 3702sub wait_for_tick_begin {
3252 return unless $TICK_WATCHER->is_active;
3253 return if $Coro::current == $Coro::main; 3703 return if tick_inhibit || $Coro::current == $Coro::main;
3254 3704
3255 my $signal = new Coro::Signal; 3705 my $signal = new Coro::Signal;
3256 push @WAIT_FOR_TICK_BEGIN, $signal; 3706 push @WAIT_FOR_TICK_BEGIN, $signal;
3257 $signal->wait; 3707 $signal->wait;
3258} 3708}
3259 3709
3260 my $min = 1e6;#d# 3710sub tick {
3261 my $avg = 10;
3262$TICK_WATCHER = Event->timer (
3263 reentrant => 0,
3264 parked => 1,
3265 prio => 0,
3266 at => $NEXT_TICK || $TICK,
3267 data => WF_AUTOCANCEL,
3268 cb => sub {
3269 if ($Coro::current != $Coro::main) { 3711 if ($Coro::current != $Coro::main) {
3270 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3712 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3271 unless ++$bug_warning > 10; 3713 unless ++$bug_warning > 10;
3272 return; 3714 return;
3273 } 3715 }
3274 3716
3275 $NOW = $tick_start = Event::time;
3276
3277 cf::server_tick; # one server iteration 3717 cf::server_tick; # one server iteration
3278 3718
3279 0 && sync_job {#d# 3719 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3280 for(1..10) { 3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3281 my $t = Event::time; 3721 Coro::async_pool {
3282 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3722 $Coro::current->{desc} = "runtime saver";
3283 or die; 3723 write_runtime_sync
3284 3724 or warn "ERROR: unable to write runtime file: $!";
3285 $map->width (50);
3286 $map->height (50);
3287 $map->alloc;
3288 $map->_load_objects ("/tmp/x.map", 1);
3289 my $t = Event::time - $t;
3290
3291 #next unless $t < 0.0013;#d#
3292 if ($t < $min) {
3293 $min = $t;
3294 }
3295 $avg = $avg * 0.99 + $t * 0.01;
3296 }
3297 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3298 exit 0;
3299 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3300 }; 3725 };
3726 }
3301 3727
3302 $RUNTIME += $TICK;
3303 $NEXT_TICK += $TICK;
3304
3305 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3306 $NEXT_RUNTIME_WRITE = $NOW + 10;
3307 Coro::async_pool {
3308 write_runtime
3309 or warn "ERROR: unable to write runtime file: $!";
3310 };
3311 }
3312
3313# my $AFTER = Event::time;
3314# warn $AFTER - $NOW;#d#
3315
3316 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3728 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3317 $sig->send; 3729 $sig->send;
3318 } 3730 }
3319 while (my $sig = shift @WAIT_FOR_TICK) { 3731 while (my $sig = shift @WAIT_FOR_TICK) {
3320 $sig->send; 3732 $sig->send;
3321 } 3733 }
3322 3734
3323 $NOW = Event::time; 3735 $LOAD = ($NOW - $TICK_START) / $TICK;
3324
3325 # if we are delayed by four ticks or more, skip them all
3326 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3327
3328 $TICK_WATCHER->at ($NEXT_TICK);
3329 $TICK_WATCHER->start;
3330
3331 $LOAD = ($NOW - $tick_start) / $TICK;
3332 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3736 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3333 3737
3334 _post_tick; 3738 if (0) {
3335 3739 if ($NEXT_TICK) {
3336 3740 my $jitter = $TICK_START - $NEXT_TICK;
3741 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3742 warn "jitter $JITTER\n";#d#
3743 }
3337 }, 3744 }
3338); 3745}
3339 3746
3340{ 3747{
3341 BDB::max_poll_time $TICK * 0.1; 3748 # configure BDB
3342 $BDB_POLL_WATCHER = Event->io ( 3749
3343 reentrant => 0,
3344 fd => BDB::poll_fileno,
3345 poll => 'r',
3346 prio => 0,
3347 data => WF_AUTOCANCEL,
3348 cb => \&BDB::poll_cb,
3349 );
3350 BDB::min_parallel 8; 3750 BDB::min_parallel 8;
3351 3751 BDB::max_poll_reqs $TICK * 0.1;
3352 BDB::set_sync_prepare { 3752 $AnyEvent::BDB::WATCHER->priority (1);
3353 my $status;
3354 my $current = $Coro::current;
3355 (
3356 sub {
3357 $status = $!;
3358 $current->ready; undef $current;
3359 },
3360 sub {
3361 Coro::schedule while defined $current;
3362 $! = $status;
3363 },
3364 )
3365 };
3366 3753
3367 unless ($DB_ENV) { 3754 unless ($DB_ENV) {
3368 $DB_ENV = BDB::db_env_create; 3755 $DB_ENV = BDB::db_env_create;
3756 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3757 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3758 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3759 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3760 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3369 3761
3370 cf::sync_job { 3762 cf::sync_job {
3371 eval { 3763 eval {
3372 BDB::db_env_open 3764 BDB::db_env_open
3373 $DB_ENV, 3765 $DB_ENV,
3375 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3767 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3376 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3768 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3377 0666; 3769 0666;
3378 3770
3379 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3771 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3380
3381 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3382 $DB_ENV->set_lk_detect;
3383 }; 3772 };
3384 3773
3385 cf::cleanup "db_env_open(db): $@" if $@; 3774 cf::cleanup "db_env_open(db): $@" if $@;
3386 }; 3775 };
3387 } 3776 }
3777
3778 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3779 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3780 };
3781 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3782 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3783 };
3784 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3785 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3786 };
3388} 3787}
3389 3788
3390{ 3789{
3790 # configure IO::AIO
3791
3391 IO::AIO::min_parallel 8; 3792 IO::AIO::min_parallel 8;
3392
3393 undef $Coro::AIO::WATCHER;
3394 IO::AIO::max_poll_time $TICK * 0.1; 3793 IO::AIO::max_poll_time $TICK * 0.1;
3395 $AIO_POLL_WATCHER = Event->io ( 3794 undef $AnyEvent::AIO::WATCHER;
3396 reentrant => 0,
3397 data => WF_AUTOCANCEL,
3398 fd => IO::AIO::poll_fileno,
3399 poll => 'r',
3400 prio => 6,
3401 cb => \&IO::AIO::poll_cb,
3402 );
3403} 3795}
3404 3796
3405my $_log_backtrace; 3797my $_log_backtrace;
3406 3798
3407sub _log_backtrace { 3799sub _log_backtrace {
3411 3803
3412 # limit the # of concurrent backtraces 3804 # limit the # of concurrent backtraces
3413 if ($_log_backtrace < 2) { 3805 if ($_log_backtrace < 2) {
3414 ++$_log_backtrace; 3806 ++$_log_backtrace;
3415 async { 3807 async {
3808 $Coro::current->{desc} = "abt $msg";
3809
3416 my @bt = fork_call { 3810 my @bt = fork_call {
3417 @addr = map { sprintf "%x", $_ } @addr; 3811 @addr = map { sprintf "%x", $_ } @addr;
3418 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3812 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3419 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3813 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3420 or die "addr2line: $!"; 3814 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines