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.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.64 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
21use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
22 25
26use JSON::XS 1.4 ();
23use BDB (); 27use BDB ();
24use Data::Dumper; 28use Data::Dumper;
25use Digest::MD5; 29use Digest::MD5;
26use Fcntl; 30use Fcntl;
27use YAML::Syck (); 31use YAML::Syck ();
28use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
29use Time::HiRes; 33use Time::HiRes;
30use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
31 36
32# configure various modules to our taste 37# configure various modules to our taste
33# 38#
34$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
47our %COMMAND = (); 52our %COMMAND = ();
48our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
49 54
50our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
51our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
52our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
54 60
55our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
56our @EVENT; 62our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 63
59our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 77our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 80our $NEXT_TICK;
64our $NOW; 81our $NOW;
73our $RUNTIME; 90our $RUNTIME;
74 91
75our %PLAYER; # all users 92our %PLAYER; # all users
76our %MAP; # all maps 93our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 95
84# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
87binmode STDOUT; 103binmode STDOUT;
88binmode STDERR; 104binmode STDERR;
89 105
90# read virtual server time, if available 106# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
95} 111}
96 112
97mkdir cf::localdir; 113mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 115
104our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
105 117
106sub cf::map::normalise; 118sub cf::map::normalise;
107 119
118=item $cf::RUNTIME 130=item $cf::RUNTIME
119 131
120The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 133every server tick.
122 134
123=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 138
125The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
127 143
128=item $cf::NOW 144=item $cf::NOW
129 145
130The time of the last (current) server tick. 146The time of the last (current) server tick.
131 147
132=item $cf::TICK 148=item $cf::TICK
133 149
134The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
135 161
136=item %cf::CFG 162=item %cf::CFG
137 163
138Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 165from wherever your confdir points to.
140 166
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
142 168
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
147 178
148=back 179=back
149 180
150=cut 181=cut
151 182
152BEGIN { 183BEGIN {
153 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 185 my $msg = join "", @_;
155 utf8::encode $msg;
156 186
157 $msg .= "\n" 187 $msg .= "\n"
158 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
159 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
160 LOG llevError, $msg; 193 LOG llevError, $msg;
161 }; 194 };
162} 195}
163 196
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 204
171# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 206# within the Safe compartment.
173for my $pkg (qw( 207for my $pkg (qw(
174 cf::global cf::attachable 208 cf::global cf::attachable
182} 216}
183 217
184$Event::DIED = sub { 218$Event::DIED = sub {
185 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
186}; 220};
221
222#############################################################################
187 223
188=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
189 225
190=over 4 226=over 4
191 227
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 247 $d
212 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
213} 249}
214 250
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
218 252
219Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
220 254
221=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
222 256
223Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
224 265
225=item cf::lock_wait $string 266=item cf::lock_wait $string
226 267
227Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
228 269
234returned. 275returned.
235 276
236Lock names should begin with a unique identifier (for example, cf::map::find 277Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 278uses map_find and cf::map::load uses map_load).
238 279
280=item $locked = cf::lock_active $string
281
282Return true if the lock is currently active, i.e. somebody has locked it.
283
239=cut 284=cut
240 285
241our %LOCK; 286our %LOCK;
242 287
243sub lock_wait($) { 288sub lock_wait($) {
260 305
261 Coro::guard { 306 Coro::guard {
262 # wake up all waiters, to be on the safe side 307 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 308 $_->ready for @{ delete $LOCK{$key} };
264 } 309 }
310}
311
312sub lock_active($) {
313 my ($key) = @_;
314
315 ! ! $LOCK{$key}
265} 316}
266 317
267sub freeze_mainloop { 318sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 319 return unless $TICK_WATCHER->is_active;
269 320
272 }; 323 };
273 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
274 $guard 325 $guard
275} 326}
276 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
277=item cf::async { BLOCK } 384=item cf::async { BLOCK }
278 385
279Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
280C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
281thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
284 391
285BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
286 393
287=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
288 395
289The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 397is always able to handle events or runnable, as Crossfire TRT is only
291reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
292 400
293If it must be done, put the blocking parts into C<sync_job>. This will run 401If it must be done, put the blocking parts into C<sync_job>. This will run
294the given BLOCK in another coroutine while waiting for the result. The 402the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
296fast or be very important. 404fast or be very important.
299 407
300sub sync_job(&) { 408sub sync_job(&) {
301 my ($job) = @_; 409 my ($job) = @_;
302 410
303 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
304 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
306 416
307 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 418 # (but this is cancel-safe)
319 429
320 while ($busy) { 430 while ($busy) {
321 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
322 } 432 }
323 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
324 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
325 } else { 442 } else {
326 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
327 444
328 $job->() 445 $job->()
347 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
348 465
349 $coro 466 $coro
350} 467}
351 468
352sub write_runtime { 469=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 470
355 my $runtime = cf::localdir . "/runtime"; 471Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
356 475
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 476=cut
358 or return;
359 477
360 my $value = $cf::RUNTIME + 90 + 10; 478sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 479 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 480
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 481 # we seemingly have to make a local copy of the whole thing,
365 and return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
366 484
367 # always fsync - this file is important 485 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 486 reset_signals;
369 and return; 487 &$cb
488 }, @args;
370 489
371 close $fh 490 wantarray ? @res : $res[-1]
372 or return; 491}
373 492
374 aio_rename "$runtime~", $runtime 493=item $value = cf::db_get $family => $key
375 and return;
376 494
495Returns a single value from the environment database.
496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
377 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
378} 607}
379 608
380=item cf::datalog type => key => value, ... 609=item cf::datalog type => key => value, ...
381 610
382Log a datalog packet of the given type with the given key-value pairs. 611Log a datalog packet of the given type with the given key-value pairs.
400attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
402 631
403In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
404C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 634Crossfire TRT).
406 635
407=over 4 636=over 4
408 637
409=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
410 639
573 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
574 803
575 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 808
580 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 810 my $pkg = shift @arg;
582 811
583 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
613 } 842 }
614 843
615 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
616 } else { 845 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 847 }
619 848
620 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
621} 850}
622 851
624 if (ref $_[0]) { 853 if (ref $_[0]) {
625 _object_attach @_; 854 _object_attach @_;
626 } else { 855 } else {
627 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
628 } 857 }
858 _recalc_want;
629}; 859};
630 860
631# all those should be optimised 861# all those should be optimised
632sub cf::attachable::detach { 862sub cf::attachable::detach {
633 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
637 reattach ($obj); 867 reattach ($obj);
638 } else { 868 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
640 } 870 }
871 _recalc_want;
641}; 872};
642 873
643sub cf::attachable::attached { 874sub cf::attachable::attached {
644 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
645 876
660 "; 891 ";
661 die if $@; 892 die if $@;
662} 893}
663 894
664our $override; 895our $override;
665our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666 897
667sub override { 898sub override {
668 $override = 1; 899 $override = 1;
669 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
670} 901}
671 902
672sub do_invoke { 903sub do_invoke {
673 my $event = shift; 904 my $event = shift;
674 my $callbacks = shift; 905 my $callbacks = shift;
675 906
676 @invoke_results = (); 907 @INVOKE_RESULTS = ();
677 908
678 local $override; 909 local $override;
679 910
680 for (@$callbacks) { 911 for (@$callbacks) {
681 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
698 929
699Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
700 931
701This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
702removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
703results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 935
705=back 936=back
706 937
707=cut 938=cut
708 939
709############################################################################# 940#############################################################################
710# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
711 953
712sub reattach { 954sub reattach {
713 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 956 my ($obj) = @_;
715 957
818 or return; 1060 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
820 } 1062 }
821 1063
822 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 1066 return ($data, $av);
825} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
826 1074
827############################################################################# 1075#############################################################################
828# command handling &c 1076# command handling &c
829 1077
830=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1092}
845 1093
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1095
848Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
849 1101
850If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
851called. 1103called.
852 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
853=cut 1116=cut
854 1117
855sub register_extcmd { 1118sub register_extcmd {
856 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
857 1120
858 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
859} 1128}
860 1129
861cf::player->attach ( 1130cf::player->attach (
862 on_command => sub { 1131 on_command => sub {
863 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
872 cf::override; 1141 cf::override;
873 }, 1142 },
874 on_extcmd => sub { 1143 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
876 1145
877 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1147
879 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
882 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
883 } 1158 if $reply;
884 } 1159 }
885 } else { 1160 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1162 }
888 1163
889 cf::override; 1164 cf::override;
890 }, 1165 },
891); 1166);
892 1167
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
928 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1173 next unless -r $path;
930 eval { 1174
931 load_extension $ext; 1175 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1176 my $base = $1;
1177 my $pkg = $1;
1178 $pkg =~ s/[^[:word:]]/_/g;
1179 $pkg = "ext::$pkg";
1180
1181 open my $fh, "<:utf8", $path
1182 or die "$path: $!";
1183
1184 my $source = do { local $/; <$fh> };
1185
1186 my %ext = (
1187 path => $path,
1188 base => $base,
1189 pkg => $pkg,
1190 );
1191
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194
1195 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n"
1198 . $source
1199 . "\n};\n1";
1200
1201 $todo{$base} = \%ext;
1202 }
1203
1204 my %done;
1205 while (%todo) {
1206 my $progress;
1207
1208 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip
1211 unless exists $done{$_};
1212 }
1213
1214 warn "... loading '$k' into '$v->{pkg}'\n";
1215
1216 unless (eval $v->{source}) {
1217 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n";
1219
1220 if (exists $v->{meta}{mandatory}) {
1221 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n";
1223 exit 1;
1224 }
1225
1226 warn $msg;
1227 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
932 1 1232 }
933 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
934 } 1238 };
935} 1239}
936 1240
937############################################################################# 1241#############################################################################
938 1242
1243=back
1244
939=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
940 1246
941Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
942 1248
943=cut 1249=cut
955Returns the given player object, loading it if necessary (might block). 1261Returns the given player object, loading it if necessary (might block).
956 1262
957=cut 1263=cut
958 1264
959sub playerdir($) { 1265sub playerdir($) {
960 cf::localdir 1266 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1267 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1268}
966 1269
967sub path($) { 1270sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1271 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1032 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1033 1336
1034 $self 1337 $self
1035} 1338}
1036 1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1348}
1349
1037=item $pl->quit_character 1350=item $pl->quit_character
1038 1351
1039Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1040be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1041 1354
1088while and may block, so not sync_job-capable, ever. 1401while and may block, so not sync_job-capable, ever.
1089 1402
1090=cut 1403=cut
1091 1404
1092sub list_logins { 1405sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1406 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1407 or return [];
1095 1408
1096 my @logins; 1409 my @logins;
1097 1410
1098 for my $login (@$dirs) { 1411 for my $login (@$dirs) {
1133 } 1446 }
1134 1447
1135 \@paths 1448 \@paths
1136} 1449}
1137 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1138=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1139 1502
1140Sends an ext reply to the player. 1503Sends an ext reply to the player.
1141 1504
1142=cut 1505=cut
1143 1506
1144sub ext_reply($$%) { 1507sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1146 1509
1147 $msg{msgid} = $id; 1510 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1511}
1151 1512
1152=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1153 1514
1154Sends an ext event to the client. 1515Sends an ext event to the client.
1155 1516
1156=cut 1517=cut
1157 1518
1158sub ext_event($$%) { 1519sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1160 1521
1161 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1162} 1523}
1163 1524
1164package cf; 1525=head3 cf::region
1526
1527=over 4
1528
1529=cut
1530
1531package cf::region;
1532
1533=item cf::region::find_by_path $path
1534
1535Tries to decuce the likely region for a map knowing only its path.
1536
1537=cut
1538
1539sub find_by_path($) {
1540 my ($path) = @_;
1541
1542 my ($match, $specificity);
1543
1544 for my $region (list) {
1545 if ($region->{match} && $path =~ $region->{match}) {
1546 ($match, $specificity) = ($region, $region->specificity)
1547 if $region->specificity > $specificity;
1548 }
1549 }
1550
1551 $match
1552}
1165 1553
1166=back 1554=back
1167
1168 1555
1169=head3 cf::map 1556=head3 cf::map
1170 1557
1171=over 4 1558=over 4
1172 1559
1227 my ($self, $merge) = @_; 1614 my ($self, $merge) = @_;
1228 1615
1229 # we have to keep some variables in memory intact 1616 # we have to keep some variables in memory intact
1230 local $self->{path}; 1617 local $self->{path};
1231 local $self->{load_path}; 1618 local $self->{load_path};
1232 local $self->{deny_save};
1233 local $self->{deny_reset};
1234 1619
1235 $self->SUPER::thawer_merge ($merge); 1620 $self->SUPER::thawer_merge ($merge);
1236} 1621}
1237 1622
1238sub normalise { 1623sub normalise {
1285 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1286 return $self; 1671 return $self;
1287 } 1672 }
1288 } 1673 }
1289 1674
1290 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1291 () 1676 ()
1292} 1677}
1293 1678
1294sub init { 1679sub init {
1295 my ($self) = @_; 1680 my ($self) = @_;
1310 1695
1311# the original (read-only) location 1696# the original (read-only) location
1312sub load_path { 1697sub load_path {
1313 my ($self) = @_; 1698 my ($self) = @_;
1314 1699
1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1700 "$MAPDIR/$self->{path}.map"
1316} 1701}
1317 1702
1318# the temporary/swap location 1703# the temporary/swap location
1319sub save_path { 1704sub save_path {
1320 my ($self) = @_; 1705 my ($self) = @_;
1321 1706
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1708 "$TMPDIR/$path.map"
1324} 1709}
1325 1710
1326# the unique path, undef == no special unique path 1711# the unique path, undef == no special unique path
1327sub uniq_path { 1712sub uniq_path {
1328 my ($self) = @_; 1713 my ($self) = @_;
1329 1714
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1716 "$UNIQUEDIR/$path"
1332} 1717}
1333 1718
1334# and all this just because we cannot iterate over 1719# and all this just because we cannot iterate over
1335# all maps in C++... 1720# all maps in C++...
1336sub change_all_map_light { 1721sub change_all_map_light {
1337 my ($change) = @_; 1722 my ($change) = @_;
1338 1723
1339 $_->change_map_light ($change) 1724 $_->change_map_light ($change)
1340 for grep $_->outdoor, values %cf::MAP; 1725 for grep $_->outdoor, values %cf::MAP;
1726}
1727
1728sub decay_objects {
1729 my ($self) = @_;
1730
1731 return if $self->{deny_reset};
1732
1733 $self->do_decay_objects;
1341} 1734}
1342 1735
1343sub unlink_save { 1736sub unlink_save {
1344 my ($self) = @_; 1737 my ($self) = @_;
1345 1738
1403 $self->load_header_orig 1796 $self->load_header_orig
1404 or return; 1797 or return;
1405 $self->prepare_orig; 1798 $self->prepare_orig;
1406 } 1799 }
1407 1800
1801 $self->{deny_reset} = 1
1802 if $self->no_reset;
1803
1804 $self->default_region (cf::region::find_by_path $self->{path})
1805 unless $self->default_region;
1806
1408 1 1807 1
1409} 1808}
1410 1809
1411sub find; 1810sub find;
1412sub find { 1811sub find {
1424 $map->{last_save} = $cf::RUNTIME; 1823 $map->{last_save} = $cf::RUNTIME;
1425 1824
1426 $map->load_header 1825 $map->load_header
1427 or return; 1826 or return;
1428 1827
1429 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1430 # doing this can freeze the server in a sync job, obviously 1829 # doing this can freeze the server in a sync job, obviously
1431 #$cf::WAIT_FOR_TICK->wait; 1830 #$cf::WAIT_FOR_TICK->wait;
1432 $map->reset; 1831 $map->reset;
1433 undef $guard; 1832 undef $guard;
1434 return find $path; 1833 return find $path;
1445 my ($self) = @_; 1844 my ($self) = @_;
1446 1845
1447 local $self->{deny_reset} = 1; # loading can take a long time 1846 local $self->{deny_reset} = 1; # loading can take a long time
1448 1847
1449 my $path = $self->{path}; 1848 my $path = $self->{path};
1849
1850 {
1450 my $guard = cf::lock_acquire "map_load:$path"; 1851 my $guard = cf::lock_acquire "map_load:$path";
1451 1852
1452 return if $self->in_memory != cf::MAP_SWAPPED; 1853 return if $self->in_memory != cf::MAP_SWAPPED;
1453 1854
1454 $self->in_memory (cf::MAP_LOADING); 1855 $self->in_memory (cf::MAP_LOADING);
1455 1856
1456 $self->alloc; 1857 $self->alloc;
1457 1858
1458 $self->pre_load; 1859 $self->pre_load;
1459
1460 $self->_load_objects ($self->{load_path}, 1)
1461 or return;
1462
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464 if delete $self->{load_original};
1465
1466 if (my $uniq = $self->uniq_path) {
1467 utf8::encode $uniq;
1468 if (aio_open $uniq, O_RDONLY, 0) {
1469 $self->clear_unique_items;
1470 $self->_load_objects ($uniq, 0);
1471 }
1472 }
1473
1474 Coro::cede;
1475
1476 # now do the right thing for maps
1477 $self->link_multipart_objects;
1478
1479 unless ($self->{deny_activate}) {
1480 $self->decay_objects;
1481 $self->fix_auto_apply;
1482 $self->update_buttons;
1483 Coro::cede; 1860 Coro::cede;
1484 $self->set_darkness_map; 1861
1862 $self->_load_objects ($self->{load_path}, 1)
1863 or return;
1864
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original};
1867
1868 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) {
1871 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0);
1873 }
1874 }
1875
1876 Coro::cede;
1877 # now do the right thing for maps
1878 $self->link_multipart_objects;
1485 $self->difficulty ($self->estimate_difficulty) 1879 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1880 unless $self->difficulty;
1487 Coro::cede; 1881 Coro::cede;
1882
1883 unless ($self->{deny_activate}) {
1884 $self->decay_objects;
1885 $self->fix_auto_apply;
1886 $self->update_buttons;
1887 Coro::cede;
1888 $self->set_darkness_map;
1889 Coro::cede;
1488 $self->activate; 1890 $self->activate;
1891 }
1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1896 $self->in_memory (cf::MAP_IN_MEMORY);
1489 } 1897 }
1490 1898
1491 $self->post_load; 1899 $self->post_load;
1492
1493 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1900}
1495 1901
1496sub customise_for { 1902sub customise_for {
1497 my ($self, $ob) = @_; 1903 my ($self, $ob) = @_;
1498 1904
1499 return find "~" . $ob->name . "/" . $self->{path} 1905 return find "~" . $ob->name . "/" . $self->{path}
1500 if $self->per_player; 1906 if $self->per_player;
1501 1907
1908# return find "?party/" . $ob->name . "/" . $self->{path}
1909# if $self->per_party;
1910
1502 $self 1911 $self
1503} 1912}
1504 1913
1505# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1506sub load_diag { 1915sub load_neighbours {
1507 my ($map) = @_; 1916 my ($map) = @_;
1508 1917
1509 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1510 1919
1511 for (0 .. 3) { 1920 for (0 .. 3) {
1512 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1513 or next; 1922 or next;
1514 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1515 or next; 1924 or next;
1516 $neigh->load; 1925 $neigh->load;
1517 1926
1927 push @neigh,
1518 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1519 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1520 } 1930 }
1521 1931
1522 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1523 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1524 or next; 1935 or next;
1525 $neigh->load; 1936 $neigh->load;
1526 } 1937 }
1527} 1938}
1528 1939
1552 1963
1553 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1554 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1555 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1556 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1557 my $map = find $path 1968 if (my $map = find $path) {
1558 or next;
1559 $map->load; 1969 $map->load;
1970 }
1560 1971
1561 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1562 } 1973 }
1563 } 1974 }
1564 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
1616 2027
1617sub reset_at { 2028sub reset_at {
1618 my ($self) = @_; 2029 my ($self) = @_;
1619 2030
1620 # TODO: safety, remove and allow resettable per-player maps 2031 # TODO: safety, remove and allow resettable per-player maps
1621 return 1e99 if $self->isa ("ext::map_per_player");#d#
1622 return 1e99 if $self->{deny_reset}; 2032 return 1e99 if $self->{deny_reset};
1623 2033
1624 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2034 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1625 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2035 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1626 2036
1637 my ($self) = @_; 2047 my ($self) = @_;
1638 2048
1639 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2049 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 2050
1641 return if $self->players; 2051 return if $self->players;
1642 return if $self->isa ("ext::map_per_player");#d#
1643 2052
1644 warn "resetting map ", $self->path;#d# 2053 warn "resetting map ", $self->path;
1645 2054
1646 $self->in_memory (cf::MAP_SWAPPED); 2055 $self->in_memory (cf::MAP_SWAPPED);
1647 2056
1648 # need to save uniques path 2057 # need to save uniques path
1649 unless ($self->{deny_save}) { 2058 unless ($self->{deny_save}) {
1681 $cf::MAP{$self->path} = $self; 2090 $cf::MAP{$self->path} = $self;
1682 2091
1683 $self->reset; # polite request, might not happen 2092 $self->reset; # polite request, might not happen
1684} 2093}
1685 2094
2095=item $maps = cf::map::tmp_maps
2096
2097Returns an arrayref with all map paths of currently instantiated and saved
2098maps. May block.
2099
2100=cut
2101
2102sub tmp_maps() {
2103 [
2104 map {
2105 utf8::decode $_;
2106 /\.map$/
2107 ? normalise $_
2108 : ()
2109 } @{ aio_readdir $TMPDIR or [] }
2110 ]
2111}
2112
2113=item $maps = cf::map::random_maps
2114
2115Returns an arrayref with all map paths of currently instantiated and saved
2116random maps. May block.
2117
2118=cut
2119
2120sub random_maps() {
2121 [
2122 map {
2123 utf8::decode $_;
2124 /\.map$/
2125 ? normalise "?random/$_"
2126 : ()
2127 } @{ aio_readdir $RANDOMDIR or [] }
2128 ]
2129}
2130
1686=item cf::map::unique_maps 2131=item cf::map::unique_maps
1687 2132
1688Returns an arrayref of paths of all shared maps that have 2133Returns an arrayref of paths of all shared maps that have
1689instantiated unique items. May block. 2134instantiated unique items. May block.
1690 2135
1691=cut 2136=cut
1692 2137
1693sub unique_maps() { 2138sub unique_maps() {
1694 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2139 [
1695 or return; 2140 map {
1696
1697 my @paths;
1698
1699 for (@$files) {
1700 utf8::decode $_; 2141 utf8::decode $_;
1701 next if /\.pst$/; 2142 /\.map$/
1702 next unless /^$PATH_SEP/o; 2143 ? normalise $_
1703 2144 : ()
1704 push @paths, cf::map::normalise $_; 2145 } @{ aio_readdir $UNIQUEDIR or [] }
1705 } 2146 ]
1706
1707 \@paths
1708} 2147}
1709 2148
1710package cf; 2149package cf;
1711 2150
1712=back 2151=back
1758 2197
1759 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2198 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1760 2199
1761 if ($self->{record_replies}) { 2200 if ($self->{record_replies}) {
1762 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2201 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2202
1763 } else { 2203 } else {
2204 my $pl = $self->contr;
2205
2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2207 my $dialog = $pl->{npc_dialog};
2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2209
2210 } else {
1764 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
1765 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2213 }
1766 } 2214 }
2215}
2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
1767} 2225}
1768 2226
1769=item $player_object->may ("access") 2227=item $player_object->may ("access")
1770 2228
1771Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
1818 $self->deactivate_recursive; 2276 $self->deactivate_recursive;
1819 2277
1820 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2278 return if UNIVERSAL::isa $self->map, "ext::map_link";
1821 2279
1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2280 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1823 if $self->map; 2281 if $self->map && $self->map->{path} ne "{link}";
1824 2282
1825 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2283 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1826} 2284}
1827 2285
1828sub cf::object::player::leave_link { 2286sub cf::object::player::leave_link {
1829 my ($self, $map, $x, $y) = @_; 2287 my ($self, $map, $x, $y) = @_;
2288
2289 return unless $self->contr->active;
1830 2290
1831 my $link_pos = delete $self->{_link_pos}; 2291 my $link_pos = delete $self->{_link_pos};
1832 2292
1833 unless ($map) { 2293 unless ($map) {
1834 # restore original map position 2294 # restore original map position
1848 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
1849 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
1850 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
1851 2311
1852 $map->load; 2312 $map->load;
1853 $map->load_diag; 2313 $map->load_neighbours;
1854 2314
1855 return unless $self->contr->active; 2315 return unless $self->contr->active;
1856 $self->activate_recursive; 2316 $self->activate_recursive;
1857 2317
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1859 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
1860} 2320}
1861 2321
1862cf::player->attach ( 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1863 on_logout => sub {
1864 my ($pl) = @_;
1865 2323
1866 # abort map switching before logout 2324Moves the player to the given map-path and coordinates by first freezing
1867 if ($pl->ob->{_link_pos}) { 2325her, loading and preparing them map, calling the provided $check callback
1868 cf::sync_job { 2326that has to return the map if sucecssful, and then unfreezes the player on
1869 $pl->ob->leave_link 2327the new (success) or old (failed) map position. In either case, $done will
1870 }; 2328be called at the end of this process.
1871 }
1872 },
1873 on_login => sub {
1874 my ($pl) = @_;
1875 2329
1876 # try to abort aborted map switching on player login :)
1877 # should happen only on crashes
1878 if ($pl->ob->{_link_pos}) {
1879 $pl->ob->enter_link;
1880 (async {
1881 $pl->ob->reply (undef,
1882 "There was an internal problem at your last logout, "
1883 . "the server will try to bring you to your intended destination in a second.",
1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1887 Coro::Timer::sleep 1;
1888 $pl->ob->leave_link;
1889 })->prio (2);
1890 }
1891 },
1892);
1893
1894=item $player_object->goto ($path, $x, $y)
1895
1896=cut 2330=cut
2331
2332our $GOTOGEN;
1897 2333
1898sub cf::object::player::goto { 2334sub cf::object::player::goto {
1899 my ($self, $path, $x, $y) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2336
2337 # do generation counting so two concurrent goto's will be executed in-order
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1900 2339
1901 $self->enter_link; 2340 $self->enter_link;
1902 2341
1903 (async { 2342 (async {
1904 my $map = eval { 2343 my $map = eval {
1905 my $map = cf::map::find $path; 2344 my $map = cf::map::find $path;
2345
2346 if ($map) {
1906 $map = $map->customise_for ($self) if $map; 2347 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map;
2349 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2351 }
2352
1907 $map 2353 $map
2354 };
2355
2356 if ($@) {
2357 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2358 LOG llevError | logBacktrace, Carp::longmess $@;
1908 } or 2359 }
1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1910 2360
2361 if ($gen == $self->{_goto_generation}) {
2362 delete $self->{_goto_generation};
1911 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2364 }
2365
2366 $done->() if $done;
1912 })->prio (1); 2367 })->prio (1);
1913} 2368}
1914 2369
1915=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
1916 2371
1955 2410
1956 $rmp->{random_seed} ||= $exit->random_seed; 2411 $rmp->{random_seed} ||= $exit->random_seed;
1957 2412
1958 my $data = cf::to_json $rmp; 2413 my $data = cf::to_json $rmp;
1959 my $md5 = Digest::MD5::md5_hex $data; 2414 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2415 my $meta = "$RANDOMDIR/$md5.meta";
1961 2416
1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1963 aio_write $fh, 0, (length $data), $data, 0; 2418 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh; 2419 undef $fh;
1965 aio_rename "$meta~", $meta; 2420 aio_rename "$meta~", $meta;
1984 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2439 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1985 my $hp = $exit->stats->hp; 2440 my $hp = $exit->stats->hp;
1986 my $sp = $exit->stats->sp; 2441 my $sp = $exit->stats->sp;
1987 2442
1988 $self->enter_link; 2443 $self->enter_link;
2444
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
1989 2448
1990 (async { 2449 (async {
1991 $self->deactivate_recursive; # just to be sure 2450 $self->deactivate_recursive; # just to be sure
1992 unless (eval { 2451 unless (eval {
1993 $self->goto ($slaying, $hp, $sp); 2452 $self->goto ($slaying, $hp, $sp);
2021 2480
2022 utf8::encode $text; 2481 utf8::encode $text;
2023 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2482 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2024} 2483}
2025 2484
2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2486
2487Send a drawinfo or msg packet to the client, formatting the msg for the
2488client if neccessary. C<$type> should be a string identifying the type of
2489the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet.
2491
2492=cut
2493
2494sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_;
2496
2497 $msg = $self->pl->expand_cfpod ($msg);
2498
2499 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500
2501 if (ref $channel) {
2502 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel);
2506 }
2507
2508 $channel = $channel->{id};
2509 }
2510
2511 return unless @extra || length $msg;
2512
2513 if ($self->can_msg) {
2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2520 } else {
2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 $color &= cf::NDI_COLOR_MASK;
2533
2534 utf8::encode $msg;
2535
2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2539 } else {
2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2541 $self->send_packet ("drawinfo $color $msg")
2542 }
2543 }
2544 }
2545}
2546
2026=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2027 2548
2028Sends an exti event to the client. 2549Sends an ext event to the client.
2029 2550
2030=cut 2551=cut
2031 2552
2032sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2033 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2034 2555
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove
2035 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2036 $self->send_packet ("ext " . cf::to_json \%msg); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2037} 2582}
2038 2583
2039=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2040 2585
2041Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2042the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2043C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2044 2589
2045Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2046reliable at some point in the future. 2591become reliable at some point in the future.
2047 2592
2048=cut 2593=cut
2049 2594
2050sub cf::client::query { 2595sub cf::client::query {
2051 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2059 utf8::encode $text; 2604 utf8::encode $text;
2060 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2061 2606
2062 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2063 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2064} 2611}
2065 2612
2066cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2067 on_reply => sub { 2619 on_reply => sub {
2068 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2069 2621
2070 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2071 # get handled first 2623 # get handled first
2083 } else { 2635 } else {
2084 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2085 } 2637 }
2086 } 2638 }
2087 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2088); 2663);
2089 2664
2090=item $client->async (\&cb) 2665=item $client->async (\&cb)
2091 2666
2092Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2133our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2134our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2135 2710
2136$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2137 2712
2138$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2139 2718
2140# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2141 2720
2142=pod 2721=pod
2143 2722
2144The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2145 2724
2146 cf::object contr pay_amount pay_player map 2725 cf::object
2726 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race
2728
2147 cf::object::player player 2729 cf::object::player
2148 cf::player peaceful 2730 player
2149 cf::map trigger 2731
2732 cf::player
2733 peaceful
2734
2735 cf::map
2736 trigger
2150 2737
2151=cut 2738=cut
2152 2739
2153for ( 2740for (
2154 ["cf::object" => qw(contr pay_amount pay_player map)], 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)],
2155 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2156 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2157 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2158) { 2746) {
2159 no strict 'refs'; 2747 no strict 'refs';
2230=back 2818=back
2231 2819
2232=cut 2820=cut
2233 2821
2234############################################################################# 2822#############################################################################
2235
2236=head2 EXTENSION DATABASE SUPPORT
2237
2238Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which
2240excludes objects.
2241
2242The parameter C<$family> should best start with the name of the extension
2243using it, it should be unique.
2244
2245=over 4
2246
2247=item $value = cf::db_get $family => $key
2248
2249Returns a single value from the database.
2250
2251=item cf::db_put $family => $key => $value
2252
2253Stores the given C<$value> in the family.
2254
2255=cut
2256
2257our $DB;
2258
2259sub db_init {
2260 unless ($DB) {
2261 $DB = BDB::db_create $DB_ENV;
2262
2263 cf::sync_job {
2264 eval {
2265 $DB->set_flags (BDB::CHKSUM);
2266
2267 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!;
2270 };
2271 cf::cleanup "db_open(db): $@" if $@;
2272 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 }
2288}
2289
2290sub db_get($$) {
2291 my $key = "$_[0]/$_[1]";
2292
2293 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data;
2295
2296 $! ? ()
2297 : Compress::LZF::sthaw $data
2298 }
2299}
2300
2301sub db_put($$$) {
2302 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2304}
2305
2306#############################################################################
2307# the server's init and main functions 2823# the server's init and main functions
2308 2824
2309sub load_facedata { 2825sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2826 my ($path) = @_;
2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2311 2829
2312 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2313 2831
2314 my $facedata; 2832 my $facedata;
2315 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2318 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2319 2837
2320 $facedata->{version} == 2 2838 $facedata->{version} == 2
2321 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2322 2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2847
2323 { 2848 {
2324 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2325 2850
2326 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2327 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2331 Coro::cede; 2857
2858 cf::cede_to_tick;
2332 } 2859 }
2333 2860
2334 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2335 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2336 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2337 or next; 2864 or next;
2338 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth;
2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2340 } else { 2868 } else {
2341 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2342 } 2870 }
2343 Coro::cede; 2871
2872 cf::cede_to_tick;
2344 } 2873 }
2345 } 2874 }
2346 2875
2347 { 2876 {
2348 my $anims = $facedata->{animinfo}; 2877 my $anims = $facedata->{animinfo};
2349 2878
2350 while (my ($anim, $info) = each %$anims) { 2879 while (my ($anim, $info) = each %$anims) {
2351 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2352 Coro::cede; 2881 cf::cede_to_tick;
2353 } 2882 }
2354 2883
2355 cf::anim::invalidate_all; # d'oh 2884 cf::anim::invalidate_all; # d'oh
2356 } 2885 }
2357 2886
2887 {
2888 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource};
2891
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2897
2898 if ($info->{type} & 1) {
2899 # prepend meta info
2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2907 }
2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick;
2913 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 }
2933
2358 1 2934 1
2359} 2935}
2360 2936
2937register_exticmd fx_want => sub {
2938 my ($ns, $want) = @_;
2939
2940 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v);
2942 }
2943};
2944
2945sub reload_regions {
2946 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n";
2948
2949 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/
2951 if exists $_->{match};
2952 }
2953}
2954
2955sub reload_facedata {
2956 load_facedata "$DATADIR/facedata"
2957 or die "unable to load facedata\n";
2958}
2959
2960sub reload_archetypes {
2961 load_resource_file "$DATADIR/archetypes"
2962 or die "unable to load archetypes\n";
2963 #d# NEED to laod twice to resolve forward references
2964 # this really needs to be done in an extra post-pass
2965 # (which needs to be synchronous, so solve it differently)
2966 load_resource_file "$DATADIR/archetypes"
2967 or die "unable to load archetypes\n";
2968}
2969
2970sub reload_treasures {
2971 load_resource_file "$DATADIR/treasures"
2972 or die "unable to load treasurelists\n";
2973}
2974
2361sub reload_resources { 2975sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2976 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2977
2978 reload_regions;
2364 load_facedata 2979 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2980 #reload_archetypes;#d#
2981 reload_archetypes;
2982 reload_treasures;
2983
2984 warn "finished reloading resource files\n";
2366} 2985}
2367 2986
2368sub init { 2987sub init {
2369 reload_resources; 2988 reload_resources;
2370} 2989}
2371 2990
2372sub cfg_load { 2991sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2992 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2993 or return;
2375 2994
2376 local $/; 2995 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2996 *CFG = YAML::Syck::Load <$fh>;
2378 2997
2423 }, 3042 },
2424 ); 3043 );
2425 } 3044 }
2426} 3045}
2427 3046
3047sub write_runtime {
3048 my $runtime = "$LOCALDIR/runtime";
3049
3050 # first touch the runtime file to show we are still running:
3051 # the fsync below can take a very very long time.
3052
3053 IO::AIO::aio_utime $runtime, undef, undef;
3054
3055 my $guard = cf::lock_acquire "write_runtime";
3056
3057 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3058 or return;
3059
3060 my $value = $cf::RUNTIME + 90 + 10;
3061 # 10 is the runtime save interval, for a monotonic clock
3062 # 60 allows for the watchdog to kill the server.
3063
3064 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3065 and return;
3066
3067 # always fsync - this file is important
3068 aio_fsync $fh
3069 and return;
3070
3071 # touch it again to show we are up-to-date
3072 aio_utime $fh, undef, undef;
3073
3074 close $fh
3075 or return;
3076
3077 aio_rename "$runtime~", $runtime
3078 and return;
3079
3080 warn "runtime file written.\n";
3081
3082 1
3083}
3084
2428sub emergency_save() { 3085sub emergency_save() {
2429 my $freeze_guard = cf::freeze_mainloop; 3086 my $freeze_guard = cf::freeze_mainloop;
2430 3087
2431 warn "enter emergency perl save\n"; 3088 warn "enter emergency perl save\n";
2432 3089
2463 3120
2464 warn Carp::longmess "post_cleanup backtrace" 3121 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 3122 if $make_core;
2466} 3123}
2467 3124
2468sub reload() { 3125sub do_reload_perl() {
2469 # can/must only be called in main 3126 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 3127 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 3128 warn "can only reload from main coroutine";
2472 return; 3129 return;
2473 } 3130 }
2507 %EXT_CORO = (); 3164 %EXT_CORO = ();
2508 3165
2509 warn "removing commands"; 3166 warn "removing commands";
2510 %COMMAND = (); 3167 %COMMAND = ();
2511 3168
2512 warn "removing ext commands"; 3169 warn "removing ext/exti commands";
2513 %EXTCMD = (); 3170 %EXTCMD = ();
3171 %EXTICMD = ();
2514 3172
2515 warn "unloading/nuking all extensions"; 3173 warn "unloading/nuking all extensions";
2516 for my $pkg (@EXTS) { 3174 for my $pkg (@EXTS) {
2517 warn "... unloading $pkg"; 3175 warn "... unloading $pkg";
2518 3176
2548 Symbol::delete_package "safe::$_" 3206 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3207 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 3208
2551 warn "unloading cf.pm \"a bit\""; 3209 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 3210 delete $INC{"cf.pm"};
3211 delete $INC{"cf/pod.pm"};
2553 3212
2554 # don't, removes xs symbols, too, 3213 # don't, removes xs symbols, too,
2555 # and global variables created in xs 3214 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 3215 #Symbol::delete_package __PACKAGE__;
2557 3216
2572 warn "reattaching attachments to maps"; 3231 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 3232 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 3233 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 3234 reattach $_ for values %PLAYER;
2576 3235
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 3236 warn "leaving sync_job";
2581 3237
2582 1 3238 1
2583 } or do { 3239 } or do {
2584 warn $@; 3240 warn $@;
2589 warn "reloaded"; 3245 warn "reloaded";
2590}; 3246};
2591 3247
2592our $RELOAD_WATCHER; # used only during reload 3248our $RELOAD_WATCHER; # used only during reload
2593 3249
3250sub reload_perl() {
3251 # doing reload synchronously and two reloads happen back-to-back,
3252 # coro crashes during coro_state_free->destroy here.
3253
3254 $RELOAD_WATCHER ||= Event->timer (
3255 reentrant => 0,
3256 after => 0,
3257 data => WF_AUTOCANCEL,
3258 cb => sub {
3259 do_reload_perl;
3260 undef $RELOAD_WATCHER;
3261 },
3262 );
3263}
3264
2594register_command "reload" => sub { 3265register_command "reload" => sub {
2595 my ($who, $arg) = @_; 3266 my ($who, $arg) = @_;
2596 3267
2597 if ($who->flag (FLAG_WIZ)) { 3268 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 3269 $who->message ("reloading server.");
2599 3270 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 3271 }
2613}; 3272};
2614 3273
2615unshift @INC, $LIBDIR; 3274unshift @INC, $LIBDIR;
2616 3275
2617my $bug_warning = 0; 3276my $bug_warning = 0;
2618 3277
3278our @WAIT_FOR_TICK;
3279our @WAIT_FOR_TICK_BEGIN;
3280
3281sub wait_for_tick {
3282 return unless $TICK_WATCHER->is_active;
3283 return if $Coro::current == $Coro::main;
3284
3285 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK, $signal;
3287 $signal->wait;
3288}
3289
3290sub wait_for_tick_begin {
3291 return unless $TICK_WATCHER->is_active;
3292 return if $Coro::current == $Coro::main;
3293
3294 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait;
3297}
3298
3299 my $min = 1e6;#d#
3300 my $avg = 10;
2619$TICK_WATCHER = Event->timer ( 3301$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 3302 reentrant => 0,
2621 parked => 1, 3303 parked => 1,
2622 prio => 0, 3304 prio => 0,
2623 at => $NEXT_TICK || $TICK, 3305 at => $NEXT_TICK || $TICK,
2627 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3309 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628 unless ++$bug_warning > 10; 3310 unless ++$bug_warning > 10;
2629 return; 3311 return;
2630 } 3312 }
2631 3313
2632 $NOW = Event::time; 3314 $NOW = $tick_start = Event::time;
2633 3315
2634 cf::server_tick; # one server iteration 3316 cf::server_tick; # one server iteration
3317
3318 0 && sync_job {#d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 };
3340
2635 $RUNTIME += $TICK; 3341 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 3342 $NEXT_TICK += $TICK;
2637 3343
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3344 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 3345 $NEXT_RUNTIME_WRITE = $NOW + 10;
2641 write_runtime 3347 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 3348 or warn "ERROR: unable to write runtime file: $!";
2643 }; 3349 };
2644 } 3350 }
2645 3351
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 3352# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 3353# warn $AFTER - $NOW;#d#
2651 3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send;
3357 }
3358 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send;
3360 }
3361
3362 $NOW = Event::time;
3363
2652 # if we are delayed by four ticks or more, skip them all 3364 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3365 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654 3366
2655 $TICK_WATCHER->at ($NEXT_TICK); 3367 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 3368 $TICK_WATCHER->start;
3369
3370 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372
3373 _post_tick;
3374
3375
2657 }, 3376 },
2658); 3377);
2659 3378
2660{ 3379{
2661 BDB::max_poll_time $TICK * 0.1; 3380 BDB::max_poll_time $TICK * 0.1;
2689 3408
2690 cf::sync_job { 3409 cf::sync_job {
2691 eval { 3410 eval {
2692 BDB::db_env_open 3411 BDB::db_env_open
2693 $DB_ENV, 3412 $DB_ENV,
2694 $BDB_ENV_DIR, 3413 $BDBDIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 3416 0666;
2698 3417
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 3419
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect; 3421 $DB_ENV->set_lk_detect;
2703 }; 3422 };
2704 3423
2720 prio => 6, 3439 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 3440 cb => \&IO::AIO::poll_cb,
2722 ); 3441 );
2723} 3442}
2724 3443
3444my $_log_backtrace;
3445
3446sub _log_backtrace {
3447 my ($msg, @addr) = @_;
3448
3449 $msg =~ s/\n//;
3450
3451 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) {
3453 ++$_log_backtrace;
3454 async {
3455 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3459 or die "addr2line: $!";
3460
3461 my @funcs;
3462 my @res = <$fh>;
3463 chomp for @res;
3464 while (@res) {
3465 my ($func, $line) = splice @res, 0, 2, ();
3466 push @funcs, "[$func] $line";
3467 }
3468
3469 @funcs
3470 };
3471
3472 LOG llevInfo, "[ABT] $msg\n";
3473 LOG llevInfo, "[ABT] $_\n" for @bt;
3474 --$_log_backtrace;
3475 };
3476 } else {
3477 LOG llevInfo, "[ABT] $msg\n";
3478 LOG llevInfo, "[ABT] [suppressed]\n";
3479 }
3480}
3481
3482# load additional modules
3483use cf::pod;
3484
2725END { cf::emergency_save } 3485END { cf::emergency_save }
2726 3486
27271 34871
2728 3488

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines