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.251 by root, Wed Apr 18 14:45:13 2007 UTC vs.
Revision 1.381 by root, Mon Oct 8 18:19:39 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 4.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
59our $LIBDIR = datadir . "/ext"; 63
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";
60 75
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER; 77our $TICK_WATCHER;
63our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
65our $NEXT_TICK; 80our $NEXT_TICK;
66our $NOW; 81our $NOW;
67our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
68 83
69our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
70our $DB_ENV; 88our $DB_ENV;
71 89
72our %CFG; 90our %CFG;
73 91
74our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
75our $RUNTIME; 93our $RUNTIME;
76 94
77our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
78our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
79our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 98
83# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
105
86binmode STDOUT; 106binmode STDOUT;
87binmode STDERR; 107binmode STDERR;
88 108
89# read virtual server time, if available 109# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 110unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 111 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 112 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 113 $RUNTIME = <$fh> + 0.;
94} 114}
95 115
96mkdir cf::localdir; 116mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 118
103our $EMERGENCY_POSITION; 119our $EMERGENCY_POSITION;
104 120
105sub cf::map::normalise; 121sub cf::map::normalise;
106 122
117=item $cf::RUNTIME 133=item $cf::RUNTIME
118 134
119The time this server has run, starts at 0 and is increased by $cf::TICK on 135The time this server has run, starts at 0 and is increased by $cf::TICK on
120every server tick. 136every server tick.
121 137
122=item $cf::LIBDIR 138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123 141
124The perl library directory, where extensions and cf-specific modules can 142Various directories - "/etc", read-only install directory, perl-library
125be found. It will be added to C<@INC> automatically. 143directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and
145database environment.
126 146
127=item $cf::NOW 147=item $cf::NOW
128 148
129The time of the last (current) server tick. 149The time of the last (current) server tick.
130 150
131=item $cf::TICK 151=item $cf::TICK
132 152
133The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
134 164
135=item %cf::CFG 165=item %cf::CFG
136 166
137Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/crossfire/config>, or
138from wherever your confdir points to. 168from wherever your confdir points to.
141 171
142These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
143returns directly I<after> the tick processing (and consequently, can only wake one process 173returns directly I<after> the tick processing (and consequently, can only wake one process
144per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
145 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
181
146=back 182=back
147 183
148=cut 184=cut
149 185
150BEGIN { 186BEGIN {
152 my $msg = join "", @_; 188 my $msg = join "", @_;
153 189
154 $msg .= "\n" 190 $msg .= "\n"
155 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
156 192
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 194
159 utf8::encode $msg;
160 LOG llevError, $msg; 195 LOG llevError, $msg;
161 }; 196 };
162} 197}
163 198
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 206
171# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 208# within the Safe compartment.
173for my $pkg (qw( 209for my $pkg (qw(
174 cf::global cf::attachable 210 cf::global cf::attachable
182} 218}
183 219
184$Event::DIED = sub { 220$Event::DIED = sub {
185 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
186}; 222};
223
224#############################################################################
187 225
188=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
189 227
190=over 4 228=over 4
191 229
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 249 $d
212 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
213} 251}
214 252
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
218 254
219Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
220 256
221=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
222 258
223Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
260
261=cut
262
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264
265sub to_json ($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) }
224 267
225=item cf::lock_wait $string 268=item cf::lock_wait $string
226 269
227Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
228 271
231Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
232a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
233for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
234returned. 277returned.
235 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
236Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
238 284
285=item $locked = cf::lock_active $string
286
287Return true if the lock is currently active, i.e. somebody has locked it.
288
239=cut 289=cut
240 290
241our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
242 293
243sub lock_wait($) { 294sub lock_wait($) {
244 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
245 301
246 # wait for lock, if any 302 # wait for lock, if any
247 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
248 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
249 Coro::schedule; 305 Coro::schedule;
255 311
256 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
257 lock_wait $key; 313 lock_wait $key;
258 314
259 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
260 317
261 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
262 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
264 } 322 }
323}
324
325sub lock_active($) {
326 my ($key) = @_;
327
328 ! ! $LOCK{$key}
265} 329}
266 330
267sub freeze_mainloop { 331sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 332 return unless $TICK_WATCHER->is_active;
269 333
272 }; 336 };
273 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
274 $guard 338 $guard
275} 339}
276 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
277=item cf::async { BLOCK } 399=item cf::async { BLOCK }
278 400
279Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
280C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
281thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
284 406
285BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
286 408
287=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
288 410
289The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 412is 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. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
292 415
293If it must be done, put the blocking parts into C<sync_job>. This will run 416If 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 417the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
296fast or be very important. 419fast or be very important.
299 422
300sub sync_job(&) { 423sub sync_job(&) {
301 my ($job) = @_; 424 my ($job) = @_;
302 425
303 if ($Coro::current == $Coro::main) { 426 if ($Coro::current == $Coro::main) {
427 my $time = Event::time;
428
304 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
306 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
307 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 435 # (but this is cancel-safe)
309 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
310 437
311 my $busy = 1; 438 my $busy = 1;
312 my @res; 439 my @res;
313 440
314 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
315 @res = eval { $job->() }; 443 @res = eval { $job->() };
316 warn $@ if $@; 444 warn $@ if $@;
317 undef $busy; 445 undef $busy;
318 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
319 447
320 while ($busy) { 448 while ($busy) {
321 Coro::cede or Event::one_event; 449 Coro::cede or Event::one_event;
322 } 450 }
451
452 $time = Event::time - $time;
453
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load
323 458
324 wantarray ? @res : $res[0] 459 wantarray ? @res : $res[0]
325 } else { 460 } else {
326 # we are in another coroutine, how wonderful, everything just works 461 # we are in another coroutine, how wonderful, everything just works
327 462
347 $EXT_CORO{$coro+0} = $coro; 482 $EXT_CORO{$coro+0} = $coro;
348 483
349 $coro 484 $coro
350} 485}
351 486
352sub write_runtime { 487=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 488
355 my $runtime = cf::localdir . "/runtime"; 489Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling.
356 493
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 494=cut
358 or return;
359 495
360 my $value = $cf::RUNTIME + 90 + 10; 496sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 497 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 498
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 499 # we seemingly have to make a local copy of the whole thing,
365 and return; 500 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious)
366 502
367 # always fsync - this file is important 503 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 504 reset_signals;
369 and return; 505 &$cb
506 }, @args;
370 507
371 close $fh 508 wantarray ? @res : $res[-1]
372 or return; 509}
373 510
374 aio_rename "$runtime~", $runtime 511=item $value = cf::db_get $family => $key
375 and return;
376 512
513Returns a single value from the environment database.
514
515=item cf::db_put $family => $key => $value
516
517Stores the given C<$value> in the family. It can currently store binary
518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
543
544our $DB;
545
546sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db";
549 };
550}
551
552sub db_get($$) {
553 my $key = "$_[0]/$_[1]";
554
555 cf::sync_job {
556 BDB::db_get $DB, undef, $key, my $data;
557
558 $! ? ()
559 : $data
377 1 560 }
561}
562
563sub db_put($$$) {
564 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
566}
567
568=item cf::cache $id => [$paths...], $processversion => $process
569
570Generic caching function that returns the value of the resource $id,
571caching and regenerating as required.
572
573This function can block.
574
575=cut
576
577sub cache {
578 my ($id, $src, $processversion, $process) = @_;
579
580 my $meta =
581 join "\x00",
582 $processversion,
583 map {
584 aio_stat $_
585 and Carp::croak "$_: $!";
586
587 ($_, (stat _)[7,9])
588 } @$src;
589
590 my $dbmeta = db_get cache => "$id/meta";
591 if ($dbmeta ne $meta) {
592 # changed, we may need to process
593
594 my @data;
595 my $md5;
596
597 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_]
599 or Carp::croak "$src->[$_]: $!";
600 }
601
602 # if processing is expensive, check
603 # checksum first
604 if (1) {
605 $md5 =
606 join "\x00",
607 $processversion,
608 map {
609 cf::cede_to_tick;
610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
611 } 0.. $#$src;
612
613
614 my $dbmd5 = db_get cache => "$id/md5";
615 if ($dbmd5 eq $md5) {
616 db_put cache => "$id/meta", $meta;
617
618 return db_get cache => "$id/data";
619 }
620 }
621
622 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time;
625
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
627
628 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta;
631
632 return $data;
633 }
634
635 db_get cache => "$id/data"
378} 636}
379 637
380=item cf::datalog type => key => value, ... 638=item cf::datalog type => key => value, ...
381 639
382Log a datalog packet of the given type with the given key-value pairs. 640Log 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") 658attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 659to it. All such attachable objects support the following methods.
402 660
403In the following description, CLASS can be any of C<global>, C<object> 661In 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 662C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 663Crossfire TRT).
406 664
407=over 4 665=over 4
408 666
409=item $attachable->attach ($attachment, key => $value...) 667=item $attachable->attach ($attachment, key => $value...)
410 668
573 $registry = $CB_TYPE[$object_type] ||= []; 831 $registry = $CB_TYPE[$object_type] ||= [];
574 832
575 } elsif ($type eq "subtype") { 833 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 834 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 835 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 836 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 837
580 } elsif ($type eq "package") { 838 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 839 my $pkg = shift @arg;
582 840
583 while (my ($name, $id) = each %cb_id) { 841 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 870 _attach $registry, $klass, @attach;
613 } 871 }
614 872
615 $obj->{$name} = \%arg; 873 $obj->{$name} = \%arg;
616 } else { 874 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 875 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 876 }
619 877
620 $obj->{_attachment}{$name} = undef; 878 $obj->{_attachment}{$name} = undef;
621} 879}
622 880
624 if (ref $_[0]) { 882 if (ref $_[0]) {
625 _object_attach @_; 883 _object_attach @_;
626 } else { 884 } else {
627 _attach shift->_attach_registry, @_; 885 _attach shift->_attach_registry, @_;
628 } 886 }
887 _recalc_want;
629}; 888};
630 889
631# all those should be optimised 890# all those should be optimised
632sub cf::attachable::detach { 891sub cf::attachable::detach {
633 my ($obj, $name) = @_; 892 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 895 delete $obj->{_attachment}{$name};
637 reattach ($obj); 896 reattach ($obj);
638 } else { 897 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 898 Carp::croak "cannot, currently, detach class attachments";
640 } 899 }
900 _recalc_want;
641}; 901};
642 902
643sub cf::attachable::attached { 903sub cf::attachable::attached {
644 my ($obj, $name) = @_; 904 my ($obj, $name) = @_;
645 905
660 "; 920 ";
661 die if $@; 921 die if $@;
662} 922}
663 923
664our $override; 924our $override;
665our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 925our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666 926
667sub override { 927sub override {
668 $override = 1; 928 $override = 1;
669 @invoke_results = (); 929 @INVOKE_RESULTS = (@_);
670} 930}
671 931
672sub do_invoke { 932sub do_invoke {
673 my $event = shift; 933 my $event = shift;
674 my $callbacks = shift; 934 my $callbacks = shift;
675 935
676 @invoke_results = (); 936 @INVOKE_RESULTS = ();
677 937
678 local $override; 938 local $override;
679 939
680 for (@$callbacks) { 940 for (@$callbacks) {
681 eval { &{$_->[1]} }; 941 eval { &{$_->[1]} };
698 958
699Generate an object-specific event with the given arguments. 959Generate an object-specific event with the given arguments.
700 960
701This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 961This 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 962removed in future versions), and there is no public API to access override
703results (if you must, access C<@cf::invoke_results> directly). 963results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 964
705=back 965=back
706 966
707=cut 967=cut
708 968
709############################################################################# 969#############################################################################
710# object support 970# object support
971#
972
973sub _can_merge {
974 my ($ob1, $ob2) = @_;
975
976 local $Storable::canonical = 1;
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979
980 $fob1 eq $fob2
981}
711 982
712sub reattach { 983sub reattach {
713 # basically do the same as instantiate, without calling instantiate 984 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 985 my ($obj) = @_;
715 986
762sub object_freezer_save { 1033sub object_freezer_save {
763 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
764 1035
765 sync_job { 1036 sync_job {
766 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
767 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
768 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
769 1041
770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
771 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
772 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
773 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
774 close $fh; 1046 close $fh;
775 1047
776 if (@$objs) { 1048 if (@$objs) {
777 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
778 chmod SAVE_MODE, $fh; 1050 chmod SAVE_MODE, $fh;
779 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1051 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
780 aio_write $fh, 0, (length $data), $data, 0; 1052 aio_write $fh, 0, (length $data), $data, 0;
781 aio_fsync $fh if $cf::USE_FSYNC; 1053 aio_fsync $fh if $cf::USE_FSYNC;
782 close $fh; 1054 close $fh;
783 aio_rename "$filename.pst~", "$filename.pst"; 1055 aio_rename "$filename.pst~", "$filename.pst";
784 } 1056 }
792 } 1064 }
793 } else { 1065 } else {
794 aio_unlink $filename; 1066 aio_unlink $filename;
795 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
796 } 1068 }
797 } 1069 };
798} 1070}
799 1071
800sub object_freezer_as_string { 1072sub object_freezer_as_string {
801 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
802 1074
814 or return; 1086 or return;
815 1087
816 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
817 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
818 or return; 1090 or return;
819 $av = eval { (Storable::thaw $av)->{objs} };
820 }
821 1091
1092 my $st = eval { Coro::Storable::thaw $av }
1093 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1094 $av = $st->{objs};
1095 }
1096
1097 utf8::decode (my $decname = $filename);
822 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
824 return ($data, $av); 1101 ($data, $av)
825} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
826 1109
827############################################################################# 1110#############################################################################
828# command handling &c 1111# command handling &c
829 1112
830=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1127}
845 1128
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1130
848Register a callbackf ro execution when the client sends an extcmd packet. 1131Register a callback for execution when the client sends an (synchronous)
1132extcmd packet. Ext commands will be processed in the order they are
1133received by the server, like other user commands. The first argument is
1134the logged-in player. Ext commands can only be processed after a player
1135has logged in successfully.
849 1136
850If the callback returns something, it is sent back as if reply was being 1137If the callback returns something, it is sent back as if reply was being
851called. 1138called.
852 1139
1140=item cf::register_exticmd $name => \&callback($ns,$packet);
1141
1142Register a callback for execution when the client sends an (asynchronous)
1143exticmd packet. Exti commands are processed by the server as soon as they
1144are received, i.e. out of order w.r.t. other commands. The first argument
1145is a client socket. Exti commands can be received anytime, even before
1146log-in.
1147
1148If the callback returns something, it is sent back as if reply was being
1149called.
1150
853=cut 1151=cut
854 1152
855sub register_extcmd { 1153sub register_extcmd {
856 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
857 1155
858 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
859} 1163}
860 1164
861cf::player->attach ( 1165cf::player->attach (
862 on_command => sub { 1166 on_command => sub {
863 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
872 cf::override; 1176 cf::override;
873 }, 1177 },
874 on_extcmd => sub { 1178 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
876 1180
877 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1182
879 if (ref $msg) { 1183 if (ref $msg) {
1184 my ($type, $reply, @payload) =
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188
1189 my @reply;
1190
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
882 $pl->ext_reply ($msg->{msgid}, %reply);
883 }
884 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
885 } else { 1198 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1200 }
888 1201
889 cf::override; 1202 cf::override;
890 }, 1203 },
891); 1204);
892 1205
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 { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
928 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1211 next unless -r $path;
930 eval { 1212
931 load_extension $ext; 1213 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1214 my $base = $1;
1215 my $pkg = $1;
1216 $pkg =~ s/[^[:word:]]/_/g;
1217 $pkg = "ext::$pkg";
1218
1219 open my $fh, "<:utf8", $path
1220 or die "$path: $!";
1221
1222 my $source = do { local $/; <$fh> };
1223
1224 my %ext = (
1225 path => $path,
1226 base => $base,
1227 pkg => $pkg,
1228 );
1229
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232
1233 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n"
1236 . $source
1237 . "\n};\n1";
1238
1239 $todo{$base} = \%ext;
1240 }
1241
1242 my %done;
1243 while (%todo) {
1244 my $progress;
1245
1246 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip
1249 unless exists $done{$_};
1250 }
1251
1252 warn "... loading '$k' into '$v->{pkg}'\n";
1253
1254 unless (eval $v->{source}) {
1255 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n";
1257
1258 if (exists $v->{meta}{mandatory}) {
1259 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n";
1261 exit 1;
1262 }
1263
1264 warn $msg;
1265 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
932 1 1270 }
933 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
934 } 1276 };
935} 1277}
936 1278
937############################################################################# 1279#############################################################################
938 1280
1281=back
1282
939=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
940 1284
941Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
942 1286
943=cut 1287=cut
948 1292
949=head3 cf::player 1293=head3 cf::player
950 1294
951=over 4 1295=over 4
952 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
953=item cf::player::find $login 1311=item cf::player::find $login
954 1312
955Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
956 1314
957=cut 1315=cut
958 1316
959sub playerdir($) { 1317sub playerdir($) {
960 cf::localdir 1318 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1319 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1320}
966 1321
967sub path($) { 1322sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1323 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
999 1354
1000 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1001 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1002 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1003 } 1363 }
1004 } 1364 }
1005} 1365}
1006 1366
1016 1376
1017 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1018 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1019 1379
1020 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1021 Coro::cede; 1381 cf::cede_to_tick;
1022} 1382}
1023 1383
1024sub new($) { 1384sub new($) {
1025 my ($login) = @_; 1385 my ($login) = @_;
1026 1386
1030 $self->{deny_save} = 1; 1390 $self->{deny_save} = 1;
1031 1391
1032 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1033 1393
1034 $self 1394 $self
1395}
1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1035} 1405}
1036 1406
1037=item $pl->quit_character 1407=item $pl->quit_character
1038 1408
1039Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1088while and may block, so not sync_job-capable, ever. 1458while and may block, so not sync_job-capable, ever.
1089 1459
1090=cut 1460=cut
1091 1461
1092sub list_logins { 1462sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1463 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1464 or return [];
1095 1465
1096 my @logins; 1466 my @logins;
1097 1467
1098 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1099 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1100 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1101 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1102 1477
1103 utf8::decode $login; 1478 utf8::decode $login;
1104 push @logins, $login; 1479 push @logins, $login;
1105 } 1480 }
1106 1481
1133 } 1508 }
1134 1509
1135 \@paths 1510 \@paths
1136} 1511}
1137 1512
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1514
1515Expand crossfire pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563
1138=item $player->ext_reply ($msgid, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1139 1565
1140Sends an ext reply to the player. 1566Sends an ext reply to the player.
1141 1567
1142=cut 1568=cut
1143 1569
1144sub ext_reply($$%) { 1570sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1146 1572
1147 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1574}
1151 1575
1152=item $player->ext_event ($type, %msg) 1576=item $player->ext_msg ($type, @msg)
1153 1577
1154Sends an ext event to the client. 1578Sends an ext event to the client.
1155 1579
1156=cut 1580=cut
1157 1581
1158sub ext_event($$%) { 1582sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1583 my ($self, $type, @msg) = @_;
1160 1584
1161 $self->ns->ext_event ($type, %msg); 1585 $self->ns->ext_msg ($type, @msg);
1162} 1586}
1163 1587
1164=head3 cf::region 1588=head3 cf::region
1165 1589
1166=over 4 1590=over 4
1169 1593
1170package cf::region; 1594package cf::region;
1171 1595
1172=item cf::region::find_by_path $path 1596=item cf::region::find_by_path $path
1173 1597
1174Tries to decuce the probable region for a map knowing only its path. 1598Tries to decuce the likely region for a map knowing only its path.
1175 1599
1176=cut 1600=cut
1177 1601
1178sub find_by_path($) { 1602sub find_by_path($) {
1179 my ($path) = @_; 1603 my ($path) = @_;
1180 1604
1181 my ($match, $specificity); 1605 my ($match, $specificity);
1182 1606
1183 for my $region (list) { 1607 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1608 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1609 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1610 if $region->specificity > $specificity;
1187 } 1611 }
1188 } 1612 }
1189 1613
1253 my ($self, $merge) = @_; 1677 my ($self, $merge) = @_;
1254 1678
1255 # we have to keep some variables in memory intact 1679 # we have to keep some variables in memory intact
1256 local $self->{path}; 1680 local $self->{path};
1257 local $self->{load_path}; 1681 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1682
1261 $self->SUPER::thawer_merge ($merge); 1683 $self->SUPER::thawer_merge ($merge);
1262} 1684}
1263 1685
1264sub normalise { 1686sub normalise {
1311 $self->init; # pass $1 etc. 1733 $self->init; # pass $1 etc.
1312 return $self; 1734 return $self;
1313 } 1735 }
1314 } 1736 }
1315 1737
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1739 ()
1318} 1740}
1319 1741
1320sub init { 1742sub init {
1321 my ($self) = @_; 1743 my ($self) = @_;
1336 1758
1337# the original (read-only) location 1759# the original (read-only) location
1338sub load_path { 1760sub load_path {
1339 my ($self) = @_; 1761 my ($self) = @_;
1340 1762
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1763 "$MAPDIR/$self->{path}.map"
1342} 1764}
1343 1765
1344# the temporary/swap location 1766# the temporary/swap location
1345sub save_path { 1767sub save_path {
1346 my ($self) = @_; 1768 my ($self) = @_;
1347 1769
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1771 "$TMPDIR/$path.map"
1350} 1772}
1351 1773
1352# the unique path, undef == no special unique path 1774# the unique path, undef == no special unique path
1353sub uniq_path { 1775sub uniq_path {
1354 my ($self) = @_; 1776 my ($self) = @_;
1355 1777
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1779 "$UNIQUEDIR/$path"
1358} 1780}
1359 1781
1360# and all this just because we cannot iterate over 1782# and all this just because we cannot iterate over
1361# all maps in C++... 1783# all maps in C++...
1362sub change_all_map_light { 1784sub change_all_map_light {
1364 1786
1365 $_->change_map_light ($change) 1787 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1788 for grep $_->outdoor, values %cf::MAP;
1367} 1789}
1368 1790
1791sub decay_objects {
1792 my ($self) = @_;
1793
1794 return if $self->{deny_reset};
1795
1796 $self->do_decay_objects;
1797}
1798
1369sub unlink_save { 1799sub unlink_save {
1370 my ($self) = @_; 1800 my ($self) = @_;
1371 1801
1372 utf8::encode (my $save = $self->save_path); 1802 utf8::encode (my $save = $self->save_path);
1373 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1803 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1376 1806
1377sub load_header_from($) { 1807sub load_header_from($) {
1378 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1379 1809
1380 utf8::encode $path; 1810 utf8::encode $path;
1381 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1382 # or return;
1383
1384 $self->_load_header ($path)
1385 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1386 1819
1387 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1388 1821
1389 1 1822 1
1390} 1823}
1429 $self->load_header_orig 1862 $self->load_header_orig
1430 or return; 1863 or return;
1431 $self->prepare_orig; 1864 $self->prepare_orig;
1432 } 1865 }
1433 1866
1867 $self->{deny_reset} = 1
1868 if $self->no_reset;
1869
1434 $self->default_region (cf::region::find_by_path $self->{path}) 1870 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 1871 unless $self->default_region;
1436 1872
1437 1 1873 1
1438} 1874}
1441sub find { 1877sub find {
1442 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1443 1879
1444 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1445 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1446 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1447 1884
1448 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1449 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1450 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1451 or return; 1890 or return;
1452 1891
1453 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1454 1893
1455 $map->load_header 1894 $map->load_header
1456 or return; 1895 or return;
1457 1896
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1461 $map->reset; 1902 $map->reset;
1462 undef $guard;
1463 return find $path; 1903 return find $path;
1464 } 1904 }
1465 1905
1466 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1467 } 1907 }
1474 my ($self) = @_; 1914 my ($self) = @_;
1475 1915
1476 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1477 1917
1478 my $path = $self->{path}; 1918 my $path = $self->{path};
1919
1920 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1480 1922
1923 return unless $self->valid;
1481 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1482 1925
1483 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1484 1927
1485 $self->alloc; 1928 $self->alloc;
1486 1929
1487 $self->pre_load; 1930 $self->pre_load;
1488 Coro::cede; 1931 cf::cede_to_tick;
1489 1932
1490 $self->_load_objects ($self->{load_path}, 1) 1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1935 $self->_load_objects ($f)
1491 or return; 1936 or return;
1492 1937
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1494 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1495 1940
1496 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq; 1942 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1499 $self->clear_unique_items; 1945 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1501 } 1949 }
1502 } 1950 }
1503 1951
1504 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1505 # now do the right thing for maps 1955 # now do the right thing for maps
1506 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede;
1514 $self->set_darkness_map;
1515 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 1958 unless $self->difficulty;
1517 Coro::cede; 1959 cf::cede_to_tick;
1960
1961 unless ($self->{deny_activate}) {
1962 $self->decay_objects;
1963 $self->fix_auto_apply;
1964 $self->update_buttons;
1965 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1518 $self->activate; 1968 $self->activate;
1519 Coro::cede; 1969 }
1970
1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1973
1974 $self->in_memory (cf::MAP_IN_MEMORY);
1520 } 1975 }
1521 1976
1522 $self->post_load; 1977 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 1978}
1527 1979
1528sub customise_for { 1980sub customise_for {
1529 my ($self, $ob) = @_; 1981 my ($self, $ob) = @_;
1530 1982
1531 return find "~" . $ob->name . "/" . $self->{path} 1983 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 1984 if $self->per_player;
1533 1985
1986# return find "?party/" . $ob->name . "/" . $self->{path}
1987# if $self->per_party;
1988
1534 $self 1989 $self
1535} 1990}
1536 1991
1537# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1538sub load_diag { 1993sub load_neighbours {
1539 my ($map) = @_; 1994 my ($map) = @_;
1540 1995
1541 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1542 1997
1543 for (0 .. 3) { 1998 for (0 .. 3) {
1544 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1545 or next; 2000 or next;
1546 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1547 or next; 2002 or next;
1548 $neigh->load; 2003 $neigh->load;
1549 2004
2005 push @neigh,
1550 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1551 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1552 } 2008 }
1553 2009
1554 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1555 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1556 or next; 2013 or next;
1557 $neigh->load; 2014 $neigh->load;
1558 } 2015 }
1559} 2016}
1560 2017
1565} 2022}
1566 2023
1567sub do_load_sync { 2024sub do_load_sync {
1568 my ($map) = @_; 2025 my ($map) = @_;
1569 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1570 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1571} 2031}
1572 2032
1573our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1574our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1575 2035
1576sub find_async { 2036sub find_async {
1577 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1578 2038
1579 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1580 2040
1581 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1582 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1583 } 2043 }
1584 2044
1585 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1586 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
2048 $Coro::current->{desc} = "map prefetcher";
2049
1587 while (%MAP_PREFETCH) { 2050 while (%MAP_PREFETCH) {
1588 for my $path (keys %MAP_PREFETCH) { 2051 while (my ($k, $v) = each %MAP_PREFETCH) {
1589 my $map = find $path 2052 if (my $map = find $k) {
1590 or next;
1591 $map->load; 2053 $map->load if $v;
2054 }
1592 2055
1593 delete $MAP_PREFETCH{$path}; 2056 delete $MAP_PREFETCH{$k};
1594 } 2057 }
1595 } 2058 }
1596 undef $MAP_PREFETCHER; 2059 undef $MAP_PREFETCHER;
1597 }; 2060 };
1598 $MAP_PREFETCHER->prio (6); 2061 $MAP_PREFETCHER->prio (6);
1601} 2064}
1602 2065
1603sub save { 2066sub save {
1604 my ($self) = @_; 2067 my ($self) = @_;
1605 2068
1606 my $lock = cf::lock_acquire "map_data:" . $self->path; 2069 my $lock = cf::lock_acquire "map_data:$self->{path}";
1607 2070
1608 $self->{last_save} = $cf::RUNTIME; 2071 $self->{last_save} = $cf::RUNTIME;
1609 2072
1610 return unless $self->dirty; 2073 return unless $self->dirty;
1611 2074
1617 return if $self->{deny_save}; 2080 return if $self->{deny_save};
1618 2081
1619 local $self->{last_access} = $self->last_access;#d# 2082 local $self->{last_access} = $self->last_access;#d#
1620 2083
1621 cf::async { 2084 cf::async {
2085 $Coro::current->{desc} = "map player save";
1622 $_->contr->save for $self->players; 2086 $_->contr->save for $self->players;
1623 }; 2087 };
1624 2088
1625 if ($uniq) { 2089 if ($uniq) {
1626 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1634 my ($self) = @_; 2098 my ($self) = @_;
1635 2099
1636 # save first because save cedes 2100 # save first because save cedes
1637 $self->save; 2101 $self->save;
1638 2102
1639 my $lock = cf::lock_acquire "map_data:" . $self->path; 2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 2104
1641 return if $self->players; 2105 return if $self->players;
1642 return if $self->in_memory != cf::MAP_IN_MEMORY; 2106 return if $self->in_memory != cf::MAP_IN_MEMORY;
1643 return if $self->{deny_save}; 2107 return if $self->{deny_save};
1644 2108
2109 $self->in_memory (cf::MAP_SWAPPED);
2110
2111 $self->deactivate;
2112 $_->clear_links_to ($self) for values %cf::MAP;
1645 $self->clear; 2113 $self->clear;
1646 $self->in_memory (cf::MAP_SWAPPED);
1647} 2114}
1648 2115
1649sub reset_at { 2116sub reset_at {
1650 my ($self) = @_; 2117 my ($self) = @_;
1651 2118
1652 # TODO: safety, remove and allow resettable per-player maps 2119 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 2120 return 1e99 if $self->{deny_reset};
1655 2121
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2122 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2123 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 2124
1669 my ($self) = @_; 2135 my ($self) = @_;
1670 2136
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2138
1673 return if $self->players; 2139 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 2140
1676 warn "resetting map ", $self->path;#d# 2141 warn "resetting map ", $self->path;
1677 2142
1678 $self->in_memory (cf::MAP_SWAPPED); 2143 $self->in_memory (cf::MAP_SWAPPED);
1679 2144
1680 # need to save uniques path 2145 # need to save uniques path
1681 unless ($self->{deny_save}) { 2146 unless ($self->{deny_save}) {
1685 if $uniq; 2150 if $uniq;
1686 } 2151 }
1687 2152
1688 delete $cf::MAP{$self->path}; 2153 delete $cf::MAP{$self->path};
1689 2154
2155 $self->deactivate;
2156 $_->clear_links_to ($self) for values %cf::MAP;
1690 $self->clear; 2157 $self->clear;
1691
1692 $_->clear_links_to ($self) for values %cf::MAP;
1693 2158
1694 $self->unlink_save; 2159 $self->unlink_save;
1695 $self->destroy; 2160 $self->destroy;
1696} 2161}
1697 2162
1698my $nuke_counter = "aaaa"; 2163my $nuke_counter = "aaaa";
1699 2164
1700sub nuke { 2165sub nuke {
1701 my ($self) = @_; 2166 my ($self) = @_;
1702 2167
2168 {
2169 my $lock = cf::lock_acquire "map_data:$self->{path}";
2170
1703 delete $cf::MAP{$self->path}; 2171 delete $cf::MAP{$self->path};
1704 2172
1705 $self->unlink_save; 2173 $self->unlink_save;
1706 2174
1707 bless $self, "cf::map"; 2175 bless $self, "cf::map";
1708 delete $self->{deny_reset}; 2176 delete $self->{deny_reset};
1709 $self->{deny_save} = 1; 2177 $self->{deny_save} = 1;
1710 $self->reset_timeout (1); 2178 $self->reset_timeout (1);
1711 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2179 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1712 2180
1713 $cf::MAP{$self->path} = $self; 2181 $cf::MAP{$self->path} = $self;
2182 }
1714 2183
1715 $self->reset; # polite request, might not happen 2184 $self->reset; # polite request, might not happen
2185}
2186
2187=item $maps = cf::map::tmp_maps
2188
2189Returns an arrayref with all map paths of currently instantiated and saved
2190maps. May block.
2191
2192=cut
2193
2194sub tmp_maps() {
2195 [
2196 map {
2197 utf8::decode $_;
2198 /\.map$/
2199 ? normalise $_
2200 : ()
2201 } @{ aio_readdir $TMPDIR or [] }
2202 ]
2203}
2204
2205=item $maps = cf::map::random_maps
2206
2207Returns an arrayref with all map paths of currently instantiated and saved
2208random maps. May block.
2209
2210=cut
2211
2212sub random_maps() {
2213 [
2214 map {
2215 utf8::decode $_;
2216 /\.map$/
2217 ? normalise "?random/$_"
2218 : ()
2219 } @{ aio_readdir $RANDOMDIR or [] }
2220 ]
1716} 2221}
1717 2222
1718=item cf::map::unique_maps 2223=item cf::map::unique_maps
1719 2224
1720Returns an arrayref of paths of all shared maps that have 2225Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 2226instantiated unique items. May block.
1722 2227
1723=cut 2228=cut
1724 2229
1725sub unique_maps() { 2230sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2231 [
1727 or return; 2232 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 2233 utf8::decode $_;
1733 next if /\.pst$/; 2234 /\.map$/
1734 next unless /^$PATH_SEP/o; 2235 ? normalise $_
1735 2236 : ()
1736 push @paths, cf::map::normalise $_; 2237 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 2238 ]
1738
1739 \@paths
1740} 2239}
1741 2240
1742package cf; 2241package cf;
1743 2242
1744=back 2243=back
1762 map { $_, inv_recursive_ $_->inv } @_ 2261 map { $_, inv_recursive_ $_->inv } @_
1763} 2262}
1764 2263
1765sub inv_recursive { 2264sub inv_recursive {
1766 inv_recursive_ inv $_[0] 2265 inv_recursive_ inv $_[0]
2266}
2267
2268=item $ref = $ob->ref
2269
2270creates and returns a persistent reference to an objetc that can be stored as a string.
2271
2272=item $ob = cf::object::deref ($refstring)
2273
2274returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2275even if the object actually exists. May block.
2276
2277=cut
2278
2279sub deref {
2280 my ($ref) = @_;
2281
2282 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
1767} 2294}
1768 2295
1769package cf; 2296package cf;
1770 2297
1771=back 2298=back
1790 2317
1791 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2318 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792 2319
1793 if ($self->{record_replies}) { 2320 if ($self->{record_replies}) {
1794 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2321 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2322
1795 } else { 2323 } else {
2324 my $pl = $self->contr;
2325
2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2327 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329
2330 } else {
1796 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
1797 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2333 }
1798 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
1799} 2345}
1800 2346
1801=item $player_object->may ("access") 2347=item $player_object->may ("access")
1802 2348
1803Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
1850 $self->deactivate_recursive; 2396 $self->deactivate_recursive;
1851 2397
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2398 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 2399
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 2401 if $self->map && $self->map->{path} ne "{link}";
1856 2402
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2403 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 2404}
1859 2405
1860sub cf::object::player::leave_link { 2406sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 2407 my ($self, $map, $x, $y) = @_;
2408
2409 return unless $self->contr->active;
1862 2410
1863 my $link_pos = delete $self->{_link_pos}; 2411 my $link_pos = delete $self->{_link_pos};
1864 2412
1865 unless ($map) { 2413 unless ($map) {
1866 # restore original map position 2414 # restore original map position
1880 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
1881 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
1882 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
1883 2431
1884 $map->load; 2432 $map->load;
1885 $map->load_diag; 2433 $map->load_neighbours;
1886 2434
1887 return unless $self->contr->active; 2435 return unless $self->contr->active;
1888 $self->activate_recursive; 2436 $self->activate_recursive;
1889 2437
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
1892} 2440}
1893 2441
1894cf::player->attach ( 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1895 on_logout => sub {
1896 my ($pl) = @_;
1897 2443
1898 # abort map switching before logout 2444Moves the player to the given map-path and coordinates by first freezing
1899 if ($pl->ob->{_link_pos}) { 2445her, loading and preparing them map, calling the provided $check callback
1900 cf::sync_job { 2446that has to return the map if sucecssful, and then unfreezes the player on
1901 $pl->ob->leave_link 2447the new (success) or old (failed) map position. In either case, $done will
1902 }; 2448be called at the end of this process.
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907 2449
1908 # try to abort aborted map switching on player login :)
1909 # should happen only on crashes
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925
1926=item $player_object->goto ($path, $x, $y)
1927
1928=cut 2450=cut
2451
2452our $GOTOGEN;
1929 2453
1930sub cf::object::player::goto { 2454sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
2456
2457 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2459
1933 $self->enter_link; 2460 $self->enter_link;
1934 2461
1935 (async { 2462 (async {
2463 $Coro::current->{desc} = "player::goto $path $x $y";
2464
2465 # *tag paths override both path and x|y
2466 if ($path =~ /^\*(.*)$/) {
2467 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2468 my $ob = $obs[rand @obs];
2469
2470 # see if we actually can go there
2471 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2472 $ob = $obs[rand @obs];
2473 } else {
2474 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2475 }
2476 # else put us there anyways for now #d#
2477
2478 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2479 } else {
2480 ($path, $x, $y) = (undef, undef, undef);
2481 }
2482 }
2483
1936 my $map = eval { 2484 my $map = eval {
1937 my $map = cf::map::find $path; 2485 my $map = defined $path ? cf::map::find $path : undef;
2486
2487 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2488 $map = $map->customise_for ($self);
2489 $map = $check->($map) if $check && $map;
2490 } else {
2491 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2492 }
2493
1939 $map 2494 $map
2495 };
2496
2497 if ($@) {
2498 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2499 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2500 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2501
2502 if ($gen == $self->{_goto_generation}) {
2503 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2504 $self->leave_link ($map, $x, $y);
2505 }
2506
2507 $done->() if $done;
1944 })->prio (1); 2508 })->prio (1);
1945} 2509}
1946 2510
1947=item $player_object->enter_exit ($exit_object) 2511=item $player_object->enter_exit ($exit_object)
1948 2512
1987 2551
1988 $rmp->{random_seed} ||= $exit->random_seed; 2552 $rmp->{random_seed} ||= $exit->random_seed;
1989 2553
1990 my $data = cf::to_json $rmp; 2554 my $data = cf::to_json $rmp;
1991 my $md5 = Digest::MD5::md5_hex $data; 2555 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2556 my $meta = "$RANDOMDIR/$md5.meta";
1993 2557
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2558 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2559 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2560 undef $fh;
1997 aio_rename "$meta~", $meta; 2561 aio_rename "$meta~", $meta;
2017 my $hp = $exit->stats->hp; 2581 my $hp = $exit->stats->hp;
2018 my $sp = $exit->stats->sp; 2582 my $sp = $exit->stats->sp;
2019 2583
2020 $self->enter_link; 2584 $self->enter_link;
2021 2585
2586 # if exit is damned, update players death & WoR home-position
2587 $self->contr->savebed ($slaying, $hp, $sp)
2588 if $exit->flag (FLAG_DAMNED);
2589
2022 (async { 2590 (async {
2591 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2592
2023 $self->deactivate_recursive; # just to be sure 2593 $self->deactivate_recursive; # just to be sure
2024 unless (eval { 2594 unless (eval {
2025 $self->goto ($slaying, $hp, $sp); 2595 $self->goto ($slaying, $hp, $sp);
2026 2596
2027 1; 2597 1;
2053 2623
2054 utf8::encode $text; 2624 utf8::encode $text;
2055 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2625 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2056} 2626}
2057 2627
2628=item $client->send_msg ($channel, $msg, $color, [extra...])
2629
2630Send a drawinfo or msg packet to the client, formatting the msg for the
2631client if neccessary. C<$type> should be a string identifying the type of
2632the message, with C<log> being the default. If C<$color> is negative, suppress
2633the message unless the client supports the msg packet.
2634
2635=cut
2636
2637our %CHANNEL = (
2638 "c/identify" => {
2639 id => "infobox",
2640 title => "Identify",
2641 reply => undef,
2642 tooltip => "Items recently identified",
2643 },
2644 "c/examine" => {
2645 id => "infobox",
2646 title => "Examine",
2647 reply => undef,
2648 tooltip => "Signs and other items you examined",
2649 },
2650 "c/lookat" => {
2651 id => "infobox",
2652 title => "Look",
2653 reply => undef,
2654 tooltip => "What you saw there",
2655 },
2656);
2657
2658sub cf::client::send_msg {
2659 my ($self, $channel, $msg, $color, @extra) = @_;
2660
2661 $msg = $self->pl->expand_cfpod ($msg);
2662
2663 $color &= cf::NDI_CLIENT_MASK; # just in case...
2664
2665 # check predefined channels, for the benefit of C
2666 if ($CHANNEL{$channel}) {
2667 $channel = $CHANNEL{$channel};
2668
2669 $self->ext_msg (channel_info => $channel)
2670 if $self->can_msg;
2671
2672 $channel = $channel->{id};
2673
2674 } elsif (ref $channel) {
2675 # send meta info to client, if not yet sent
2676 unless (exists $self->{channel}{$channel->{id}}) {
2677 $self->{channel}{$channel->{id}} = $channel;
2678 $self->ext_msg (channel_info => $channel)
2679 if $self->can_msg;
2680 }
2681
2682 $channel = $channel->{id};
2683 }
2684
2685 return unless @extra || length $msg;
2686
2687 if ($self->can_msg) {
2688 # default colour, mask it out
2689 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2690 if $color & cf::NDI_DEF;
2691
2692 $self->send_packet ("msg " . $self->{json_coder}->encode (
2693 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2694 } else {
2695 if ($color >= 0) {
2696 # replace some tags by gcfclient-compatible ones
2697 for ($msg) {
2698 1 while
2699 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2700 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2701 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2702 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2703 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2704 }
2705
2706 $color &= cf::NDI_COLOR_MASK;
2707
2708 utf8::encode $msg;
2709
2710 if (0 && $msg =~ /\[/) {
2711 # COMMAND/INFO
2712 $self->send_packet ("drawextinfo $color 10 8 $msg")
2713 } else {
2714 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2715 $self->send_packet ("drawinfo $color $msg")
2716 }
2717 }
2718 }
2719}
2720
2058=item $client->ext_event ($type, %msg) 2721=item $client->ext_msg ($type, @msg)
2059 2722
2060Sends an exti event to the client. 2723Sends an ext event to the client.
2061 2724
2062=cut 2725=cut
2063 2726
2064sub cf::client::ext_event($$%) { 2727sub cf::client::ext_msg($$@) {
2065 my ($self, $type, %msg) = @_; 2728 my ($self, $type, @msg) = @_;
2066 2729
2730 if ($self->extcmd == 2) {
2731 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2732 } elsif ($self->extcmd == 1) { # TODO: remove
2067 $msg{msgtype} = "event_$type"; 2733 push @msg, msgtype => "event_$type";
2068 $self->send_packet ("ext " . cf::to_json \%msg); 2734 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2735 }
2736}
2737
2738=item $client->ext_reply ($msgid, @msg)
2739
2740Sends an ext reply to the client.
2741
2742=cut
2743
2744sub cf::client::ext_reply($$@) {
2745 my ($self, $id, @msg) = @_;
2746
2747 if ($self->extcmd == 2) {
2748 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2749 } elsif ($self->extcmd == 1) {
2750 #TODO: version 1, remove
2751 unshift @msg, msgtype => "reply", msgid => $id;
2752 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2753 }
2069} 2754}
2070 2755
2071=item $success = $client->query ($flags, "text", \&cb) 2756=item $success = $client->query ($flags, "text", \&cb)
2072 2757
2073Queues a query to the client, calling the given callback with 2758Queues a query to the client, calling the given callback with
2074the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2759the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2075C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2760C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2076 2761
2077Queries can fail, so check the return code. Or don't, as queries will become 2762Queries can fail, so check the return code. Or don't, as queries will
2078reliable at some point in the future. 2763become reliable at some point in the future.
2079 2764
2080=cut 2765=cut
2081 2766
2082sub cf::client::query { 2767sub cf::client::query {
2083 my ($self, $flags, $text, $cb) = @_; 2768 my ($self, $flags, $text, $cb) = @_;
2091 utf8::encode $text; 2776 utf8::encode $text;
2092 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2777 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093 2778
2094 $self->send_packet ($self->{query_queue}[0][0]) 2779 $self->send_packet ($self->{query_queue}[0][0])
2095 if @{ $self->{query_queue} } == 1; 2780 if @{ $self->{query_queue} } == 1;
2781
2782 1
2096} 2783}
2097 2784
2098cf::client->attach ( 2785cf::client->attach (
2786 on_connect => sub {
2787 my ($ns) = @_;
2788
2789 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2790 },
2099 on_reply => sub { 2791 on_reply => sub {
2100 my ($ns, $msg) = @_; 2792 my ($ns, $msg) = @_;
2101 2793
2102 # this weird shuffling is so that direct followup queries 2794 # this weird shuffling is so that direct followup queries
2103 # get handled first 2795 # get handled first
2115 } else { 2807 } else {
2116 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2808 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117 } 2809 }
2118 } 2810 }
2119 }, 2811 },
2812 on_exticmd => sub {
2813 my ($ns, $buf) = @_;
2814
2815 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2816
2817 if (ref $msg) {
2818 my ($type, $reply, @payload) =
2819 "ARRAY" eq ref $msg
2820 ? @$msg
2821 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2822
2823 my @reply;
2824
2825 if (my $cb = $EXTICMD{$type}) {
2826 @reply = $cb->($ns, @payload);
2827 }
2828
2829 $ns->ext_reply ($reply, @reply)
2830 if $reply;
2831
2832 } else {
2833 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2834 }
2835
2836 cf::override;
2837 },
2120); 2838);
2121 2839
2122=item $client->async (\&cb) 2840=item $client->async (\&cb)
2123 2841
2124Create a new coroutine, running the specified callback. The coroutine will 2842Create a new coroutine, running the specified callback. The coroutine will
2165our $safe = new Safe "safe"; 2883our $safe = new Safe "safe";
2166our $safe_hole = new Safe::Hole; 2884our $safe_hole = new Safe::Hole;
2167 2885
2168$SIG{FPE} = 'IGNORE'; 2886$SIG{FPE} = 'IGNORE';
2169 2887
2170$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2888$safe->permit_only (Opcode::opset qw(
2889 :base_core :base_mem :base_orig :base_math
2890 grepstart grepwhile mapstart mapwhile
2891 sort time
2892));
2171 2893
2172# here we export the classes and methods available to script code 2894# here we export the classes and methods available to script code
2173 2895
2174=pod 2896=pod
2175 2897
2176The following functions and methods are available within a safe environment: 2898The following functions and methods are available within a safe environment:
2177 2899
2178 cf::object contr pay_amount pay_player map 2900 cf::object
2901 contr pay_amount pay_player map x y force_find force_add
2902 insert remove name archname title slaying race decrease_ob_nr
2903
2179 cf::object::player player 2904 cf::object::player
2180 cf::player peaceful 2905 player
2181 cf::map trigger 2906
2907 cf::player
2908 peaceful
2909
2910 cf::map
2911 trigger
2182 2912
2183=cut 2913=cut
2184 2914
2185for ( 2915for (
2186 ["cf::object" => qw(contr pay_amount pay_player map)], 2916 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2917 insert remove inv name archname title slaying race
2918 decrease_ob_nr)],
2187 ["cf::object::player" => qw(player)], 2919 ["cf::object::player" => qw(player)],
2188 ["cf::player" => qw(peaceful)], 2920 ["cf::player" => qw(peaceful)],
2189 ["cf::map" => qw(trigger)], 2921 ["cf::map" => qw(trigger)],
2190) { 2922) {
2191 no strict 'refs'; 2923 no strict 'refs';
2262=back 2994=back
2263 2995
2264=cut 2996=cut
2265 2997
2266############################################################################# 2998#############################################################################
2267
2268=head2 EXTENSION DATABASE SUPPORT
2269
2270Crossfire maintains a very simple database for extension use. It can
2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272convert to/from binary).
2273
2274The parameter C<$family> should best start with the name of the extension
2275using it, it should be unique.
2276
2277=over 4
2278
2279=item $value = cf::db_get $family => $key
2280
2281Returns a single value from the database.
2282
2283=item cf::db_put $family => $key => $value
2284
2285Stores the given C<$value> in the family.
2286
2287=cut
2288
2289our $DB;
2290
2291sub db_init {
2292 unless ($DB) {
2293 $DB = BDB::db_create $DB_ENV;
2294
2295 cf::sync_job {
2296 eval {
2297 $DB->set_flags (BDB::CHKSUM);
2298
2299 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301 cf::cleanup "db_open(db): $!" if $!;
2302 };
2303 cf::cleanup "db_open(db): $@" if $@;
2304 };
2305 }
2306}
2307
2308sub db_get($$) {
2309 my $key = "$_[0]/$_[1]";
2310
2311 cf::sync_job {
2312 BDB::db_get $DB, undef, $key, my $data;
2313
2314 $! ? ()
2315 : $data
2316 }
2317}
2318
2319sub db_put($$$) {
2320 BDB::dbreq_pri 4;
2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 local $SIG{__WARN__};
2420 eval {
2421 local $SIG{__DIE__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 warn $@ if $@;
2429 _exit 0;
2430 }
2431}
2432
2433
2434
2435#############################################################################
2436# the server's init and main functions 2999# the server's init and main functions
2437 3000
2438sub load_facedata($) { 3001sub load_facedata($) {
2439 my ($path) = @_; 3002 my ($path) = @_;
3003
3004 # HACK to clear player env face cache, we need some signal framework
3005 # for this (global event?)
3006 %ext::player_env::MUSIC_FACE_CACHE = ();
3007
3008 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2440 3009
2441 warn "loading facedata from $path\n"; 3010 warn "loading facedata from $path\n";
2442 3011
2443 my $facedata; 3012 my $facedata;
2444 0 < aio_load $path, $facedata 3013 0 < aio_load $path, $facedata
2447 $facedata = Coro::Storable::thaw $facedata; 3016 $facedata = Coro::Storable::thaw $facedata;
2448 3017
2449 $facedata->{version} == 2 3018 $facedata->{version} == 2
2450 or cf::cleanup "$path: version mismatch, cannot proceed."; 3019 or cf::cleanup "$path: version mismatch, cannot proceed.";
2451 3020
3021 # patch in the exptable
3022 $facedata->{resource}{"res/exp_table"} = {
3023 type => FT_RSRC,
3024 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3025 };
3026 cf::cede_to_tick;
3027
2452 { 3028 {
2453 my $faces = $facedata->{faceinfo}; 3029 my $faces = $facedata->{faceinfo};
2454 3030
2455 while (my ($face, $info) = each %$faces) { 3031 while (my ($face, $info) = each %$faces) {
2456 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3032 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2457 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3033 cf::face::set_visibility $idx, $info->{visibility};
3034 cf::face::set_magicmap $idx, $info->{magicmap};
2458 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3035 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2459 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3036 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2460 Coro::cede; 3037
3038 cf::cede_to_tick;
2461 } 3039 }
2462 3040
2463 while (my ($face, $info) = each %$faces) { 3041 while (my ($face, $info) = each %$faces) {
2464 next unless $info->{smooth}; 3042 next unless $info->{smooth};
2465 my $idx = cf::face::find $face 3043 my $idx = cf::face::find $face
2466 or next; 3044 or next;
2467 if (my $smooth = cf::face::find $info->{smooth}) { 3045 if (my $smooth = cf::face::find $info->{smooth}) {
3046 cf::face::set_smooth $idx, $smooth;
2468 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3047 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2469 } else { 3048 } else {
2470 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3049 warn "smooth face '$info->{smooth}' not found for face '$face'";
2471 } 3050 }
2472 Coro::cede; 3051
3052 cf::cede_to_tick;
2473 } 3053 }
2474 } 3054 }
2475 3055
2476 { 3056 {
2477 my $anims = $facedata->{animinfo}; 3057 my $anims = $facedata->{animinfo};
2478 3058
2479 while (my ($anim, $info) = each %$anims) { 3059 while (my ($anim, $info) = each %$anims) {
2480 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3060 cf::anim::set $anim, $info->{frames}, $info->{facings};
2481 Coro::cede; 3061 cf::cede_to_tick;
2482 } 3062 }
2483 3063
2484 cf::anim::invalidate_all; # d'oh 3064 cf::anim::invalidate_all; # d'oh
2485 } 3065 }
2486 3066
3067 {
3068 # TODO: for gcfclient pleasure, we should give resources
3069 # that gcfclient doesn't grok a >10000 face index.
3070 my $res = $facedata->{resource};
3071
3072 my $soundconf = delete $res->{"res/sound.conf"};
3073
3074 while (my ($name, $info) = each %$res) {
3075 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3076 my $data;
3077
3078 if ($info->{type} & 1) {
3079 # prepend meta info
3080
3081 my $meta = $enc->encode ({
3082 name => $name,
3083 %{ $info->{meta} || {} },
3084 });
3085
3086 $data = pack "(w/a*)*", $meta, $info->{data};
3087 } else {
3088 $data = $info->{data};
3089 }
3090
3091 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3092 cf::face::set_type $idx, $info->{type};
3093
3094 cf::cede_to_tick;
3095 }
3096
3097 if ($soundconf) {
3098 $soundconf = $enc->decode (delete $soundconf->{data});
3099
3100 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3101 my $sound = $soundconf->{compat}[$_]
3102 or next;
3103
3104 my $face = cf::face::find "sound/$sound->[1]";
3105 cf::sound::set $sound->[0] => $face;
3106 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3107 }
3108
3109 while (my ($k, $v) = each %{$soundconf->{event}}) {
3110 my $face = cf::face::find "sound/$v";
3111 cf::sound::set $k => $face;
3112 }
3113 }
3114 }
3115
2487 1 3116 1
2488} 3117}
2489 3118
3119register_exticmd fx_want => sub {
3120 my ($ns, $want) = @_;
3121
3122 while (my ($k, $v) = each %$want) {
3123 $ns->fx_want ($k, $v);
3124 }
3125};
3126
3127sub reload_regions {
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
3132 load_resource_file "$MAPDIR/regions"
3133 or die "unable to load regions file\n";
3134
3135 for (cf::region::list) {
3136 $_->{match} = qr/$_->{match}/
3137 if exists $_->{match};
3138 }
3139}
3140
2490sub reload_facedata { 3141sub reload_facedata {
2491 load_facedata sprintf "%s/facedata", cf::datadir 3142 load_facedata "$DATADIR/facedata"
2492 or die "unable to load facedata\n"; 3143 or die "unable to load facedata\n";
2493} 3144}
2494 3145
2495sub reload_regions {
2496 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2497 or die "unable to load regions file\n";
2498}
2499
2500sub reload_archetypes { 3146sub reload_archetypes {
2501 load_resource_file sprintf "%s/archetypes", cf::datadir 3147 load_resource_file "$DATADIR/archetypes"
2502 or die "unable to load archetypes\n"; 3148 or die "unable to load archetypes\n";
3149 #d# NEED to laod twice to resolve forward references
3150 # this really needs to be done in an extra post-pass
3151 # (which needs to be synchronous, so solve it differently)
3152 load_resource_file "$DATADIR/archetypes"
3153 or die "unable to load archetypes\n";
2503} 3154}
2504 3155
2505sub reload_treasures { 3156sub reload_treasures {
2506 load_resource_file sprintf "%s/treasures", cf::datadir 3157 load_resource_file "$DATADIR/treasures"
2507 or die "unable to load treasurelists\n"; 3158 or die "unable to load treasurelists\n";
2508} 3159}
2509 3160
2510sub reload_resources { 3161sub reload_resources {
2511 warn "reloading resource files...\n"; 3162 warn "reloading resource files...\n";
2512 3163
2513 reload_regions; 3164 reload_regions;
2514 reload_facedata; 3165 reload_facedata;
3166 #reload_archetypes;#d#
2515 reload_archetypes; 3167 reload_archetypes;
2516 reload_treasures; 3168 reload_treasures;
2517 3169
2518 warn "finished reloading resource files\n"; 3170 warn "finished reloading resource files\n";
2519} 3171}
2520 3172
2521sub init { 3173sub init {
2522 reload_resources; 3174 reload_resources;
2523} 3175}
2524 3176
2525sub cfg_load { 3177sub reload_config {
2526 open my $fh, "<:utf8", cf::confdir . "/config" 3178 open my $fh, "<:utf8", "$CONFDIR/config"
2527 or return; 3179 or return;
2528 3180
2529 local $/; 3181 local $/;
2530 *CFG = YAML::Syck::Load <$fh>; 3182 *CFG = YAML::Syck::Load <$fh>;
2531 3183
2546sub main { 3198sub main {
2547 # we must not ever block the main coroutine 3199 # we must not ever block the main coroutine
2548 local $Coro::idle = sub { 3200 local $Coro::idle = sub {
2549 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2550 (async { 3202 (async {
3203 $Coro::current->{desc} = "IDLE BUG HANDLER";
2551 Event::one_event; 3204 Event::one_event;
2552 })->prio (Coro::PRIO_MAX); 3205 })->prio (Coro::PRIO_MAX);
2553 }; 3206 };
2554 3207
2555 cfg_load; 3208 reload_config;
2556 db_init; 3209 db_init;
2557 load_extensions; 3210 load_extensions;
2558 3211
2559 $TICK_WATCHER->start; 3212 $TICK_WATCHER->start;
2560 Event::loop; 3213 Event::loop;
2576 }, 3229 },
2577 ); 3230 );
2578 } 3231 }
2579} 3232}
2580 3233
3234sub write_runtime {
3235 my $runtime = "$LOCALDIR/runtime";
3236
3237 # first touch the runtime file to show we are still running:
3238 # the fsync below can take a very very long time.
3239
3240 IO::AIO::aio_utime $runtime, undef, undef;
3241
3242 my $guard = cf::lock_acquire "write_runtime";
3243
3244 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3245 or return;
3246
3247 my $value = $cf::RUNTIME + 90 + 10;
3248 # 10 is the runtime save interval, for a monotonic clock
3249 # 60 allows for the watchdog to kill the server.
3250
3251 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3252 and return;
3253
3254 # always fsync - this file is important
3255 aio_fsync $fh
3256 and return;
3257
3258 # touch it again to show we are up-to-date
3259 aio_utime $fh, undef, undef;
3260
3261 close $fh
3262 or return;
3263
3264 aio_rename "$runtime~", $runtime
3265 and return;
3266
3267 warn "runtime file written.\n";
3268
3269 1
3270}
3271
2581sub emergency_save() { 3272sub emergency_save() {
2582 my $freeze_guard = cf::freeze_mainloop; 3273 my $freeze_guard = cf::freeze_mainloop;
2583 3274
2584 warn "enter emergency perl save\n"; 3275 warn "enter emergency perl save\n";
2585 3276
2589 # and maps saved/destroyed asynchronously. 3280 # and maps saved/destroyed asynchronously.
2590 warn "begin emergency player save\n"; 3281 warn "begin emergency player save\n";
2591 for my $login (keys %cf::PLAYER) { 3282 for my $login (keys %cf::PLAYER) {
2592 my $pl = $cf::PLAYER{$login} or next; 3283 my $pl = $cf::PLAYER{$login} or next;
2593 $pl->valid or next; 3284 $pl->valid or next;
3285 delete $pl->{unclean_save};
2594 $pl->save; 3286 $pl->save;
2595 } 3287 }
2596 warn "end emergency player save\n"; 3288 warn "end emergency player save\n";
2597 3289
2598 warn "begin emergency map save\n"; 3290 warn "begin emergency map save\n";
2660 %EXT_CORO = (); 3352 %EXT_CORO = ();
2661 3353
2662 warn "removing commands"; 3354 warn "removing commands";
2663 %COMMAND = (); 3355 %COMMAND = ();
2664 3356
2665 warn "removing ext commands"; 3357 warn "removing ext/exti commands";
2666 %EXTCMD = (); 3358 %EXTCMD = ();
3359 %EXTICMD = ();
2667 3360
2668 warn "unloading/nuking all extensions"; 3361 warn "unloading/nuking all extensions";
2669 for my $pkg (@EXTS) { 3362 for my $pkg (@EXTS) {
2670 warn "... unloading $pkg"; 3363 warn "... unloading $pkg";
2671 3364
2701 Symbol::delete_package "safe::$_" 3394 Symbol::delete_package "safe::$_"
2702 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3395 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2703 3396
2704 warn "unloading cf.pm \"a bit\""; 3397 warn "unloading cf.pm \"a bit\"";
2705 delete $INC{"cf.pm"}; 3398 delete $INC{"cf.pm"};
3399 delete $INC{"cf/pod.pm"};
2706 3400
2707 # don't, removes xs symbols, too, 3401 # don't, removes xs symbols, too,
2708 # and global variables created in xs 3402 # and global variables created in xs
2709 #Symbol::delete_package __PACKAGE__; 3403 #Symbol::delete_package __PACKAGE__;
2710 3404
2713 warn "reloading cf.pm"; 3407 warn "reloading cf.pm";
2714 require cf; 3408 require cf;
2715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3409 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2716 3410
2717 warn "loading config and database again"; 3411 warn "loading config and database again";
2718 cf::cfg_load; 3412 cf::reload_config;
2719 3413
2720 warn "loading extensions"; 3414 warn "loading extensions";
2721 cf::load_extensions; 3415 cf::load_extensions;
2722 3416
2723 warn "reattaching attachments to objects/players"; 3417 warn "reattaching attachments to objects/players";
2759register_command "reload" => sub { 3453register_command "reload" => sub {
2760 my ($who, $arg) = @_; 3454 my ($who, $arg) = @_;
2761 3455
2762 if ($who->flag (FLAG_WIZ)) { 3456 if ($who->flag (FLAG_WIZ)) {
2763 $who->message ("reloading server."); 3457 $who->message ("reloading server.");
3458 async {
3459 $Coro::current->{desc} = "perl_reload";
2764 async { reload_perl }; 3460 reload_perl;
3461 };
2765 } 3462 }
2766}; 3463};
2767 3464
2768unshift @INC, $LIBDIR; 3465unshift @INC, $LIBDIR;
2769 3466
2801 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3498 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2802 unless ++$bug_warning > 10; 3499 unless ++$bug_warning > 10;
2803 return; 3500 return;
2804 } 3501 }
2805 3502
2806 $NOW = Event::time; 3503 $NOW = $tick_start = Event::time;
2807 3504
2808 cf::server_tick; # one server iteration 3505 cf::server_tick; # one server iteration
2809 3506
2810 $RUNTIME += $TICK; 3507 $RUNTIME += $TICK;
2811 $NEXT_TICK += $TICK; 3508 $NEXT_TICK += $TICK;
2812 3509
2813 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3510 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2814 $NEXT_RUNTIME_WRITE = $NOW + 10; 3511 $NEXT_RUNTIME_WRITE = $NOW + 10;
2815 Coro::async_pool { 3512 Coro::async_pool {
3513 $Coro::current->{desc} = "runtime saver";
2816 write_runtime 3514 write_runtime
2817 or warn "ERROR: unable to write runtime file: $!"; 3515 or warn "ERROR: unable to write runtime file: $!";
2818 }; 3516 };
2819 } 3517 }
2820 3518
2821# my $AFTER = Event::time; 3519 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2822# warn $AFTER - $NOW;#d# 3520 $sig->send;
3521 }
3522 while (my $sig = shift @WAIT_FOR_TICK) {
3523 $sig->send;
3524 }
3525
3526 $NOW = Event::time;
2823 3527
2824 # if we are delayed by four ticks or more, skip them all 3528 # if we are delayed by four ticks or more, skip them all
2825 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3529 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2826 3530
2827 $TICK_WATCHER->at ($NEXT_TICK); 3531 $TICK_WATCHER->at ($NEXT_TICK);
2828 $TICK_WATCHER->start; 3532 $TICK_WATCHER->start;
2829 3533
2830 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3534 $LOAD = ($NOW - $tick_start) / $TICK;
2831 $sig->send; 3535 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2832 }
2833 while (my $sig = shift @WAIT_FOR_TICK) {
2834 $sig->send;
2835 }
2836 3536
2837 _post_tick; 3537 _post_tick;
2838 }, 3538 },
2839); 3539);
2840 3540
2841{ 3541{
3542 BDB::min_parallel 8;
2842 BDB::max_poll_time $TICK * 0.1; 3543 BDB::max_poll_time $TICK * 0.1;
2843 $BDB_POLL_WATCHER = Event->io ( 3544 $BDB_POLL_WATCHER = Event->io (
2844 reentrant => 0, 3545 reentrant => 0,
2845 fd => BDB::poll_fileno, 3546 fd => BDB::poll_fileno,
2846 poll => 'r', 3547 poll => 'r',
2847 prio => 0, 3548 prio => 0,
2848 data => WF_AUTOCANCEL, 3549 data => WF_AUTOCANCEL,
2849 cb => \&BDB::poll_cb, 3550 cb => \&BDB::poll_cb,
2850 ); 3551 );
2851 BDB::min_parallel 8;
2852 3552
2853 BDB::set_sync_prepare { 3553 BDB::set_sync_prepare {
2854 my $status; 3554 my $status;
2855 my $current = $Coro::current; 3555 my $current = $Coro::current;
2856 ( 3556 (
2865 ) 3565 )
2866 }; 3566 };
2867 3567
2868 unless ($DB_ENV) { 3568 unless ($DB_ENV) {
2869 $DB_ENV = BDB::db_env_create; 3569 $DB_ENV = BDB::db_env_create;
3570 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3571 | BDB::LOG_AUTOREMOVE, 1);
3572 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3573 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2870 3574
2871 cf::sync_job { 3575 cf::sync_job {
2872 eval { 3576 eval {
2873 BDB::db_env_open 3577 BDB::db_env_open
2874 $DB_ENV, 3578 $DB_ENV,
2875 $BDB_ENV_DIR, 3579 $BDBDIR,
2876 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3580 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2877 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3581 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2878 0666; 3582 0666;
2879 3583
2880 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3584 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2881
2882 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2883 $DB_ENV->set_lk_detect;
2884 }; 3585 };
2885 3586
2886 cf::cleanup "db_env_open(db): $@" if $@; 3587 cf::cleanup "db_env_open(db): $@" if $@;
2887 }; 3588 };
2888 } 3589 }
3590
3591 $BDB_DEADLOCK_WATCHER = Event->timer (
3592 after => 3,
3593 interval => 1,
3594 hard => 1,
3595 prio => 0,
3596 data => WF_AUTOCANCEL,
3597 cb => sub {
3598 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3599 },
3600 );
3601 $BDB_CHECKPOINT_WATCHER = Event->timer (
3602 after => 11,
3603 interval => 60,
3604 hard => 1,
3605 prio => 0,
3606 data => WF_AUTOCANCEL,
3607 cb => sub {
3608 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3609 },
3610 );
3611 $BDB_TRICKLE_WATCHER = Event->timer (
3612 after => 5,
3613 interval => 10,
3614 hard => 1,
3615 prio => 0,
3616 data => WF_AUTOCANCEL,
3617 cb => sub {
3618 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3619 },
3620 );
2889} 3621}
2890 3622
2891{ 3623{
2892 IO::AIO::min_parallel 8; 3624 IO::AIO::min_parallel 8;
2893 3625
2896 $AIO_POLL_WATCHER = Event->io ( 3628 $AIO_POLL_WATCHER = Event->io (
2897 reentrant => 0, 3629 reentrant => 0,
2898 data => WF_AUTOCANCEL, 3630 data => WF_AUTOCANCEL,
2899 fd => IO::AIO::poll_fileno, 3631 fd => IO::AIO::poll_fileno,
2900 poll => 'r', 3632 poll => 'r',
2901 prio => 6, 3633 prio => 0,
2902 cb => \&IO::AIO::poll_cb, 3634 cb => \&IO::AIO::poll_cb,
2903 ); 3635 );
2904} 3636}
2905 3637
3638my $_log_backtrace;
3639
3640sub _log_backtrace {
3641 my ($msg, @addr) = @_;
3642
3643 $msg =~ s/\n//;
3644
3645 # limit the # of concurrent backtraces
3646 if ($_log_backtrace < 2) {
3647 ++$_log_backtrace;
3648 async {
3649 $Coro::current->{desc} = "abt $msg";
3650
3651 my @bt = fork_call {
3652 @addr = map { sprintf "%x", $_ } @addr;
3653 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3654 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3655 or die "addr2line: $!";
3656
3657 my @funcs;
3658 my @res = <$fh>;
3659 chomp for @res;
3660 while (@res) {
3661 my ($func, $line) = splice @res, 0, 2, ();
3662 push @funcs, "[$func] $line";
3663 }
3664
3665 @funcs
3666 };
3667
3668 LOG llevInfo, "[ABT] $msg\n";
3669 LOG llevInfo, "[ABT] $_\n" for @bt;
3670 --$_log_backtrace;
3671 };
3672 } else {
3673 LOG llevInfo, "[ABT] $msg\n";
3674 LOG llevInfo, "[ABT] [suppressed]\n";
3675 }
3676}
3677
2906# load additional modules 3678# load additional modules
2907use cf::pod; 3679use cf::pod;
2908 3680
2909END { cf::emergency_save } 3681END { cf::emergency_save }
2910 3682

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines