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.245 by root, Tue Apr 17 10:06:33 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines