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.228 by root, Mon Mar 26 16:53:33 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines