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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines