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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines