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.211 by root, Tue Feb 13 16:23:32 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 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
61our $RELOAD; # number of reloads so far
48our @EVENT; 62our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 63
51our $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(!)
52our $TICK_WATCHER; 77our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
54our $WRITE_RUNTIME_WATCHER; 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 80our $NEXT_TICK;
56our $NOW; 81our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
58 83
59our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
62our %CFG; 87our %CFG;
63 88
64our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
65our $RUNTIME; 90our $RUNTIME;
66 91
67our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
68our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
69our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 95
76# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
79binmode STDOUT; 103binmode STDOUT;
80binmode STDERR; 104binmode STDERR;
81 105
82# read virtual server time, if available 106# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
87} 111}
88 112
89mkdir cf::localdir; 113mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 115
96our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
97 117
98sub cf::map::normalise; 118sub cf::map::normalise;
99 119
110=item $cf::RUNTIME 130=item $cf::RUNTIME
111 131
112The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 133every server tick.
114 134
115=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 138
117The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
119 143
120=item $cf::NOW 144=item $cf::NOW
121 145
122The time of the last (current) server tick. 146The time of the last (current) server tick.
123 147
124=item $cf::TICK 148=item $cf::TICK
125 149
126The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
127 161
128=item %cf::CFG 162=item %cf::CFG
129 163
130Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 165from wherever your confdir points to.
132 166
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
134 168
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
139 178
140=back 179=back
141 180
142=cut 181=cut
143 182
144BEGIN { 183BEGIN {
145 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 185 my $msg = join "", @_;
147 utf8::encode $msg;
148 186
149 $msg .= "\n" 187 $msg .= "\n"
150 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
151 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
152 LOG llevError, $msg; 193 LOG llevError, $msg;
153 }; 194 };
154} 195}
155 196
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 204
163# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 206# within the Safe compartment.
165for my $pkg (qw( 207for my $pkg (qw(
166 cf::global cf::attachable 208 cf::global cf::attachable
174} 216}
175 217
176$Event::DIED = sub { 218$Event::DIED = sub {
177 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
178}; 220};
221
222#############################################################################
179 223
180=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
181 225
182=over 4 226=over 4
183 227
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 247 $d
204 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
205} 249}
206 250
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
210 252
211Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
212 254
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
221 256
222Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
223 258
224=cut 259=cut
225 260
226sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
228 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
229} 264sub from_json ($) { $json_coder->decode ($_[0]) }
230 265
231=item cf::lock_wait $string 266=item cf::lock_wait $string
232 267
233Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
234 269
237Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
238a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
239for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
240returned. 275returned.
241 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
242Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
244 282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
286
245=cut 287=cut
246 288
247our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
248 291
249sub lock_wait($) { 292sub lock_wait($) {
250 my ($key) = @_; 293 my ($key) = @_;
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
251 299
252 # wait for lock, if any 300 # wait for lock, if any
253 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
254 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
255 Coro::schedule; 303 Coro::schedule;
261 309
262 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
263 lock_wait $key; 311 lock_wait $key;
264 312
265 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
266 315
267 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
268 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
270 } 320 }
271} 321}
272 322
323sub lock_active($) {
324 my ($key) = @_;
325
326 ! ! $LOCK{$key}
327}
328
273sub freeze_mainloop { 329sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 330 return unless $TICK_WATCHER->is_active;
275 331
276 my $guard = Coro::guard { 332 my $guard = Coro::guard {
277 $TICK_WATCHER->start; 333 $TICK_WATCHER->start;
278 $WRITE_RUNTIME_WATCHER->start;
279 }; 334 };
280 $WRITE_RUNTIME_WATCHER->stop;
281 $TICK_WATCHER->stop; 335 $TICK_WATCHER->stop;
282 $guard 336 $guard
337}
338
339=item cf::get_slot $time[, $priority[, $name]]
340
341Allocate $time seconds of blocking CPU time at priority C<$priority>:
342This call blocks and returns only when you have at least C<$time> seconds
343of cpu time till the next tick. The slot is only valid till the next cede.
344
345The optional C<$name> can be used to identify the job to run. It might be
346used for statistical purposes and should identify the same time-class.
347
348Useful for short background jobs.
349
350=cut
351
352our @SLOT_QUEUE;
353our $SLOT_QUEUE;
354
355$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async {
357 my $signal = new Coro::Signal;
358
359 while () {
360 next_job:
361 my $avail = cf::till_tick;
362 if ($avail > 0.01) {
363 for (0 .. $#SLOT_QUEUE) {
364 if ($SLOT_QUEUE[$_][0] < $avail) {
365 my $job = splice @SLOT_QUEUE, $_, 1, ();
366 $job->[2]->send;
367 Coro::cede;
368 goto next_job;
369 }
370 }
371 }
372
373 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait;
377 } else {
378 Coro::schedule;
379 }
380 }
381};
382
383sub get_slot($;$$) {
384 my ($time, $pri, $name) = @_;
385
386 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal;
388
389 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
390 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
391 $SLOT_QUEUE->ready;
392 $sig->wait;
283} 393}
284 394
285=item cf::async { BLOCK } 395=item cf::async { BLOCK }
286 396
287Currently the same as Coro::async_pool, meaning you cannot use 397Currently the same as Coro::async_pool, meaning you cannot use
292 402
293BEGIN { *async = \&Coro::async_pool } 403BEGIN { *async = \&Coro::async_pool }
294 404
295=item cf::sync_job { BLOCK } 405=item cf::sync_job { BLOCK }
296 406
297The design of crossfire+ requires that the main coro ($Coro::main) is 407The design of Crossfire TRT requires that the main coroutine ($Coro::main)
298always able to handle events or runnable, as crossfire+ is only partly 408is always able to handle events or runnable, as Crossfire TRT is only
299reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable.
300 411
301If it must be done, put the blocking parts into C<sync_job>. This will run 412If it must be done, put the blocking parts into C<sync_job>. This will run
302the given BLOCK in another coroutine while waiting for the result. The 413the given BLOCK in another coroutine while waiting for the result. The
303server will be frozen during this time, so the block should either finish 414server will be frozen during this time, so the block should either finish
304fast or be very important. 415fast or be very important.
307 418
308sub sync_job(&) { 419sub sync_job(&) {
309 my ($job) = @_; 420 my ($job) = @_;
310 421
311 if ($Coro::current == $Coro::main) { 422 if ($Coro::current == $Coro::main) {
423 my $time = Event::time;
424
312 # this is the main coro, too bad, we have to block 425 # this is the main coro, too bad, we have to block
313 # till the operation succeeds, freezing the server :/ 426 # till the operation succeeds, freezing the server :/
314 427
315 # TODO: use suspend/resume instead 428 # TODO: use suspend/resume instead
316 # (but this is cancel-safe) 429 # (but this is cancel-safe)
327 440
328 while ($busy) { 441 while ($busy) {
329 Coro::cede or Event::one_event; 442 Coro::cede or Event::one_event;
330 } 443 }
331 444
445 $time = Event::time - $time;
446
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load
451
332 wantarray ? @res : $res[0] 452 wantarray ? @res : $res[0]
333 } else { 453 } else {
334 # we are in another coroutine, how wonderful, everything just works 454 # we are in another coroutine, how wonderful, everything just works
335 455
336 $job->() 456 $job->()
355 $EXT_CORO{$coro+0} = $coro; 475 $EXT_CORO{$coro+0} = $coro;
356 476
357 $coro 477 $coro
358} 478}
359 479
360sub write_runtime { 480=item fork_call { }, $args
361 $TICK_WATCHER->is_active or cf::cleanup "mainloop frozen but runtime active", 1;
362 481
363 my $runtime = cf::localdir . "/runtime"; 482Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling.
364 486
365 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 487=cut
366 or return;
367 488
368 my $value = $cf::RUNTIME + 90 + 10; 489sub fork_call(&@) {
369 # 10 is the runtime save interval, for a monotonic clock 490 my ($cb, @args) = @_;
370 # 60 allows for the watchdog to kill the server.
371 491
372 (aio_write $fh, 0, (length $value), $value, 0) <= 0 492 # we seemingly have to make a local copy of the whole thing,
373 and return; 493 # otherwise perl prematurely frees the stuff :/
494 # TODO: investigate and fix (likely this will be rather laborious)
374 495
375 # always fsync - this file is important 496 my @res = Coro::Util::fork_eval {
376 aio_fsync $fh 497 reset_signals;
377 and return; 498 &$cb
499 }, @args;
378 500
379 close $fh 501 wantarray ? @res : $res[-1]
380 or return; 502}
381 503
382 aio_rename "$runtime~", $runtime 504=item $value = cf::db_get $family => $key
383 and return;
384 505
506Returns a single value from the environment database.
507
508=item cf::db_put $family => $key => $value
509
510Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512
513=cut
514
515our $DB;
516
517sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job {
522 eval {
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
385 1 531 }
532}
533
534sub db_get($$) {
535 my $key = "$_[0]/$_[1]";
536
537 cf::sync_job {
538 BDB::db_get $DB, undef, $key, my $data;
539
540 $! ? ()
541 : $data
542 }
543}
544
545sub db_put($$$) {
546 BDB::dbreq_pri 4;
547 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
548}
549
550=item cf::cache $id => [$paths...], $processversion => $process
551
552Generic caching function that returns the value of the resource $id,
553caching and regenerating as required.
554
555This function can block.
556
557=cut
558
559sub cache {
560 my ($id, $src, $processversion, $process) = @_;
561
562 my $meta =
563 join "\x00",
564 $processversion,
565 map {
566 aio_stat $_
567 and Carp::croak "$_: $!";
568
569 ($_, (stat _)[7,9])
570 } @$src;
571
572 my $dbmeta = db_get cache => "$id/meta";
573 if ($dbmeta ne $meta) {
574 # changed, we may need to process
575
576 my @data;
577 my $md5;
578
579 for (0 .. $#$src) {
580 0 <= aio_load $src->[$_], $data[$_]
581 or Carp::croak "$src->[$_]: $!";
582 }
583
584 # if processing is expensive, check
585 # checksum first
586 if (1) {
587 $md5 =
588 join "\x00",
589 $processversion,
590 map {
591 cf::cede_to_tick;
592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
593 } 0.. $#$src;
594
595
596 my $dbmd5 = db_get cache => "$id/md5";
597 if ($dbmd5 eq $md5) {
598 db_put cache => "$id/meta", $meta;
599
600 return db_get cache => "$id/data";
601 }
602 }
603
604 my $t1 = Time::HiRes::time;
605 my $data = $process->(\@data);
606 my $t2 = Time::HiRes::time;
607
608 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
609
610 db_put cache => "$id/data", $data;
611 db_put cache => "$id/md5" , $md5;
612 db_put cache => "$id/meta", $meta;
613
614 return $data;
615 }
616
617 db_get cache => "$id/data"
618}
619
620=item cf::datalog type => key => value, ...
621
622Log a datalog packet of the given type with the given key-value pairs.
623
624=cut
625
626sub datalog($@) {
627 my ($type, %kv) = @_;
628 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
386} 629}
387 630
388=back 631=back
389 632
390=cut 633=cut
397attach callbacks/event handlers (a collection of which is called an "attachment") 640attach callbacks/event handlers (a collection of which is called an "attachment")
398to it. All such attachable objects support the following methods. 641to it. All such attachable objects support the following methods.
399 642
400In the following description, CLASS can be any of C<global>, C<object> 643In the following description, CLASS can be any of C<global>, C<object>
401C<player>, C<client> or C<map> (i.e. the attachable objects in 644C<player>, C<client> or C<map> (i.e. the attachable objects in
402crossfire+). 645Crossfire TRT).
403 646
404=over 4 647=over 4
405 648
406=item $attachable->attach ($attachment, key => $value...) 649=item $attachable->attach ($attachment, key => $value...)
407 650
570 $registry = $CB_TYPE[$object_type] ||= []; 813 $registry = $CB_TYPE[$object_type] ||= [];
571 814
572 } elsif ($type eq "subtype") { 815 } elsif ($type eq "subtype") {
573 defined $object_type or Carp::croak "subtype specified without type"; 816 defined $object_type or Carp::croak "subtype specified without type";
574 my $object_subtype = shift @arg; 817 my $object_subtype = shift @arg;
575 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 818 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
576 819
577 } elsif ($type eq "package") { 820 } elsif ($type eq "package") {
578 my $pkg = shift @arg; 821 my $pkg = shift @arg;
579 822
580 while (my ($name, $id) = each %cb_id) { 823 while (my ($name, $id) = each %cb_id) {
609 _attach $registry, $klass, @attach; 852 _attach $registry, $klass, @attach;
610 } 853 }
611 854
612 $obj->{$name} = \%arg; 855 $obj->{$name} = \%arg;
613 } else { 856 } else {
614 warn "object uses attachment '$name' that is not available, postponing.\n"; 857 warn "object uses attachment '$name' which is not available, postponing.\n";
615 } 858 }
616 859
617 $obj->{_attachment}{$name} = undef; 860 $obj->{_attachment}{$name} = undef;
618} 861}
619 862
621 if (ref $_[0]) { 864 if (ref $_[0]) {
622 _object_attach @_; 865 _object_attach @_;
623 } else { 866 } else {
624 _attach shift->_attach_registry, @_; 867 _attach shift->_attach_registry, @_;
625 } 868 }
869 _recalc_want;
626}; 870};
627 871
628# all those should be optimised 872# all those should be optimised
629sub cf::attachable::detach { 873sub cf::attachable::detach {
630 my ($obj, $name) = @_; 874 my ($obj, $name) = @_;
633 delete $obj->{_attachment}{$name}; 877 delete $obj->{_attachment}{$name};
634 reattach ($obj); 878 reattach ($obj);
635 } else { 879 } else {
636 Carp::croak "cannot, currently, detach class attachments"; 880 Carp::croak "cannot, currently, detach class attachments";
637 } 881 }
882 _recalc_want;
638}; 883};
639 884
640sub cf::attachable::attached { 885sub cf::attachable::attached {
641 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
642 887
657 "; 902 ";
658 die if $@; 903 die if $@;
659} 904}
660 905
661our $override; 906our $override;
662our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 907our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
663 908
664sub override { 909sub override {
665 $override = 1; 910 $override = 1;
666 @invoke_results = (); 911 @INVOKE_RESULTS = (@_);
667} 912}
668 913
669sub do_invoke { 914sub do_invoke {
670 my $event = shift; 915 my $event = shift;
671 my $callbacks = shift; 916 my $callbacks = shift;
672 917
673 @invoke_results = (); 918 @INVOKE_RESULTS = ();
674 919
675 local $override; 920 local $override;
676 921
677 for (@$callbacks) { 922 for (@$callbacks) {
678 eval { &{$_->[1]} }; 923 eval { &{$_->[1]} };
695 940
696Generate an object-specific event with the given arguments. 941Generate an object-specific event with the given arguments.
697 942
698This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 943This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
699removed in future versions), and there is no public API to access override 944removed in future versions), and there is no public API to access override
700results (if you must, access C<@cf::invoke_results> directly). 945results (if you must, access C<@cf::INVOKE_RESULTS> directly).
701 946
702=back 947=back
703 948
704=cut 949=cut
705 950
706############################################################################# 951#############################################################################
707# object support 952# object support
953#
954
955sub _can_merge {
956 my ($ob1, $ob2) = @_;
957
958 local $Storable::canonical = 1;
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961
962 $fob1 eq $fob2
963}
708 964
709sub reattach { 965sub reattach {
710 # basically do the same as instantiate, without calling instantiate 966 # basically do the same as instantiate, without calling instantiate
711 my ($obj) = @_; 967 my ($obj) = @_;
712 968
756 }, 1012 },
757); 1013);
758 1014
759sub object_freezer_save { 1015sub object_freezer_save {
760 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
761 1019
762 sync_job { 1020 sync_job {
763 if (length $$rdata) { 1021 if (length $$rdata) {
764 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
765 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
789 } 1047 }
790 } else { 1048 } else {
791 aio_unlink $filename; 1049 aio_unlink $filename;
792 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
793 } 1051 }
794
795 #d##TODO# nuke non .map-files if exist
796 if ($filename =~ s/\.map$//) {
797 aio_unlink $filename;
798 aio_unlink "$filename.pst";
799 }
800 } 1052 };
1053
1054 undef $guard;
801} 1055}
802 1056
803sub object_freezer_as_string { 1057sub object_freezer_as_string {
804 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
805 1059
811sub object_thawer_load { 1065sub object_thawer_load {
812 my ($filename) = @_; 1066 my ($filename) = @_;
813 1067
814 my ($data, $av); 1068 my ($data, $av);
815 1069
816 #d#TODO remove .map if file does not exist 1070 my $guard = cf::lock_acquire "io";
817 aio_stat $filename and $filename =~ s/\.map$//;
818 1071
819 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
820 or return; 1073 or return;
821 1074
822 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
823 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
824 or return; 1077 or return;
1078
1079 undef $guard;
825 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
826 } 1081 }
827 1082
828 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
829 $filename, length $data, scalar @{$av || []};#d# 1084 $filename, length $data, scalar @{$av || []};
1085
830 return ($data, $av); 1086 ($data, $av)
831} 1087}
1088
1089=head2 COMMAND CALLBACKS
1090
1091=over 4
1092
1093=cut
832 1094
833############################################################################# 1095#############################################################################
834# command handling &c 1096# command handling &c
835 1097
836=item cf::register_command $name => \&callback($ob,$args); 1098=item cf::register_command $name => \&callback($ob,$args);
849 push @{ $COMMAND{$name} }, [$caller, $cb]; 1111 push @{ $COMMAND{$name} }, [$caller, $cb];
850} 1112}
851 1113
852=item cf::register_extcmd $name => \&callback($pl,$packet); 1114=item cf::register_extcmd $name => \&callback($pl,$packet);
853 1115
854Register a callbackf ro execution when the client sends an extcmd packet. 1116Register a callback for execution when the client sends an (synchronous)
1117extcmd packet. Ext commands will be processed in the order they are
1118received by the server, like other user commands. The first argument is
1119the logged-in player. Ext commands can only be processed after a player
1120has logged in successfully.
855 1121
856If the callback returns something, it is sent back as if reply was being 1122If the callback returns something, it is sent back as if reply was being
857called. 1123called.
858 1124
1125=item cf::register_exticmd $name => \&callback($ns,$packet);
1126
1127Register a callback for execution when the client sends an (asynchronous)
1128exticmd packet. Exti commands are processed by the server as soon as they
1129are received, i.e. out of order w.r.t. other commands. The first argument
1130is a client socket. Exti commands can be received anytime, even before
1131log-in.
1132
1133If the callback returns something, it is sent back as if reply was being
1134called.
1135
859=cut 1136=cut
860 1137
861sub register_extcmd { 1138sub register_extcmd {
862 my ($name, $cb) = @_; 1139 my ($name, $cb) = @_;
863 1140
864 $EXTCMD{$name} = $cb; 1141 $EXTCMD{$name} = $cb;
1142}
1143
1144sub register_exticmd {
1145 my ($name, $cb) = @_;
1146
1147 $EXTICMD{$name} = $cb;
865} 1148}
866 1149
867cf::player->attach ( 1150cf::player->attach (
868 on_command => sub { 1151 on_command => sub {
869 my ($pl, $name, $params) = @_; 1152 my ($pl, $name, $params) = @_;
878 cf::override; 1161 cf::override;
879 }, 1162 },
880 on_extcmd => sub { 1163 on_extcmd => sub {
881 my ($pl, $buf) = @_; 1164 my ($pl, $buf) = @_;
882 1165
883 my $msg = eval { from_json $buf }; 1166 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
884 1167
885 if (ref $msg) { 1168 if (ref $msg) {
1169 my ($type, $reply, @payload) =
1170 "ARRAY" eq ref $msg
1171 ? @$msg
1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1173
1174 my @reply;
1175
886 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1176 if (my $cb = $EXTCMD{$type}) {
887 if (my %reply = $cb->($pl, $msg)) { 1177 @reply = $cb->($pl, @payload);
888 $pl->ext_reply ($msg->{msgid}, %reply);
889 }
890 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
891 } else { 1183 } else {
892 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
893 } 1185 }
894 1186
895 cf::override; 1187 cf::override;
896 }, 1188 },
897); 1189);
898 1190
899sub load_extension {
900 my ($path) = @_;
901
902 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
903 my $base = $1;
904 my $pkg = $1;
905 $pkg =~ s/[^[:word:]]/_/g;
906 $pkg = "ext::$pkg";
907
908 warn "... loading '$path' into '$pkg'\n";
909
910 open my $fh, "<:utf8", $path
911 or die "$path: $!";
912
913 my $source =
914 "package $pkg; use strict; use utf8;\n"
915 . "#line 1 \"$path\"\n{\n"
916 . (do { local $/; <$fh> })
917 . "\n};\n1";
918
919 unless (eval $source) {
920 my $msg = $@ ? "$path: $@\n"
921 : "extension disabled.\n";
922 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
923 warn $@;
924 warn "mandatory extension failed to load, exiting.\n";
925 exit 1;
926 }
927 die $@;
928 }
929
930 push @EXTS, $pkg;
931}
932
933sub load_extensions { 1191sub load_extensions {
1192 cf::sync_job {
1193 my %todo;
1194
934 for my $ext (<$LIBDIR/*.ext>) { 1195 for my $path (<$LIBDIR/*.ext>) {
935 next unless -r $ext; 1196 next unless -r $path;
936 eval { 1197
937 load_extension $ext; 1198 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1199 my $base = $1;
1200 my $pkg = $1;
1201 $pkg =~ s/[^[:word:]]/_/g;
1202 $pkg = "ext::$pkg";
1203
1204 open my $fh, "<:utf8", $path
1205 or die "$path: $!";
1206
1207 my $source = do { local $/; <$fh> };
1208
1209 my %ext = (
1210 path => $path,
1211 base => $base,
1212 pkg => $pkg,
1213 );
1214
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217
1218 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n"
1221 . $source
1222 . "\n};\n1";
1223
1224 $todo{$base} = \%ext;
1225 }
1226
1227 my %done;
1228 while (%todo) {
1229 my $progress;
1230
1231 while (my ($k, $v) = each %todo) {
1232 for (split /,\s*/, $v->{meta}{depends}) {
1233 goto skip
1234 unless exists $done{$_};
1235 }
1236
1237 warn "... loading '$k' into '$v->{pkg}'\n";
1238
1239 unless (eval $v->{source}) {
1240 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n";
1242
1243 if (exists $v->{meta}{mandatory}) {
1244 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n";
1246 exit 1;
1247 }
1248
1249 warn $msg;
1250 }
1251
1252 $done{$k} = delete $todo{$k};
1253 push @EXTS, $v->{pkg};
1254 $progress = 1;
938 1 1255 }
939 } or warn "$ext not loaded: $@"; 1256
1257 skip:
1258 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1259 unless $progress;
1260 }
940 } 1261 };
941} 1262}
942 1263
943############################################################################# 1264#############################################################################
944 1265
1266=back
1267
945=head2 CORE EXTENSIONS 1268=head2 CORE EXTENSIONS
946 1269
947Functions and methods that extend core crossfire objects. 1270Functions and methods that extend core crossfire objects.
948 1271
949=cut 1272=cut
954 1277
955=head3 cf::player 1278=head3 cf::player
956 1279
957=over 4 1280=over 4
958 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
959=item cf::player::find $login 1296=item cf::player::find $login
960 1297
961Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
962 1299
963=cut 1300=cut
964 1301
965sub playerdir($) { 1302sub playerdir($) {
966 cf::localdir 1303 "$PLAYERDIR/"
967 . "/"
968 . cf::playerdir
969 . "/"
970 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1304 . (ref $_[0] ? $_[0]->ob->name : $_[0])
971} 1305}
972 1306
973sub path($) { 1307sub path($) {
974 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1308 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
975 1309
976 (playerdir $login) . "/$login.pl" 1310 (playerdir $login) . "/playerdata"
977} 1311}
978 1312
979sub find_active($) { 1313sub find_active($) {
980 $cf::PLAYER{$_[0]} 1314 $cf::PLAYER{$_[0]}
981 and $cf::PLAYER{$_[0]}->active 1315 and $cf::PLAYER{$_[0]}->active
994 my $login = $_[0]; 1328 my $login = $_[0];
995 1329
996 my $guard = cf::lock_acquire "user_find:$login"; 1330 my $guard = cf::lock_acquire "user_find:$login";
997 1331
998 $cf::PLAYER{$_[0]} || do { 1332 $cf::PLAYER{$_[0]} || do {
999 my $pl = load_pl path $login 1333 # rename old playerfiles to new ones
1334 #TODO: remove when no longer required
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl";
1339
1340 my $f = new_from_file cf::object::thawer path $login
1000 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1001 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1002 } 1349 }
1003 } 1350 }
1004} 1351}
1005 1352
1015 1362
1016 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1017 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1018 1365
1019 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1020 Coro::cede; 1367 cf::cede_to_tick;
1021} 1368}
1022 1369
1023sub new($) { 1370sub new($) {
1024 my ($login) = @_; 1371 my ($login) = @_;
1025 1372
1031 $cf::PLAYER{$login} = $self; 1378 $cf::PLAYER{$login} = $self;
1032 1379
1033 $self 1380 $self
1034} 1381}
1035 1382
1383=item $player->send_msg ($channel, $msg, $color, [extra...])
1384
1385=cut
1386
1387sub send_msg {
1388 my $ns = shift->ns
1389 or return;
1390 $ns->send_msg (@_);
1391}
1392
1036=item $pl->quit_character 1393=item $pl->quit_character
1037 1394
1038Nukes the player without looking back. If logged in, the connection will 1395Nukes the player without looking back. If logged in, the connection will
1039be destroyed. May block for a long time. 1396be destroyed. May block for a long time.
1040 1397
1041=cut 1398=cut
1042 1399
1043sub quit_character { 1400sub quit_character {
1044 my ($pl) = @_; 1401 my ($pl) = @_;
1402
1403 my $name = $pl->ob->name;
1045 1404
1046 $pl->{deny_save} = 1; 1405 $pl->{deny_save} = 1;
1047 $pl->password ("*"); # this should lock out the player until we nuked the dir 1406 $pl->password ("*"); # this should lock out the player until we nuked the dir
1048 1407
1049 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1408 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1054 my $path = playerdir $pl; 1413 my $path = playerdir $pl;
1055 my $temp = "$path~$cf::RUNTIME~deleting~"; 1414 my $temp = "$path~$cf::RUNTIME~deleting~";
1056 aio_rename $path, $temp; 1415 aio_rename $path, $temp;
1057 delete $cf::PLAYER{$pl->ob->name}; 1416 delete $cf::PLAYER{$pl->ob->name};
1058 $pl->destroy; 1417 $pl->destroy;
1418
1419 my $prefix = qr<^~\Q$name\E/>;
1420
1421 # nuke player maps
1422 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1423
1059 IO::AIO::aio_rmtree $temp; 1424 IO::AIO::aio_rmtree $temp;
1425}
1426
1427=item $pl->kick
1428
1429Kicks a player out of the game. This destroys the connection.
1430
1431=cut
1432
1433sub kick {
1434 my ($pl, $kicker) = @_;
1435
1436 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1437 $pl->killer ("kicked");
1438 $pl->ns->destroy;
1060} 1439}
1061 1440
1062=item cf::player::list_logins 1441=item cf::player::list_logins
1063 1442
1064Returns am arrayref of all valid playernames in the system, can take a 1443Returns am arrayref of all valid playernames in the system, can take a
1065while and may block, so not sync_job-capable, ever. 1444while and may block, so not sync_job-capable, ever.
1066 1445
1067=cut 1446=cut
1068 1447
1069sub list_logins { 1448sub list_logins {
1070 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1449 my $dirs = aio_readdir $PLAYERDIR
1071 or return []; 1450 or return [];
1072 1451
1073 my @logins; 1452 my @logins;
1074 1453
1075 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1076 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1077 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1078 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1079 1463
1080 utf8::decode $login; 1464 utf8::decode $login;
1081 push @logins, $login; 1465 push @logins, $login;
1082 } 1466 }
1083 1467
1110 } 1494 }
1111 1495
1112 \@paths 1496 \@paths
1113} 1497}
1114 1498
1499=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1500
1501Expand crossfire pod fragments into protocol xml.
1502
1503=cut
1504
1505sub expand_cfpod {
1506 ((my $self), (local $_)) = @_;
1507
1508 # escape & and <
1509 s/&/&amp;/g;
1510 s/(?<![BIUGHT])</&lt;/g;
1511
1512 # this is buggy, it needs to properly take care of nested <'s
1513
1514 1 while
1515 # replace B<>, I<>, U<> etc.
1516 s/B<([^\>]*)>/<b>$1<\/b>/
1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1520 # replace G<male|female> tags
1521 || s{G<([^>|]*)\|([^>]*)>}{
1522 $self->gender ? $2 : $1
1523 }ge
1524 # replace H<hint text>
1525 || s{H<([^\>]*)>}
1526 {
1527 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1528 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1529 "")
1530 [$self->{hintmode}]
1531 }ge;
1532
1533 # create single paragraphs (very hackish)
1534 s/(?<=\S)\n(?=\w)/ /g;
1535
1536 # compress some whitespace
1537 s/\s+\n/\n/g; # ws line-ends
1538 s/\n\n+/\n/g; # double lines
1539 s/^\n+//; # beginning lines
1540 s/\n+$//; # ending lines
1541
1542 $_
1543}
1544
1545sub hintmode {
1546 $_[0]{hintmode} = $_[1] if @_ > 1;
1547 $_[0]{hintmode}
1548}
1549
1115=item $player->ext_reply ($msgid, $msgtype, %msg) 1550=item $player->ext_reply ($msgid, @msg)
1116 1551
1117Sends an ext reply to the player. 1552Sends an ext reply to the player.
1118 1553
1119=cut 1554=cut
1120 1555
1121sub ext_reply($$$%) { 1556sub ext_reply($$@) {
1122 my ($self, $id, %msg) = @_; 1557 my ($self, $id, @msg) = @_;
1123 1558
1124 $msg{msgid} = $id; 1559 $self->ns->ext_reply ($id, @msg)
1125
1126 $self->send ("ext " . cf::to_json \%msg);
1127} 1560}
1128 1561
1129package cf; 1562=item $player->ext_msg ($type, @msg)
1563
1564Sends an ext event to the client.
1565
1566=cut
1567
1568sub ext_msg($$@) {
1569 my ($self, $type, @msg) = @_;
1570
1571 $self->ns->ext_msg ($type, @msg);
1572}
1573
1574=head3 cf::region
1575
1576=over 4
1577
1578=cut
1579
1580package cf::region;
1581
1582=item cf::region::find_by_path $path
1583
1584Tries to decuce the likely region for a map knowing only its path.
1585
1586=cut
1587
1588sub find_by_path($) {
1589 my ($path) = @_;
1590
1591 my ($match, $specificity);
1592
1593 for my $region (list) {
1594 if ($region->{match} && $path =~ $region->{match}) {
1595 ($match, $specificity) = ($region, $region->specificity)
1596 if $region->specificity > $specificity;
1597 }
1598 }
1599
1600 $match
1601}
1130 1602
1131=back 1603=back
1132
1133 1604
1134=head3 cf::map 1605=head3 cf::map
1135 1606
1136=over 4 1607=over 4
1137 1608
1192 my ($self, $merge) = @_; 1663 my ($self, $merge) = @_;
1193 1664
1194 # we have to keep some variables in memory intact 1665 # we have to keep some variables in memory intact
1195 local $self->{path}; 1666 local $self->{path};
1196 local $self->{load_path}; 1667 local $self->{load_path};
1197 local $self->{deny_save};
1198 local $self->{deny_reset};
1199 1668
1200 $self->SUPER::thawer_merge ($merge); 1669 $self->SUPER::thawer_merge ($merge);
1201} 1670}
1202 1671
1203sub normalise { 1672sub normalise {
1250 $self->init; # pass $1 etc. 1719 $self->init; # pass $1 etc.
1251 return $self; 1720 return $self;
1252 } 1721 }
1253 } 1722 }
1254 1723
1255 Carp::carp "unable to resolve path '$path' (base '$base')."; 1724 Carp::cluck "unable to resolve path '$path' (base '$base').";
1256 () 1725 ()
1257} 1726}
1258 1727
1259sub init { 1728sub init {
1260 my ($self) = @_; 1729 my ($self) = @_;
1275 1744
1276# the original (read-only) location 1745# the original (read-only) location
1277sub load_path { 1746sub load_path {
1278 my ($self) = @_; 1747 my ($self) = @_;
1279 1748
1280 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1749 "$MAPDIR/$self->{path}.map"
1281} 1750}
1282 1751
1283# the temporary/swap location 1752# the temporary/swap location
1284sub save_path { 1753sub save_path {
1285 my ($self) = @_; 1754 my ($self) = @_;
1286 1755
1287 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1756 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1288 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1757 "$TMPDIR/$path.map"
1289} 1758}
1290 1759
1291# the unique path, undef == no special unique path 1760# the unique path, undef == no special unique path
1292sub uniq_path { 1761sub uniq_path {
1293 my ($self) = @_; 1762 my ($self) = @_;
1294 1763
1295 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1764 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1296 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1765 "$UNIQUEDIR/$path"
1297} 1766}
1298 1767
1299# and all this just because we cannot iterate over 1768# and all this just because we cannot iterate over
1300# all maps in C++... 1769# all maps in C++...
1301sub change_all_map_light { 1770sub change_all_map_light {
1303 1772
1304 $_->change_map_light ($change) 1773 $_->change_map_light ($change)
1305 for grep $_->outdoor, values %cf::MAP; 1774 for grep $_->outdoor, values %cf::MAP;
1306} 1775}
1307 1776
1777sub decay_objects {
1778 my ($self) = @_;
1779
1780 return if $self->{deny_reset};
1781
1782 $self->do_decay_objects;
1783}
1784
1308sub unlink_save { 1785sub unlink_save {
1309 my ($self) = @_; 1786 my ($self) = @_;
1310 1787
1311 utf8::encode (my $save = $self->save_path); 1788 utf8::encode (my $save = $self->save_path);
1312 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1789 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1790 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1314
1315 #d#TODO remove .map and also nuke
1316 $save =~ s/\.map// or return;#d#
1317 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1318 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1319} 1791}
1320 1792
1321sub load_header_from($) { 1793sub load_header_from($) {
1322 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1323 1795
1324 utf8::encode $path; 1796 utf8::encode $path;
1325 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1326 # or return;
1327
1328 $self->_load_header ($path)
1329 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1330 1805
1331 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1332 1807
1333 1 1808 1
1334} 1809}
1373 $self->load_header_orig 1848 $self->load_header_orig
1374 or return; 1849 or return;
1375 $self->prepare_orig; 1850 $self->prepare_orig;
1376 } 1851 }
1377 1852
1853 $self->{deny_reset} = 1
1854 if $self->no_reset;
1855
1856 $self->default_region (cf::region::find_by_path $self->{path})
1857 unless $self->default_region;
1858
1378 1 1859 1
1379} 1860}
1380 1861
1381sub find; 1862sub find;
1382sub find { 1863sub find {
1383 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1384 1865
1385 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1386 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1387 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1388 1870
1389 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1390 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1391 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1392 or return; 1876 or return;
1393 1877
1394 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1395 1879
1396 $map->load_header 1880 $map->load_header
1397 or return; 1881 or return;
1398 1882
1399 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1400 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1401 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1402 $map->reset; 1888 $map->reset;
1403 undef $guard;
1404 return find $path; 1889 return find $path;
1405 } 1890 }
1406 1891
1407 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1408 } 1893 }
1415 my ($self) = @_; 1900 my ($self) = @_;
1416 1901
1417 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1418 1903
1419 my $path = $self->{path}; 1904 my $path = $self->{path};
1905
1906 {
1420 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1421 1908
1909 return unless $self->valid;
1422 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1423 1911
1424 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1425 1913
1426 $self->alloc; 1914 $self->alloc;
1427 1915
1428 $self->pre_load; 1916 $self->pre_load;
1917 cf::cede_to_tick;
1429 1918
1430 $self->_load_objects ($self->{load_path}, 1) 1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1921 $self->_load_objects ($f)
1431 or return; 1922 or return;
1432 1923
1433 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1434 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1435 1926
1436 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1437 utf8::encode $uniq; 1928 utf8::encode $uniq;
1438 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1439 $self->clear_unique_items; 1931 $self->clear_unique_items;
1440 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1441 } 1935 }
1442 } 1936 }
1443 1937
1444 Coro::cede; 1938 $f->resolve_delayed_derefs;
1445 1939
1940 cf::cede_to_tick;
1446 # now do the right thing for maps 1941 # now do the right thing for maps
1447 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1448
1449 unless ($self->{deny_activate}) {
1450 $self->decay_objects;
1451 $self->fix_auto_apply;
1452 $self->update_buttons;
1453 Coro::cede;
1454 $self->set_darkness_map;
1455 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1456 unless $self->difficulty; 1944 unless $self->difficulty;
1457 Coro::cede; 1945 cf::cede_to_tick;
1946
1947 unless ($self->{deny_activate}) {
1948 $self->decay_objects;
1949 $self->fix_auto_apply;
1950 $self->update_buttons;
1951 cf::cede_to_tick;
1952 $self->set_darkness_map;
1953 cf::cede_to_tick;
1458 $self->activate; 1954 $self->activate;
1955 }
1956
1957 $self->{last_save} = $cf::RUNTIME;
1958 $self->last_access ($cf::RUNTIME);
1959
1960 $self->in_memory (cf::MAP_IN_MEMORY);
1459 } 1961 }
1460 1962
1461 $self->post_load; 1963 $self->post_load;
1462
1463 $self->in_memory (cf::MAP_IN_MEMORY);
1464} 1964}
1465 1965
1466sub customise_for { 1966sub customise_for {
1467 my ($self, $ob) = @_; 1967 my ($self, $ob) = @_;
1468 1968
1469 return find "~" . $ob->name . "/" . $self->{path} 1969 return find "~" . $ob->name . "/" . $self->{path}
1470 if $self->per_player; 1970 if $self->per_player;
1471 1971
1972# return find "?party/" . $ob->name . "/" . $self->{path}
1973# if $self->per_party;
1974
1472 $self 1975 $self
1473} 1976}
1474 1977
1475# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1476sub load_diag { 1979sub load_neighbours {
1477 my ($map) = @_; 1980 my ($map) = @_;
1478 1981
1479 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1480 1983
1481 for (0 .. 3) { 1984 for (0 .. 3) {
1482 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1483 or next; 1986 or next;
1484 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1485 or next; 1988 or next;
1486 $neigh->load; 1989 $neigh->load;
1487 1990
1991 push @neigh,
1488 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1489 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1490 } 1994 }
1491 1995
1492 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1493 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1494 or next; 1999 or next;
1495 $neigh->load; 2000 $neigh->load;
1496 } 2001 }
1497} 2002}
1498 2003
1503} 2008}
1504 2009
1505sub do_load_sync { 2010sub do_load_sync {
1506 my ($map) = @_; 2011 my ($map) = @_;
1507 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1508 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1509} 2017}
1510 2018
1511our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1512our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1513 2021
1514sub find_async { 2022sub find_async {
1515 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1516 2024
1517 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
1518 2026
1519 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
1520 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1521 } 2029 }
1522 2030
1523 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
1524 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
1525 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
1526 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
1527 my $map = find $path 2036 if (my $map = find $k) {
1528 or next;
1529 $map->load; 2037 $map->load if $v;
2038 }
1530 2039
1531 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
1532 } 2041 }
1533 } 2042 }
1534 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
1535 }; 2044 };
1536 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
1539} 2048}
1540 2049
1541sub save { 2050sub save {
1542 my ($self) = @_; 2051 my ($self) = @_;
1543 2052
1544 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1545 2054
1546 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
1547 2056
1548 return unless $self->dirty; 2057 return unless $self->dirty;
1549 2058
1572 my ($self) = @_; 2081 my ($self) = @_;
1573 2082
1574 # save first because save cedes 2083 # save first because save cedes
1575 $self->save; 2084 $self->save;
1576 2085
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 2087
1579 return if $self->players; 2088 return if $self->players;
1580 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
1581 return if $self->{deny_save}; 2090 return if $self->{deny_save};
1582 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
1583 $self->clear; 2096 $self->clear;
1584 $self->in_memory (cf::MAP_SWAPPED);
1585} 2097}
1586 2098
1587sub reset_at { 2099sub reset_at {
1588 my ($self) = @_; 2100 my ($self) = @_;
1589 2101
1590 # TODO: safety, remove and allow resettable per-player maps 2102 # TODO: safety, remove and allow resettable per-player maps
1591 return 1e99 if $self->isa ("ext::map_per_player");#d#
1592 return 1e99 if $self->{deny_reset}; 2103 return 1e99 if $self->{deny_reset};
1593 2104
1594 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2105 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1595 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2106 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1596 2107
1607 my ($self) = @_; 2118 my ($self) = @_;
1608 2119
1609 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2120 my $lock = cf::lock_acquire "map_data:$self->{path}";
1610 2121
1611 return if $self->players; 2122 return if $self->players;
1612 return if $self->isa ("ext::map_per_player");#d#
1613 2123
1614 warn "resetting map ", $self->path;#d# 2124 warn "resetting map ", $self->path;
1615 2125
1616 $self->in_memory (cf::MAP_SWAPPED); 2126 $self->in_memory (cf::MAP_SWAPPED);
1617 2127
1618 # need to save uniques path 2128 # need to save uniques path
1619 unless ($self->{deny_save}) { 2129 unless ($self->{deny_save}) {
1623 if $uniq; 2133 if $uniq;
1624 } 2134 }
1625 2135
1626 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
1627 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
1628 $self->clear; 2140 $self->clear;
1629
1630 $_->clear_links_to ($self) for values %cf::MAP;
1631 2141
1632 $self->unlink_save; 2142 $self->unlink_save;
1633 $self->destroy; 2143 $self->destroy;
1634} 2144}
1635 2145
1636my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
1637 2147
1638sub nuke { 2148sub nuke {
1639 my ($self) = @_; 2149 my ($self) = @_;
1640 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
1641 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
1642 2155
1643 $self->unlink_save; 2156 $self->unlink_save;
1644 2157
1645 bless $self, "cf::map"; 2158 bless $self, "cf::map";
1646 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
1647 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
1648 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
1649 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1650 2163
1651 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
1652 2166
1653 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2168}
2169
2170=item $maps = cf::map::tmp_maps
2171
2172Returns an arrayref with all map paths of currently instantiated and saved
2173maps. May block.
2174
2175=cut
2176
2177sub tmp_maps() {
2178 [
2179 map {
2180 utf8::decode $_;
2181 /\.map$/
2182 ? normalise $_
2183 : ()
2184 } @{ aio_readdir $TMPDIR or [] }
2185 ]
2186}
2187
2188=item $maps = cf::map::random_maps
2189
2190Returns an arrayref with all map paths of currently instantiated and saved
2191random maps. May block.
2192
2193=cut
2194
2195sub random_maps() {
2196 [
2197 map {
2198 utf8::decode $_;
2199 /\.map$/
2200 ? normalise "?random/$_"
2201 : ()
2202 } @{ aio_readdir $RANDOMDIR or [] }
2203 ]
1654} 2204}
1655 2205
1656=item cf::map::unique_maps 2206=item cf::map::unique_maps
1657 2207
1658Returns an arrayref of paths of all shared maps that have 2208Returns an arrayref of paths of all shared maps that have
1659instantiated unique items. May block. 2209instantiated unique items. May block.
1660 2210
1661=cut 2211=cut
1662 2212
1663sub unique_maps() { 2213sub unique_maps() {
1664 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2214 [
1665 or return; 2215 map {
1666
1667 my @paths;
1668
1669 for (@$files) {
1670 utf8::decode $_; 2216 utf8::decode $_;
1671 next if /\.pst$/; 2217 /\.map$/
1672 next unless /^$PATH_SEP/o; 2218 ? normalise $_
1673 2219 : ()
1674 push @paths, cf::map::normalise $_; 2220 } @{ aio_readdir $UNIQUEDIR or [] }
1675 } 2221 ]
1676
1677 \@paths
1678} 2222}
1679 2223
1680package cf; 2224package cf;
1681 2225
1682=back 2226=back
1700 map { $_, inv_recursive_ $_->inv } @_ 2244 map { $_, inv_recursive_ $_->inv } @_
1701} 2245}
1702 2246
1703sub inv_recursive { 2247sub inv_recursive {
1704 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2249}
2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
1705} 2280}
1706 2281
1707package cf; 2282package cf;
1708 2283
1709=back 2284=back
1728 2303
1729 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2304 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1730 2305
1731 if ($self->{record_replies}) { 2306 if ($self->{record_replies}) {
1732 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2307 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2308
1733 } else { 2309 } else {
2310 my $pl = $self->contr;
2311
2312 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2313 my $dialog = $pl->{npc_dialog};
2314 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2315
2316 } else {
1734 $msg = $npc->name . " says: $msg" if $npc; 2317 $msg = $npc->name . " says: $msg" if $npc;
1735 $self->message ($msg, $flags); 2318 $self->message ($msg, $flags);
2319 }
1736 } 2320 }
2321}
2322
2323=item $object->send_msg ($channel, $msg, $color, [extra...])
2324
2325=cut
2326
2327sub cf::object::send_msg {
2328 my $pl = shift->contr
2329 or return;
2330 $pl->send_msg (@_);
1737} 2331}
1738 2332
1739=item $player_object->may ("access") 2333=item $player_object->may ("access")
1740 2334
1741Returns wether the given player is authorized to access resource "access" 2335Returns wether the given player is authorized to access resource "access"
1788 $self->deactivate_recursive; 2382 $self->deactivate_recursive;
1789 2383
1790 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2384 return if UNIVERSAL::isa $self->map, "ext::map_link";
1791 2385
1792 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2386 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1793 if $self->map; 2387 if $self->map && $self->map->{path} ne "{link}";
1794 2388
1795 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2389 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1796} 2390}
1797 2391
1798sub cf::object::player::leave_link { 2392sub cf::object::player::leave_link {
1799 my ($self, $map, $x, $y) = @_; 2393 my ($self, $map, $x, $y) = @_;
2394
2395 return unless $self->contr->active;
1800 2396
1801 my $link_pos = delete $self->{_link_pos}; 2397 my $link_pos = delete $self->{_link_pos};
1802 2398
1803 unless ($map) { 2399 unless ($map) {
1804 # restore original map position 2400 # restore original map position
1818 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
1819 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
1820 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
1821 2417
1822 $map->load; 2418 $map->load;
1823 $map->load_diag; 2419 $map->load_neighbours;
1824 2420
1825 return unless $self->contr->active; 2421 return unless $self->contr->active;
1826 $self->activate_recursive; 2422 $self->activate_recursive;
2423
2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 2425 $self->enter_map ($map, $x, $y);
1828} 2426}
1829 2427
1830cf::player->attach ( 2428=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1831 on_logout => sub {
1832 my ($pl) = @_;
1833 2429
1834 # abort map switching before logout 2430Moves the player to the given map-path and coordinates by first freezing
1835 if ($pl->ob->{_link_pos}) { 2431her, loading and preparing them map, calling the provided $check callback
1836 cf::sync_job { 2432that has to return the map if sucecssful, and then unfreezes the player on
1837 $pl->ob->leave_link 2433the new (success) or old (failed) map position. In either case, $done will
1838 }; 2434be called at the end of this process.
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843 2435
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 # we need this sleep as the login has a concurrent enter_exit running
1850 # and this sleep increases chances of the player not ending up in scorn
1851 $pl->ob->reply (undef,
1852 "There was an internal problem at your last logout, "
1853 . "the server will try to bring you to your intended destination in a second.",
1854 cf::NDI_RED);
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y)
1863
1864=cut 2436=cut
2437
2438our $GOTOGEN;
1865 2439
1866sub cf::object::player::goto { 2440sub cf::object::player::goto {
1867 my ($self, $path, $x, $y) = @_; 2441 my ($self, $path, $x, $y, $check, $done) = @_;
2442
2443 # do generation counting so two concurrent goto's will be executed in-order
2444 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1868 2445
1869 $self->enter_link; 2446 $self->enter_link;
1870 2447
1871 (async { 2448 (async {
1872 my $map = eval { 2449 my $map = eval {
1873 my $map = cf::map::find $path; 2450 my $map = cf::map::find $path;
2451
2452 if ($map) {
1874 $map = $map->customise_for ($self) if $map; 2453 $map = $map->customise_for ($self);
2454 $map = $check->($map) if $check && $map;
2455 } else {
2456 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2457 }
2458
1875 $map 2459 $map
2460 };
2461
2462 if ($@) {
2463 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2464 LOG llevError | logBacktrace, Carp::longmess $@;
1876 } or 2465 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 2466
2467 if ($gen == $self->{_goto_generation}) {
2468 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 2469 $self->leave_link ($map, $x, $y);
2470 }
2471
2472 $done->() if $done;
1880 })->prio (1); 2473 })->prio (1);
1881} 2474}
1882 2475
1883=item $player_object->enter_exit ($exit_object) 2476=item $player_object->enter_exit ($exit_object)
1884 2477
1923 2516
1924 $rmp->{random_seed} ||= $exit->random_seed; 2517 $rmp->{random_seed} ||= $exit->random_seed;
1925 2518
1926 my $data = cf::to_json $rmp; 2519 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2520 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2521 my $meta = "$RANDOMDIR/$md5.meta";
1929 2522
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2523 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2524 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2525 undef $fh;
1933 aio_rename "$meta~", $meta; 2526 aio_rename "$meta~", $meta;
1942 2535
1943 return unless $self->type == cf::PLAYER; 2536 return unless $self->type == cf::PLAYER;
1944 2537
1945 if ($exit->slaying eq "/!") { 2538 if ($exit->slaying eq "/!") {
1946 #TODO: this should de-fi-ni-te-ly not be a sync-job 2539 #TODO: this should de-fi-ni-te-ly not be a sync-job
2540 # the problem is that $exit might not survive long enough
2541 # so it needs to be done right now, right here
1947 cf::sync_job { prepare_random_map $exit }; 2542 cf::sync_job { prepare_random_map $exit };
1948 } 2543 }
1949 2544
1950 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2545 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951 my $hp = $exit->stats->hp; 2546 my $hp = $exit->stats->hp;
1952 my $sp = $exit->stats->sp; 2547 my $sp = $exit->stats->sp;
1953 2548
1954 $self->enter_link; 2549 $self->enter_link;
2550
2551 # if exit is damned, update players death & WoR home-position
2552 $self->contr->savebed ($slaying, $hp, $sp)
2553 if $exit->flag (FLAG_DAMNED);
1955 2554
1956 (async { 2555 (async {
1957 $self->deactivate_recursive; # just to be sure 2556 $self->deactivate_recursive; # just to be sure
1958 unless (eval { 2557 unless (eval {
1959 $self->goto ($slaying, $hp, $sp); 2558 $self->goto ($slaying, $hp, $sp);
1960 2559
1961 1; 2560 1;
1962 }) { 2561 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2562 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "I'll try to bring you back to the map you were before. " 2563 . "I'll try to bring you back to the map you were before. "
1965 . "Please report this to the dungeon master!", 2564 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2565 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2566
1968 warn "ERROR in enter_exit: $@"; 2567 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2568 $self->leave_link;
1970 } 2569 }
1971 })->prio (1); 2570 })->prio (1);
1984 2583
1985sub cf::client::send_drawinfo { 2584sub cf::client::send_drawinfo {
1986 my ($self, $text, $flags) = @_; 2585 my ($self, $text, $flags) = @_;
1987 2586
1988 utf8::encode $text; 2587 utf8::encode $text;
1989 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2588 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1990} 2589}
1991 2590
2591=item $client->send_msg ($channel, $msg, $color, [extra...])
2592
2593Send a drawinfo or msg packet to the client, formatting the msg for the
2594client if neccessary. C<$type> should be a string identifying the type of
2595the message, with C<log> being the default. If C<$color> is negative, suppress
2596the message unless the client supports the msg packet.
2597
2598=cut
2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2615sub cf::client::send_msg {
2616 my ($self, $channel, $msg, $color, @extra) = @_;
2617
2618 $msg = $self->pl->expand_cfpod ($msg);
2619
2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2624
2625 if (ref $channel) {
2626 # send meta info to client, if not yet sent
2627 unless (exists $self->{channel}{$channel->{id}}) {
2628 $self->{channel}{$channel->{id}} = $channel;
2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2631 }
2632
2633 $channel = $channel->{id};
2634 }
2635
2636 return unless @extra || length $msg;
2637
2638 if ($self->can_msg) {
2639 # default colour, mask it out
2640 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2641 if $color & cf::NDI_DEF;
2642
2643 $self->send_packet ("msg " . $self->{json_coder}->encode (
2644 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2645 } else {
2646 if ($color >= 0) {
2647 # replace some tags by gcfclient-compatible ones
2648 for ($msg) {
2649 1 while
2650 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2651 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2652 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2653 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2654 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2655 }
2656
2657 $color &= cf::NDI_COLOR_MASK;
2658
2659 utf8::encode $msg;
2660
2661 if (0 && $msg =~ /\[/) {
2662 # COMMAND/INFO
2663 $self->send_packet ("drawextinfo $color 10 8 $msg")
2664 } else {
2665 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2666 $self->send_packet ("drawinfo $color $msg")
2667 }
2668 }
2669 }
2670}
2671
2672=item $client->ext_msg ($type, @msg)
2673
2674Sends an ext event to the client.
2675
2676=cut
2677
2678sub cf::client::ext_msg($$@) {
2679 my ($self, $type, @msg) = @_;
2680
2681 if ($self->extcmd == 2) {
2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2683 } elsif ($self->extcmd == 1) { # TODO: remove
2684 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2704 }
2705}
1992 2706
1993=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
1994 2708
1995Queues a query to the client, calling the given callback with 2709Queues a query to the client, calling the given callback with
1996the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2710the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1997C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2711C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1998 2712
1999Queries can fail, so check the return code. Or don't, as queries will become 2713Queries can fail, so check the return code. Or don't, as queries will
2000reliable at some point in the future. 2714become reliable at some point in the future.
2001 2715
2002=cut 2716=cut
2003 2717
2004sub cf::client::query { 2718sub cf::client::query {
2005 my ($self, $flags, $text, $cb) = @_; 2719 my ($self, $flags, $text, $cb) = @_;
2013 utf8::encode $text; 2727 utf8::encode $text;
2014 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2728 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2015 2729
2016 $self->send_packet ($self->{query_queue}[0][0]) 2730 $self->send_packet ($self->{query_queue}[0][0])
2017 if @{ $self->{query_queue} } == 1; 2731 if @{ $self->{query_queue} } == 1;
2732
2733 1
2018} 2734}
2019 2735
2020cf::client->attach ( 2736cf::client->attach (
2737 on_connect => sub {
2738 my ($ns) = @_;
2739
2740 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2741 },
2021 on_reply => sub { 2742 on_reply => sub {
2022 my ($ns, $msg) = @_; 2743 my ($ns, $msg) = @_;
2023 2744
2024 # this weird shuffling is so that direct followup queries 2745 # this weird shuffling is so that direct followup queries
2025 # get handled first 2746 # get handled first
2037 } else { 2758 } else {
2038 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2759 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2039 } 2760 }
2040 } 2761 }
2041 }, 2762 },
2763 on_exticmd => sub {
2764 my ($ns, $buf) = @_;
2765
2766 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2767
2768 if (ref $msg) {
2769 my ($type, $reply, @payload) =
2770 "ARRAY" eq ref $msg
2771 ? @$msg
2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2773
2774 my @reply;
2775
2776 if (my $cb = $EXTICMD{$type}) {
2777 @reply = $cb->($ns, @payload);
2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2783 } else {
2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2785 }
2786
2787 cf::override;
2788 },
2042); 2789);
2043 2790
2044=item $client->async (\&cb) 2791=item $client->async (\&cb)
2045 2792
2046Create a new coroutine, running the specified callback. The coroutine will 2793Create a new coroutine, running the specified callback. The coroutine will
2087our $safe = new Safe "safe"; 2834our $safe = new Safe "safe";
2088our $safe_hole = new Safe::Hole; 2835our $safe_hole = new Safe::Hole;
2089 2836
2090$SIG{FPE} = 'IGNORE'; 2837$SIG{FPE} = 'IGNORE';
2091 2838
2092$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2839$safe->permit_only (Opcode::opset qw(
2840 :base_core :base_mem :base_orig :base_math
2841 grepstart grepwhile mapstart mapwhile
2842 sort time
2843));
2093 2844
2094# here we export the classes and methods available to script code 2845# here we export the classes and methods available to script code
2095 2846
2096=pod 2847=pod
2097 2848
2098The following fucntions and emthods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2099 2850
2100 cf::object contr pay_amount pay_player map 2851 cf::object
2852 contr pay_amount pay_player map x y force_find force_add
2853 insert remove name archname title slaying race decrease_ob_nr
2854
2101 cf::object::player player 2855 cf::object::player
2102 cf::player peaceful 2856 player
2103 cf::map trigger 2857
2858 cf::player
2859 peaceful
2860
2861 cf::map
2862 trigger
2104 2863
2105=cut 2864=cut
2106 2865
2107for ( 2866for (
2108 ["cf::object" => qw(contr pay_amount pay_player map)], 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2109 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2110 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2111 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2112) { 2873) {
2113 no strict 'refs'; 2874 no strict 'refs';
2184=back 2945=back
2185 2946
2186=cut 2947=cut
2187 2948
2188############################################################################# 2949#############################################################################
2189
2190=head2 EXTENSION DATABASE SUPPORT
2191
2192Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which
2194excludes objects.
2195
2196The parameter C<$family> should best start with the name of the extension
2197using it, it should be unique.
2198
2199=over 4
2200
2201=item $value = cf::db_get $family => $key
2202
2203Returns a single value from the database.
2204
2205=item cf::db_put $family => $key => $value
2206
2207Stores the given C<$value> in the family.
2208
2209=cut
2210
2211our $DB;
2212
2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2258}
2259
2260#############################################################################
2261# the server's init and main functions 2950# the server's init and main functions
2262 2951
2263sub load_resources { 2952sub load_facedata($) {
2264 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2953 my ($path) = @_;
2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2961 warn "loading facedata from $path\n";
2962
2963 my $facedata;
2964 0 < aio_load $path, $facedata
2965 or die "$path: $!";
2966
2967 $facedata = Coro::Storable::thaw $facedata;
2968
2969 $facedata->{version} == 2
2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2978
2979 {
2980 my $faces = $facedata->{faceinfo};
2981
2982 while (my ($face, $info) = each %$faces) {
2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2984 cf::face::set_visibility $idx, $info->{visibility};
2985 cf::face::set_magicmap $idx, $info->{magicmap};
2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2988
2989 cf::cede_to_tick;
2990 }
2991
2992 while (my ($face, $info) = each %$faces) {
2993 next unless $info->{smooth};
2994 my $idx = cf::face::find $face
2995 or next;
2996 if (my $smooth = cf::face::find $info->{smooth}) {
2997 cf::face::set_smooth $idx, $smooth;
2998 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2999 } else {
3000 warn "smooth face '$info->{smooth}' not found for face '$face'";
3001 }
3002
3003 cf::cede_to_tick;
3004 }
3005 }
3006
3007 {
3008 my $anims = $facedata->{animinfo};
3009
3010 while (my ($anim, $info) = each %$anims) {
3011 cf::anim::set $anim, $info->{frames}, $info->{facings};
3012 cf::cede_to_tick;
3013 }
3014
3015 cf::anim::invalidate_all; # d'oh
3016 }
3017
3018 {
3019 # TODO: for gcfclient pleasure, we should give resources
3020 # that gcfclient doesn't grok a >10000 face index.
3021 my $res = $facedata->{resource};
3022
3023 my $soundconf = delete $res->{"res/sound.conf"};
3024
3025 while (my ($name, $info) = each %$res) {
3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
3028
3029 if ($info->{type} & 1) {
3030 # prepend meta info
3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
3037 $data = pack "(w/a*)*", $meta, $info->{data};
3038 } else {
3039 $data = $info->{data};
3040 }
3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3043 cf::face::set_type $idx, $info->{type};
3044
3045 cf::cede_to_tick;
3046 }
3047
3048 if ($soundconf) {
3049 $soundconf = $enc->decode (delete $soundconf->{data});
3050
3051 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3052 my $sound = $soundconf->{compat}[$_]
3053 or next;
3054
3055 my $face = cf::face::find "sound/$sound->[1]";
3056 cf::sound::set $sound->[0] => $face;
3057 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3058 }
3059
3060 while (my ($k, $v) = each %{$soundconf->{event}}) {
3061 my $face = cf::face::find "sound/$v";
3062 cf::sound::set $k => $face;
3063 }
3064 }
3065 }
3066
3067 1
3068}
3069
3070register_exticmd fx_want => sub {
3071 my ($ns, $want) = @_;
3072
3073 while (my ($k, $v) = each %$want) {
3074 $ns->fx_want ($k, $v);
3075 }
3076};
3077
3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
3083 load_resource_file "$MAPDIR/regions"
2265 or die "unable to load regions file\n";#d# 3084 or die "unable to load regions file\n";
2266}
2267 3085
2268sub cfg_load { 3086 for (cf::region::list) {
3087 $_->{match} = qr/$_->{match}/
3088 if exists $_->{match};
3089 }
3090}
3091
3092sub reload_facedata {
3093 load_facedata "$DATADIR/facedata"
3094 or die "unable to load facedata\n";
3095}
3096
3097sub reload_archetypes {
3098 load_resource_file "$DATADIR/archetypes"
3099 or die "unable to load archetypes\n";
3100 #d# NEED to laod twice to resolve forward references
3101 # this really needs to be done in an extra post-pass
3102 # (which needs to be synchronous, so solve it differently)
3103 load_resource_file "$DATADIR/archetypes"
3104 or die "unable to load archetypes\n";
3105}
3106
3107sub reload_treasures {
3108 load_resource_file "$DATADIR/treasures"
3109 or die "unable to load treasurelists\n";
3110}
3111
3112sub reload_resources {
3113 warn "reloading resource files...\n";
3114
3115 reload_regions;
3116 reload_facedata;
3117 #reload_archetypes;#d#
3118 reload_archetypes;
3119 reload_treasures;
3120
3121 warn "finished reloading resource files\n";
3122}
3123
3124sub init {
3125 reload_resources;
3126}
3127
3128sub reload_config {
2269 open my $fh, "<:utf8", cf::confdir . "/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
2270 or return; 3130 or return;
2271 3131
2272 local $/; 3132 local $/;
2273 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
2274 3134
2282 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3142 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2283 and die "WARNING: m(un)lockall failed: $!\n"; 3143 and die "WARNING: m(un)lockall failed: $!\n";
2284 }; 3144 };
2285 warn $@ if $@; 3145 warn $@ if $@;
2286 } 3146 }
2287}
2288
2289sub init {
2290 load_resources;
2291} 3147}
2292 3148
2293sub main { 3149sub main {
2294 # we must not ever block the main coroutine 3150 # we must not ever block the main coroutine
2295 local $Coro::idle = sub { 3151 local $Coro::idle = sub {
2297 (async { 3153 (async {
2298 Event::one_event; 3154 Event::one_event;
2299 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
2300 }; 3156 };
2301 3157
2302 cfg_load; 3158 reload_config;
2303 db_init; 3159 db_init;
2304 load_extensions; 3160 load_extensions;
2305 3161
2306 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
2307 Event::loop; 3163 Event::loop;
2323 }, 3179 },
2324 ); 3180 );
2325 } 3181 }
2326} 3182}
2327 3183
3184sub write_runtime {
3185 my $runtime = "$LOCALDIR/runtime";
3186
3187 # first touch the runtime file to show we are still running:
3188 # the fsync below can take a very very long time.
3189
3190 IO::AIO::aio_utime $runtime, undef, undef;
3191
3192 my $guard = cf::lock_acquire "write_runtime";
3193
3194 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3195 or return;
3196
3197 my $value = $cf::RUNTIME + 90 + 10;
3198 # 10 is the runtime save interval, for a monotonic clock
3199 # 60 allows for the watchdog to kill the server.
3200
3201 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3202 and return;
3203
3204 # always fsync - this file is important
3205 aio_fsync $fh
3206 and return;
3207
3208 # touch it again to show we are up-to-date
3209 aio_utime $fh, undef, undef;
3210
3211 close $fh
3212 or return;
3213
3214 aio_rename "$runtime~", $runtime
3215 and return;
3216
3217 warn "runtime file written.\n";
3218
3219 1
3220}
3221
2328sub emergency_save() { 3222sub emergency_save() {
2329 my $freeze_guard = cf::freeze_mainloop; 3223 my $freeze_guard = cf::freeze_mainloop;
2330 3224
2331 warn "enter emergency perl save\n"; 3225 warn "enter emergency perl save\n";
2332 3226
2363 3257
2364 warn Carp::longmess "post_cleanup backtrace" 3258 warn Carp::longmess "post_cleanup backtrace"
2365 if $make_core; 3259 if $make_core;
2366} 3260}
2367 3261
2368sub reload() { 3262sub do_reload_perl() {
2369 # can/must only be called in main 3263 # can/must only be called in main
2370 if ($Coro::current != $Coro::main) { 3264 if ($Coro::current != $Coro::main) {
2371 warn "can only reload from main coroutine"; 3265 warn "can only reload from main coroutine";
2372 return; 3266 return;
2373 } 3267 }
2374 3268
2375 warn "reloading..."; 3269 warn "reloading...";
2376 3270
2377 warn "cancelling server ticker"; 3271 warn "entering sync_job";
2378 $TICK_WATCHER->cancel;
2379 3272
3273 cf::sync_job {
3274 cf::write_runtime; # external watchdog should not bark
2380 cf::emergency_save; 3275 cf::emergency_save;
3276 cf::write_runtime; # external watchdog should not bark
2381 3277
2382 eval { 3278 warn "syncing database to disk";
3279 BDB::db_env_txn_checkpoint $DB_ENV;
3280
2383 # if anything goes wrong in here, we should simply crash as we already saved 3281 # if anything goes wrong in here, we should simply crash as we already saved
2384 3282
2385 warn "cancelling all WF_AUTOCANCEL watchers"; 3283 warn "cancelling all WF_AUTOCANCEL watchers";
2386 for (Event::all_watchers) { 3284 for (Event::all_watchers) {
2387 $_->cancel if $_->data & WF_AUTOCANCEL; 3285 $_->cancel if $_->data & WF_AUTOCANCEL;
2388 } 3286 }
2389
2390 warn "syncing database to disk";
2391 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2392 3287
2393 warn "flushing outstanding aio requests"; 3288 warn "flushing outstanding aio requests";
2394 for (;;) { 3289 for (;;) {
2395 BDB::flush; 3290 BDB::flush;
2396 IO::AIO::flush; 3291 IO::AIO::flush;
2397 Coro::cede; 3292 Coro::cede;
2398 last unless IO::AIO::nreqs || BDB::nreqs; 3293 last unless IO::AIO::nreqs || BDB::nreqs;
2399 warn "iterate..."; 3294 warn "iterate...";
2400 } 3295 }
2401 3296
3297 ++$RELOAD;
3298
2402 warn "cancelling all extension coros"; 3299 warn "cancelling all extension coros";
2403 $_->cancel for values %EXT_CORO; 3300 $_->cancel for values %EXT_CORO;
2404 %EXT_CORO = (); 3301 %EXT_CORO = ();
2405 3302
2406 warn "removing commands"; 3303 warn "removing commands";
2407 %COMMAND = (); 3304 %COMMAND = ();
2408 3305
2409 warn "removing ext commands"; 3306 warn "removing ext/exti commands";
2410 %EXTCMD = (); 3307 %EXTCMD = ();
3308 %EXTICMD = ();
2411 3309
2412 warn "unloading/nuking all extensions"; 3310 warn "unloading/nuking all extensions";
2413 for my $pkg (@EXTS) { 3311 for my $pkg (@EXTS) {
2414 warn "... unloading $pkg"; 3312 warn "... unloading $pkg";
2415 3313
2445 Symbol::delete_package "safe::$_" 3343 Symbol::delete_package "safe::$_"
2446 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3344 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2447 3345
2448 warn "unloading cf.pm \"a bit\""; 3346 warn "unloading cf.pm \"a bit\"";
2449 delete $INC{"cf.pm"}; 3347 delete $INC{"cf.pm"};
3348 delete $INC{"cf/pod.pm"};
2450 3349
2451 # don't, removes xs symbols, too, 3350 # don't, removes xs symbols, too,
2452 # and global variables created in xs 3351 # and global variables created in xs
2453 #Symbol::delete_package __PACKAGE__; 3352 #Symbol::delete_package __PACKAGE__;
2454 3353
2457 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
2458 require cf; 3357 require cf;
2459 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2460 3359
2461 warn "loading config and database again"; 3360 warn "loading config and database again";
2462 cf::cfg_load; 3361 cf::reload_config;
2463 3362
2464 warn "loading extensions"; 3363 warn "loading extensions";
2465 cf::load_extensions; 3364 cf::load_extensions;
2466 3365
2467 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
2468 _global_reattach; 3367 _global_reattach; # objects, sockets
2469 warn "reattaching attachments to maps"; 3368 warn "reattaching attachments to maps";
2470 reattach $_ for values %MAP; 3369 reattach $_ for values %MAP;
3370 warn "reattaching attachments to players";
3371 reattach $_ for values %PLAYER;
2471 3372
2472 warn "loading reloadable resources"; 3373 warn "leaving sync_job";
2473 load_resources;
2474 3374
2475 warn "restarting server ticker"; 3375 1
2476 3376 } or do {
2477 $TICK_WATCHER->start;
2478 };
2479
2480 if ($@) {
2481 warn $@; 3377 warn $@;
2482 warn "error while reloading, exiting."; 3378 warn "error while reloading, exiting.";
2483 exit 1; 3379 exit 1;
2484 } 3380 };
2485 3381
2486 warn "reloaded"; 3382 warn "reloaded";
2487}; 3383};
2488 3384
2489our $RELOAD_WATCHER; # used only during reload 3385our $RELOAD_WATCHER; # used only during reload
2490 3386
3387sub reload_perl() {
3388 # doing reload synchronously and two reloads happen back-to-back,
3389 # coro crashes during coro_state_free->destroy here.
3390
3391 $RELOAD_WATCHER ||= Event->timer (
3392 reentrant => 0,
3393 after => 0,
3394 data => WF_AUTOCANCEL,
3395 cb => sub {
3396 do_reload_perl;
3397 undef $RELOAD_WATCHER;
3398 },
3399 );
3400}
3401
2491register_command "reload" => sub { 3402register_command "reload" => sub {
2492 my ($who, $arg) = @_; 3403 my ($who, $arg) = @_;
2493 3404
2494 if ($who->flag (FLAG_WIZ)) { 3405 if ($who->flag (FLAG_WIZ)) {
2495 $who->message ("reloading server."); 3406 $who->message ("reloading server.");
2496 3407 async { reload_perl };
2497 # doing reload synchronously and two reloads happen back-to-back,
2498 # coro crashes during coro_state_free->destroy here.
2499
2500 $RELOAD_WATCHER ||= Event->timer (
2501 reentrant => 0,
2502 after => 0,
2503 data => WF_AUTOCANCEL,
2504 cb => sub {
2505 reload;
2506 undef $RELOAD_WATCHER;
2507 },
2508 );
2509 } 3408 }
2510}; 3409};
2511 3410
2512unshift @INC, $LIBDIR; 3411unshift @INC, $LIBDIR;
2513 3412
2514my $bug_warning = 0; 3413my $bug_warning = 0;
2515 3414
3415our @WAIT_FOR_TICK;
3416our @WAIT_FOR_TICK_BEGIN;
3417
3418sub wait_for_tick {
3419 return unless $TICK_WATCHER->is_active;
3420 return if $Coro::current == $Coro::main;
3421
3422 my $signal = new Coro::Signal;
3423 push @WAIT_FOR_TICK, $signal;
3424 $signal->wait;
3425}
3426
3427sub wait_for_tick_begin {
3428 return unless $TICK_WATCHER->is_active;
3429 return if $Coro::current == $Coro::main;
3430
3431 my $signal = new Coro::Signal;
3432 push @WAIT_FOR_TICK_BEGIN, $signal;
3433 $signal->wait;
3434}
3435
3436 my $min = 1e6;#d#
3437 my $avg = 10;
2516$TICK_WATCHER = Event->timer ( 3438$TICK_WATCHER = Event->timer (
2517 reentrant => 0, 3439 reentrant => 0,
2518 parked => 1, 3440 parked => 1,
2519 prio => 0, 3441 prio => 0,
2520 at => $NEXT_TICK || $TICK, 3442 at => $NEXT_TICK || $TICK,
2524 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3446 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2525 unless ++$bug_warning > 10; 3447 unless ++$bug_warning > 10;
2526 return; 3448 return;
2527 } 3449 }
2528 3450
2529 $NOW = Event::time; 3451 $NOW = $tick_start = Event::time;
2530 3452
2531 cf::server_tick; # one server iteration 3453 cf::server_tick; # one server iteration
3454
3455 0 && sync_job {#d#
3456 for(1..10) {
3457 my $t = Event::time;
3458 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3459 or die;
3460
3461 $map->width (50);
3462 $map->height (50);
3463 $map->alloc;
3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3465 my $t = Event::time - $t;
3466
3467 #next unless $t < 0.0013;#d#
3468 if ($t < $min) {
3469 $min = $t;
3470 }
3471 $avg = $avg * 0.99 + $t * 0.01;
3472 }
3473 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3474 exit 0;
3475 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3476 };
3477
2532 $RUNTIME += $TICK; 3478 $RUNTIME += $TICK;
2533 $NEXT_TICK += $TICK; 3479 $NEXT_TICK += $TICK;
2534 3480
2535 $WAIT_FOR_TICK->broadcast; 3481 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2536 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3482 $NEXT_RUNTIME_WRITE = $NOW + 10;
2537 3483 Coro::async_pool {
2538 Event::sweep; 3484 write_runtime
2539 Coro::cede_notself; 3485 or warn "ERROR: unable to write runtime file: $!";
3486 };
2540 3487 }
3488
2541# my $AFTER = Event::time; 3489# my $AFTER = Event::time;
2542# warn $AFTER - $NOW;#d# 3490# warn $AFTER - $NOW;#d#
2543 3491
3492 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3493 $sig->send;
3494 }
3495 while (my $sig = shift @WAIT_FOR_TICK) {
3496 $sig->send;
3497 }
3498
3499 $NOW = Event::time;
3500
2544 # if we are delayed by four ticks or more, skip them all 3501 # if we are delayed by four ticks or more, skip them all
2545 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3502 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2546 3503
2547 $TICK_WATCHER->at ($NEXT_TICK); 3504 $TICK_WATCHER->at ($NEXT_TICK);
2548 $TICK_WATCHER->start; 3505 $TICK_WATCHER->start;
3506
3507 $LOAD = ($NOW - $tick_start) / $TICK;
3508 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3509
3510 _post_tick;
3511
3512
2549 }, 3513 },
2550); 3514);
2551 3515
2552{ 3516{
2553 BDB::max_poll_time $TICK * 0.1; 3517 BDB::max_poll_time $TICK * 0.1;
2581 3545
2582 cf::sync_job { 3546 cf::sync_job {
2583 eval { 3547 eval {
2584 BDB::db_env_open 3548 BDB::db_env_open
2585 $DB_ENV, 3549 $DB_ENV,
2586 $BDB_ENV_DIR, 3550 $BDBDIR,
2587 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2588 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2589 0666; 3553 0666;
2590 3554
2591 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2592 3556
2593 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3557 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2594 $DB_ENV->set_lk_detect; 3558 $DB_ENV->set_lk_detect;
2595 }; 3559 };
2596 3560
2604 3568
2605 undef $Coro::AIO::WATCHER; 3569 undef $Coro::AIO::WATCHER;
2606 IO::AIO::max_poll_time $TICK * 0.1; 3570 IO::AIO::max_poll_time $TICK * 0.1;
2607 $AIO_POLL_WATCHER = Event->io ( 3571 $AIO_POLL_WATCHER = Event->io (
2608 reentrant => 0, 3572 reentrant => 0,
3573 data => WF_AUTOCANCEL,
2609 fd => IO::AIO::poll_fileno, 3574 fd => IO::AIO::poll_fileno,
2610 poll => 'r', 3575 poll => 'r',
2611 prio => 6, 3576 prio => 6,
2612 data => WF_AUTOCANCEL,
2613 cb => \&IO::AIO::poll_cb, 3577 cb => \&IO::AIO::poll_cb,
2614 ); 3578 );
2615} 3579}
2616 3580
2617$WRITE_RUNTIME_WATCHER = Event->timer ( 3581my $_log_backtrace;
2618 reentrant => 0, 3582
2619 data => WF_AUTOCANCEL, 3583sub _log_backtrace {
2620 after => 1, 3584 my ($msg, @addr) = @_;
2621 interval => 10, 3585
2622 prio => 6, # keep it lowest so it acts like a watchdog 3586 $msg =~ s/\n//;
2623 cb => Coro::unblock_sub { 3587
2624 write_runtime 3588 # limit the # of concurrent backtraces
2625 or warn "ERROR: unable to write runtime file: $!"; 3589 if ($_log_backtrace < 2) {
3590 ++$_log_backtrace;
3591 async {
3592 my @bt = fork_call {
3593 @addr = map { sprintf "%x", $_ } @addr;
3594 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3595 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3596 or die "addr2line: $!";
3597
3598 my @funcs;
3599 my @res = <$fh>;
3600 chomp for @res;
3601 while (@res) {
3602 my ($func, $line) = splice @res, 0, 2, ();
3603 push @funcs, "[$func] $line";
3604 }
3605
3606 @funcs
3607 };
3608
3609 LOG llevInfo, "[ABT] $msg\n";
3610 LOG llevInfo, "[ABT] $_\n" for @bt;
3611 --$_log_backtrace;
3612 };
3613 } else {
3614 LOG llevInfo, "[ABT] $msg\n";
3615 LOG llevInfo, "[ABT] [suppressed]\n";
2626 }, 3616 }
2627); 3617}
3618
3619# load additional modules
3620use cf::pod;
2628 3621
2629END { cf::emergency_save } 3622END { cf::emergency_save }
2630 3623
26311 36241
2632 3625

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines