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.164 by root, Thu Jan 11 01:24:25 2007 UTC vs.
Revision 1.372 by root, Sat Sep 15 13:25:33 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
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
527}
528
529package cf;
530 647
531############################################################################# 648#############################################################################
532 649
533=head2 ATTACHABLE OBJECTS 650=head2 ATTACHABLE OBJECTS
534 651
536attach callbacks/event handlers (a collection of which is called an "attachment") 653attach callbacks/event handlers (a collection of which is called an "attachment")
537to it. All such attachable objects support the following methods. 654to it. All such attachable objects support the following methods.
538 655
539In 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>
540C<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
541crossfire+). 658Crossfire TRT).
542 659
543=over 4 660=over 4
544 661
545=item $attachable->attach ($attachment, key => $value...) 662=item $attachable->attach ($attachment, key => $value...)
546 663
660our @CB_TYPE = (); # registry for type (cf-object class) based events 777our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 778our @CB_MAP = ();
662 779
663my %attachment; 780my %attachment;
664 781
782sub cf::attachable::thawer_merge {
783 # simply override everything except _meta
784 local $_[0]{_meta};
785 %{$_[0]} = %{$_[1]};
786}
787
665sub _attach_cb($$$$) { 788sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 789 my ($registry, $event, $prio, $cb) = @_;
667 790
668 use sort 'stable'; 791 use sort 'stable';
669 792
703 $registry = $CB_TYPE[$object_type] ||= []; 826 $registry = $CB_TYPE[$object_type] ||= [];
704 827
705 } elsif ($type eq "subtype") { 828 } elsif ($type eq "subtype") {
706 defined $object_type or Carp::croak "subtype specified without type"; 829 defined $object_type or Carp::croak "subtype specified without type";
707 my $object_subtype = shift @arg; 830 my $object_subtype = shift @arg;
708 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 831 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
709 832
710 } elsif ($type eq "package") { 833 } elsif ($type eq "package") {
711 my $pkg = shift @arg; 834 my $pkg = shift @arg;
712 835
713 while (my ($name, $id) = each %cb_id) { 836 while (my ($name, $id) = each %cb_id) {
742 _attach $registry, $klass, @attach; 865 _attach $registry, $klass, @attach;
743 } 866 }
744 867
745 $obj->{$name} = \%arg; 868 $obj->{$name} = \%arg;
746 } else { 869 } else {
747 warn "object uses attachment '$name' that is not available, postponing.\n"; 870 warn "object uses attachment '$name' which is not available, postponing.\n";
748 } 871 }
749 872
750 $obj->{_attachment}{$name} = undef; 873 $obj->{_attachment}{$name} = undef;
751} 874}
752 875
754 if (ref $_[0]) { 877 if (ref $_[0]) {
755 _object_attach @_; 878 _object_attach @_;
756 } else { 879 } else {
757 _attach shift->_attach_registry, @_; 880 _attach shift->_attach_registry, @_;
758 } 881 }
882 _recalc_want;
759}; 883};
760 884
761# all those should be optimised 885# all those should be optimised
762sub cf::attachable::detach { 886sub cf::attachable::detach {
763 my ($obj, $name) = @_; 887 my ($obj, $name) = @_;
766 delete $obj->{_attachment}{$name}; 890 delete $obj->{_attachment}{$name};
767 reattach ($obj); 891 reattach ($obj);
768 } else { 892 } else {
769 Carp::croak "cannot, currently, detach class attachments"; 893 Carp::croak "cannot, currently, detach class attachments";
770 } 894 }
895 _recalc_want;
771}; 896};
772 897
773sub cf::attachable::attached { 898sub cf::attachable::attached {
774 my ($obj, $name) = @_; 899 my ($obj, $name) = @_;
775 900
790 "; 915 ";
791 die if $@; 916 die if $@;
792} 917}
793 918
794our $override; 919our $override;
795our @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?
796 921
797sub override { 922sub override {
798 $override = 1; 923 $override = 1;
799 @invoke_results = (); 924 @INVOKE_RESULTS = (@_);
800} 925}
801 926
802sub do_invoke { 927sub do_invoke {
803 my $event = shift; 928 my $event = shift;
804 my $callbacks = shift; 929 my $callbacks = shift;
805 930
806 @invoke_results = (); 931 @INVOKE_RESULTS = ();
807 932
808 local $override; 933 local $override;
809 934
810 for (@$callbacks) { 935 for (@$callbacks) {
811 eval { &{$_->[1]} }; 936 eval { &{$_->[1]} };
828 953
829Generate an object-specific event with the given arguments. 954Generate an object-specific event with the given arguments.
830 955
831This 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
832removed 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
833results (if you must, access C<@cf::invoke_results> directly). 958results (if you must, access C<@cf::INVOKE_RESULTS> directly).
834 959
835=back 960=back
836 961
837=cut 962=cut
838 963
839############################################################################# 964#############################################################################
840# 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}
841 977
842sub reattach { 978sub reattach {
843 # basically do the same as instantiate, without calling instantiate 979 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 980 my ($obj) = @_;
981
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 983
846 my $registry = $obj->registry; 984 my $registry = $obj->registry;
847 985
848 @$registry = (); 986 @$registry = ();
849 987
888); 1026);
889 1027
890sub object_freezer_save { 1028sub object_freezer_save {
891 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
892 1030
1031 my $guard = cf::lock_acquire "io";
1032
893 sync_job { 1033 sync_job {
894 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
895 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
896 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
897 1038
898 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
899 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
900 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
901 aio_fsync $fh; 1042 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 1043 close $fh;
903 1044
904 if (@$objs) { 1045 if (@$objs) {
905 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) {
906 chmod SAVE_MODE, $fh; 1047 chmod SAVE_MODE, $fh;
907 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1048 my $data = Storable::nfreeze { version => 1, objs => $objs };
908 aio_write $fh, 0, (length $data), $data, 0; 1049 aio_write $fh, 0, (length $data), $data, 0;
909 aio_fsync $fh; 1050 aio_fsync $fh if $cf::USE_FSYNC;
910 close $fh; 1051 close $fh;
911 aio_rename "$filename.pst~", "$filename.pst"; 1052 aio_rename "$filename.pst~", "$filename.pst";
912 } 1053 }
913 } else { 1054 } else {
914 aio_unlink "$filename.pst"; 1055 aio_unlink "$filename.pst";
920 } 1061 }
921 } else { 1062 } else {
922 aio_unlink $filename; 1063 aio_unlink $filename;
923 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
924 } 1065 }
925 } 1066 };
1067
1068 undef $guard;
926} 1069}
927 1070
928sub object_freezer_as_string { 1071sub object_freezer_as_string {
929 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
930 1073
935 1078
936sub object_thawer_load { 1079sub object_thawer_load {
937 my ($filename) = @_; 1080 my ($filename) = @_;
938 1081
939 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
940 1085
941 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
942 or return; 1087 or return;
943 1088
944 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
945 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
946 or return; 1091 or return;
1092
1093 undef $guard;
947 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
948 } 1095 }
949 1096
1097 utf8::decode (my $decname = $filename);
950 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
951 $filename, length $data, scalar @{$av || []};#d# 1099 $decname, length $data, scalar @{$av || []};
1100
952 return ($data, $av); 1101 ($data, $av)
953} 1102}
1103
1104=head2 COMMAND CALLBACKS
1105
1106=over 4
1107
1108=cut
954 1109
955############################################################################# 1110#############################################################################
956# command handling &c 1111# command handling &c
957 1112
958=item cf::register_command $name => \&callback($ob,$args); 1113=item cf::register_command $name => \&callback($ob,$args);
971 push @{ $COMMAND{$name} }, [$caller, $cb]; 1126 push @{ $COMMAND{$name} }, [$caller, $cb];
972} 1127}
973 1128
974=item cf::register_extcmd $name => \&callback($pl,$packet); 1129=item cf::register_extcmd $name => \&callback($pl,$packet);
975 1130
976Register 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.
977 1136
978If 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
979called. 1138called.
980 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
981=cut 1151=cut
982 1152
983sub register_extcmd { 1153sub register_extcmd {
984 my ($name, $cb) = @_; 1154 my ($name, $cb) = @_;
985 1155
986 $EXTCMD{$name} = $cb; 1156 $EXTCMD{$name} = $cb;
1157}
1158
1159sub register_exticmd {
1160 my ($name, $cb) = @_;
1161
1162 $EXTICMD{$name} = $cb;
987} 1163}
988 1164
989cf::player->attach ( 1165cf::player->attach (
990 on_command => sub { 1166 on_command => sub {
991 my ($pl, $name, $params) = @_; 1167 my ($pl, $name, $params) = @_;
1000 cf::override; 1176 cf::override;
1001 }, 1177 },
1002 on_extcmd => sub { 1178 on_extcmd => sub {
1003 my ($pl, $buf) = @_; 1179 my ($pl, $buf) = @_;
1004 1180
1005 my $msg = eval { from_json $buf }; 1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1006 1182
1007 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
1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1009 if (my %reply = $cb->($pl, $msg)) { 1192 @reply = $cb->($pl, @payload);
1010 $pl->ext_reply ($msg->{msgid}, %reply);
1011 }
1012 } 1193 }
1194
1195 $pl->ext_reply ($reply, @reply)
1196 if $reply;
1197
1013 } else { 1198 } else {
1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1015 } 1200 }
1016 1201
1017 cf::override; 1202 cf::override;
1018 }, 1203 },
1019); 1204);
1020 1205
1021sub load_extension {
1022 my ($path) = @_;
1023
1024 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1025 my $base = $1;
1026 my $pkg = $1;
1027 $pkg =~ s/[^[:word:]]/_/g;
1028 $pkg = "ext::$pkg";
1029
1030 warn "... loading '$path' into '$pkg'\n";
1031
1032 open my $fh, "<:utf8", $path
1033 or die "$path: $!";
1034
1035 my $source =
1036 "package $pkg; use strict; use utf8;\n"
1037 . "#line 1 \"$path\"\n{\n"
1038 . (do { local $/; <$fh> })
1039 . "\n};\n1";
1040
1041 eval $source
1042 or die $@ ? "$path: $@\n"
1043 : "extension disabled.\n";
1044
1045 push @EXTS, $pkg;
1046}
1047
1048sub load_extensions { 1206sub load_extensions {
1207 cf::sync_job {
1208 my %todo;
1209
1049 for my $ext (<$LIBDIR/*.ext>) { 1210 for my $path (<$LIBDIR/*.ext>) {
1050 next unless -r $ext; 1211 next unless -r $path;
1051 eval { 1212
1052 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;
1053 1 1270 }
1054 } or warn "$ext not loaded: $@"; 1271
1272 skip:
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1274 unless $progress;
1275 }
1055 } 1276 };
1056} 1277}
1057 1278
1058############################################################################# 1279#############################################################################
1059# load/save/clean perl data associated with a map
1060 1280
1061*cf::mapsupport::on_clean = sub { 1281=back
1062 my ($map) = @_;
1063
1064 my $path = $map->tmpname;
1065 defined $path or return;
1066
1067 unlink "$path.pst";
1068};
1069
1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1071
1072#############################################################################
1073 1282
1074=head2 CORE EXTENSIONS 1283=head2 CORE EXTENSIONS
1075 1284
1076Functions and methods that extend core crossfire objects. 1285Functions and methods that extend core crossfire objects.
1077 1286
1083 1292
1084=head3 cf::player 1293=head3 cf::player
1085 1294
1086=over 4 1295=over 4
1087 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
1088=item cf::player::find $login 1311=item cf::player::find $login
1089 1312
1090Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1091 1314
1092=cut 1315=cut
1093 1316
1094sub playerdir($) { 1317sub playerdir($) {
1095 cf::localdir 1318 "$PLAYERDIR/"
1096 . "/"
1097 . cf::playerdir
1098 . "/"
1099 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1319 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1100} 1320}
1101 1321
1102sub path($) { 1322sub path($) {
1103 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1323 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1104 1324
1105 (playerdir $login) . "/$login.pl" 1325 (playerdir $login) . "/playerdata"
1106} 1326}
1107 1327
1108sub find_active($) { 1328sub find_active($) {
1109 $cf::PLAYER{$_[0]} 1329 $cf::PLAYER{$_[0]}
1110 and $cf::PLAYER{$_[0]}->active 1330 and $cf::PLAYER{$_[0]}->active
1113 1333
1114sub exists($) { 1334sub exists($) {
1115 my ($login) = @_; 1335 my ($login) = @_;
1116 1336
1117 $cf::PLAYER{$login} 1337 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 1338 or cf::sync_job { !aio_stat path $login }
1119} 1339}
1120 1340
1121sub find($) { 1341sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 1342 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 1343 my $login = $_[0];
1124 1344
1125 my $guard = cf::lock_acquire "user_find:$login"; 1345 my $guard = cf::lock_acquire "user_find:$login";
1126 1346
1127 $cf::PLAYER{$_[0]} || do { 1347 $cf::PLAYER{$_[0]} || do {
1128 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
1129 or return; 1356 or return;
1357
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1130 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1131 } 1363 }
1132 } 1364 }
1133} 1365}
1134 1366
1144 1376
1145 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1146 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1147 1379
1148 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1149 Coro::cede; 1381 cf::cede_to_tick;
1150} 1382}
1151 1383
1152sub new($) { 1384sub new($) {
1153 my ($login) = @_; 1385 my ($login) = @_;
1154 1386
1160 $cf::PLAYER{$login} = $self; 1392 $cf::PLAYER{$login} = $self;
1161 1393
1162 $self 1394 $self
1163} 1395}
1164 1396
1397=item $player->send_msg ($channel, $msg, $color, [extra...])
1398
1399=cut
1400
1401sub send_msg {
1402 my $ns = shift->ns
1403 or return;
1404 $ns->send_msg (@_);
1405}
1406
1165=item $pl->quit_character 1407=item $pl->quit_character
1166 1408
1167Nukes the player without looking back. If logged in, the connection will 1409Nukes the player without looking back. If logged in, the connection will
1168be destroyed. May block for a long time. 1410be destroyed. May block for a long time.
1169 1411
1170=cut 1412=cut
1171 1413
1172sub quit_character { 1414sub quit_character {
1173 my ($pl) = @_; 1415 my ($pl) = @_;
1416
1417 my $name = $pl->ob->name;
1174 1418
1175 $pl->{deny_save} = 1; 1419 $pl->{deny_save} = 1;
1176 $pl->password ("*"); # this should lock out the player until we nuked the dir 1420 $pl->password ("*"); # this should lock out the player until we nuked the dir
1177 1421
1178 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1183 my $path = playerdir $pl; 1427 my $path = playerdir $pl;
1184 my $temp = "$path~$cf::RUNTIME~deleting~"; 1428 my $temp = "$path~$cf::RUNTIME~deleting~";
1185 aio_rename $path, $temp; 1429 aio_rename $path, $temp;
1186 delete $cf::PLAYER{$pl->ob->name}; 1430 delete $cf::PLAYER{$pl->ob->name};
1187 $pl->destroy; 1431 $pl->destroy;
1432
1433 my $prefix = qr<^~\Q$name\E/>;
1434
1435 # nuke player maps
1436 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1437
1188 IO::AIO::aio_rmtree $temp; 1438 IO::AIO::aio_rmtree $temp;
1439}
1440
1441=item $pl->kick
1442
1443Kicks a player out of the game. This destroys the connection.
1444
1445=cut
1446
1447sub kick {
1448 my ($pl, $kicker) = @_;
1449
1450 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1451 $pl->killer ("kicked");
1452 $pl->ns->destroy;
1189} 1453}
1190 1454
1191=item cf::player::list_logins 1455=item cf::player::list_logins
1192 1456
1193Returns am arrayref of all valid playernames in the system, can take a 1457Returns am arrayref of all valid playernames in the system, can take a
1194while and may block, so not sync_job-capable, ever. 1458while and may block, so not sync_job-capable, ever.
1195 1459
1196=cut 1460=cut
1197 1461
1198sub list_logins { 1462sub list_logins {
1199 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1463 my $dirs = aio_readdir $PLAYERDIR
1200 or return []; 1464 or return [];
1201 1465
1202 my @logins; 1466 my @logins;
1203 1467
1204 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1205 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1206 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1207 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1208 1477
1209 utf8::decode $login; 1478 utf8::decode $login;
1210 push @logins, $login; 1479 push @logins, $login;
1211 } 1480 }
1212 1481
1213 \@logins 1482 \@logins
1214} 1483}
1215 1484
1216=item $player->maps 1485=item $player->maps
1217 1486
1218Returns an arrayref of cf::path's of all maps that are private for this 1487Returns an arrayref of map paths that are private for this
1219player. May block. 1488player. May block.
1220 1489
1221=cut 1490=cut
1222 1491
1223sub maps($) { 1492sub maps($) {
1224 my ($pl) = @_; 1493 my ($pl) = @_;
1494
1495 $pl = ref $pl ? $pl->ob->name : $pl;
1225 1496
1226 my $files = aio_readdir playerdir $pl 1497 my $files = aio_readdir playerdir $pl
1227 or return; 1498 or return;
1228 1499
1229 my @paths; 1500 my @paths;
1231 for (@$files) { 1502 for (@$files) {
1232 utf8::decode $_; 1503 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/; 1504 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o; 1505 next unless /^$PATH_SEP/o;
1235 1506
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_; 1507 push @paths, cf::map::normalise "~$pl/$_";
1237 } 1508 }
1238 1509
1239 \@paths 1510 \@paths
1240} 1511}
1241 1512
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1514
1515Expand crossfire pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563
1242=item $player->ext_reply ($msgid, $msgtype, %msg) 1564=item $player->ext_reply ($msgid, @msg)
1243 1565
1244Sends an ext reply to the player. 1566Sends an ext reply to the player.
1245 1567
1246=cut 1568=cut
1247 1569
1248sub ext_reply($$$%) { 1570sub ext_reply($$@) {
1249 my ($self, $id, %msg) = @_; 1571 my ($self, $id, @msg) = @_;
1250 1572
1251 $msg{msgid} = $id; 1573 $self->ns->ext_reply ($id, @msg)
1252
1253 $self->send ("ext " . cf::to_json \%msg);
1254} 1574}
1255 1575
1256package cf; 1576=item $player->ext_msg ($type, @msg)
1577
1578Sends an ext event to the client.
1579
1580=cut
1581
1582sub ext_msg($$@) {
1583 my ($self, $type, @msg) = @_;
1584
1585 $self->ns->ext_msg ($type, @msg);
1586}
1587
1588=head3 cf::region
1589
1590=over 4
1591
1592=cut
1593
1594package cf::region;
1595
1596=item cf::region::find_by_path $path
1597
1598Tries to decuce the likely region for a map knowing only its path.
1599
1600=cut
1601
1602sub find_by_path($) {
1603 my ($path) = @_;
1604
1605 my ($match, $specificity);
1606
1607 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) {
1609 ($match, $specificity) = ($region, $region->specificity)
1610 if $region->specificity > $specificity;
1611 }
1612 }
1613
1614 $match
1615}
1257 1616
1258=back 1617=back
1259
1260 1618
1261=head3 cf::map 1619=head3 cf::map
1262 1620
1263=over 4 1621=over 4
1264 1622
1267package cf::map; 1625package cf::map;
1268 1626
1269use Fcntl; 1627use Fcntl;
1270use Coro::AIO; 1628use Coro::AIO;
1271 1629
1630use overload
1631 '""' => \&as_string,
1632 fallback => 1;
1633
1272our $MAX_RESET = 3600; 1634our $MAX_RESET = 3600;
1273our $DEFAULT_RESET = 3000; 1635our $DEFAULT_RESET = 3000;
1274 1636
1275sub generate_random_map { 1637sub generate_random_map {
1276 my ($path, $rmp) = @_; 1638 my ($self, $rmp) = @_;
1277
1278 # mit "rum" bekleckern, nicht 1639 # mit "rum" bekleckern, nicht
1279 cf::map::_create_random_map ( 1640 $self->_create_random_map (
1280 $path,
1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1284 $rmp->{exit_on_final_map}, 1644 $rmp->{exit_on_final_map},
1285 $rmp->{xsize}, $rmp->{ysize}, 1645 $rmp->{xsize}, $rmp->{ysize},
1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1650 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1291 (cf::region::find $rmp->{region}), $rmp->{custom} 1651 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 ) 1652 )
1293} 1653}
1294 1654
1655=item cf::map->register ($regex, $prio)
1656
1657Register a handler for the map path matching the given regex at the
1658givne priority (higher is better, built-in handlers have priority 0, the
1659default).
1660
1661=cut
1662
1663sub register {
1664 my (undef, $regex, $prio) = @_;
1665 my $pkg = caller;
1666
1667 no strict;
1668 push @{"$pkg\::ISA"}, __PACKAGE__;
1669
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671}
1672
1673# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1675
1676sub thawer_merge {
1677 my ($self, $merge) = @_;
1678
1679 # we have to keep some variables in memory intact
1680 local $self->{path};
1681 local $self->{load_path};
1682
1683 $self->SUPER::thawer_merge ($merge);
1684}
1685
1686sub normalise {
1687 my ($path, $base) = @_;
1688
1689 $path = "$path"; # make sure its a string
1690
1691 $path =~ s/\.map$//;
1692
1693 # map plan:
1694 #
1695 # /! non-realised random map exit (special hack!)
1696 # {... are special paths that are not being touched
1697 # ?xxx/... are special absolute paths
1698 # ?random/... random maps
1699 # /... normal maps
1700 # ~user/... per-player map of a specific user
1701
1702 $path =~ s/$PATH_SEP/\//go;
1703
1704 # treat it as relative path if it starts with
1705 # something that looks reasonable
1706 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1707 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1708
1709 $base =~ s{[^/]+/?$}{};
1710 $path = "$base/$path";
1711 }
1712
1713 for ($path) {
1714 redo if s{//}{/};
1715 redo if s{/\.?/}{/};
1716 redo if s{/[^/]+/\.\./}{/};
1717 }
1718
1719 $path
1720}
1721
1722sub new_from_path {
1723 my (undef, $path, $base) = @_;
1724
1725 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1726
1727 $path = normalise $path, $base;
1728
1729 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1730 if ($path =~ $EXT_MAP{$pkg}[1]) {
1731 my $self = bless cf::map::new, $pkg;
1732 $self->{path} = $path; $self->path ($path);
1733 $self->init; # pass $1 etc.
1734 return $self;
1735 }
1736 }
1737
1738 Carp::cluck "unable to resolve path '$path' (base '$base').";
1739 ()
1740}
1741
1742sub init {
1743 my ($self) = @_;
1744
1745 $self
1746}
1747
1748sub as_string {
1749 my ($self) = @_;
1750
1751 "$self->{path}"
1752}
1753
1754# the displayed name, this is a one way mapping
1755sub visible_name {
1756 &as_string
1757}
1758
1759# the original (read-only) location
1760sub load_path {
1761 my ($self) = @_;
1762
1763 "$MAPDIR/$self->{path}.map"
1764}
1765
1766# the temporary/swap location
1767sub save_path {
1768 my ($self) = @_;
1769
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1771 "$TMPDIR/$path.map"
1772}
1773
1774# the unique path, undef == no special unique path
1775sub uniq_path {
1776 my ($self) = @_;
1777
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1779 "$UNIQUEDIR/$path"
1780}
1781
1295# and all this just because we cannot iterate over 1782# and all this just because we cannot iterate over
1296# all maps in C++... 1783# all maps in C++...
1297sub change_all_map_light { 1784sub change_all_map_light {
1298 my ($change) = @_; 1785 my ($change) = @_;
1299 1786
1300 $_->change_map_light ($change) 1787 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1788 for grep $_->outdoor, values %cf::MAP;
1302} 1789}
1303 1790
1791sub decay_objects {
1792 my ($self) = @_;
1793
1794 return if $self->{deny_reset};
1795
1796 $self->do_decay_objects;
1797}
1798
1799sub unlink_save {
1800 my ($self) = @_;
1801
1802 utf8::encode (my $save = $self->save_path);
1803 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1804 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1805}
1806
1304sub load_map_header($) { 1807sub load_header_from($) {
1305 my ($path) = @_; 1808 my ($self, $path) = @_;
1306 1809
1307 utf8::encode $path; 1810 utf8::encode $path;
1308 aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1309 or return; 1812 or return;
1310 1813
1311 my $map = cf::map::new 1814 $self->_load_header ($f)
1312 or return; 1815 or return;
1313 1816
1314 # for better error messages only, will be overwritten later 1817 local $MAP_LOADING{$self->{path}} = $self;
1315 $map->path ($path); 1818 $f->resolve_delayed_derefs;
1316 1819
1317 $map->load_header ($path) 1820 $self->{load_path} = $path;
1821
1822 1
1823}
1824
1825sub load_header_orig {
1826 my ($self) = @_;
1827
1828 $self->load_header_from ($self->load_path)
1829}
1830
1831sub load_header_temp {
1832 my ($self) = @_;
1833
1834 $self->load_header_from ($self->save_path)
1835}
1836
1837sub prepare_temp {
1838 my ($self) = @_;
1839
1840 $self->last_access ((delete $self->{last_access})
1841 || $cf::RUNTIME); #d#
1842 # safety
1843 $self->{instantiate_time} = $cf::RUNTIME
1844 if $self->{instantiate_time} > $cf::RUNTIME;
1845}
1846
1847sub prepare_orig {
1848 my ($self) = @_;
1849
1850 $self->{load_original} = 1;
1851 $self->{instantiate_time} = $cf::RUNTIME;
1852 $self->last_access ($cf::RUNTIME);
1853 $self->instantiate;
1854}
1855
1856sub load_header {
1857 my ($self) = @_;
1858
1859 if ($self->load_header_temp) {
1860 $self->prepare_temp;
1861 } else {
1862 $self->load_header_orig
1318 or return; 1863 or return;
1864 $self->prepare_orig;
1865 }
1319 1866
1320 $map->{load_path} = $path; 1867 $self->{deny_reset} = 1
1868 if $self->no_reset;
1321 1869
1322 $map 1870 $self->default_region (cf::region::find_by_path $self->{path})
1871 unless $self->default_region;
1872
1873 1
1323} 1874}
1324 1875
1325sub find; 1876sub find;
1326sub find { 1877sub find {
1327 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1328 1879
1329 #warn "find<$path,$origin>\n";#d#
1330
1331 $path = new cf::path $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1332 my $key = $path->as_string;
1333 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1334 cf::lock_wait "map_find:$key"; 1883 cf::lock_wait "map_find:$path";
1335 1884
1336 $cf::MAP{$key} || do { 1885 $cf::MAP{$path} || do {
1337 my $guard = cf::lock_acquire "map_find:$key"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1338 1888
1339 # do it the slow way 1889 my $map = new_from_path cf::map $path
1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1343
1344 if ($map) {
1345 $map->last_access ((delete $map->{last_access})
1346 || $cf::RUNTIME); #d#
1347 # safety
1348 $map->{instantiate_time} = $cf::RUNTIME
1349 if $map->{instantiate_time} > $cf::RUNTIME;
1350 } else {
1351 $map = $path->load_orig
1352 or return; 1890 or return;
1353 1891
1354 $map->{load_original} = 1;
1355 $map->{instantiate_time} = $cf::RUNTIME;
1356 $map->last_access ($cf::RUNTIME);
1357 $map->instantiate;
1358
1359 # per-player maps become, after loading, normal maps
1360 $map->per_player (0) if $path->{user_rel};
1361 }
1362
1363 $map->path ($key);
1364 $map->{path} = $path;
1365 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1366 1893
1367 Coro::cede; 1894 $map->load_header
1895 or return;
1368 1896
1369 if ($map->should_reset) { 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1370 $map->reset; 1902 $map->reset;
1371 undef $guard;
1372 $map = find $path 1903 return find $path;
1373 or return;
1374 } 1904 }
1375 1905
1376 $cf::MAP{$key} = $map 1906 $cf::MAP{$path} = $map
1377 } 1907 }
1378} 1908}
1909
1910sub pre_load { }
1911sub post_load { }
1379 1912
1380sub load { 1913sub load {
1381 my ($self) = @_; 1914 my ($self) = @_;
1382 1915
1916 local $self->{deny_reset} = 1; # loading can take a long time
1917
1383 my $path = $self->{path}; 1918 my $path = $self->{path};
1919
1920 {
1384 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1921 my $guard = cf::lock_acquire "map_data:$path";
1385 1922
1923 return unless $self->valid;
1386 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1387 1925
1388 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1389 1927
1390 $self->alloc; 1928 $self->alloc;
1391 $self->load_objects ($self->{load_path}, 1) 1929
1930 $self->pre_load;
1931 cf::cede_to_tick;
1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1935 $self->_load_objects ($f)
1392 or return; 1936 or return;
1393 1937
1394 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1395 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1396 1940
1397 if (my $uniq = $path->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1398 utf8::encode $uniq; 1942 utf8::encode $uniq;
1399 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1400 $self->clear_unique_items; 1945 $self->clear_unique_items;
1401 $self->load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1402 } 1949 }
1403 } 1950 }
1404 1951
1405 Coro::cede; 1952 $f->resolve_delayed_derefs;
1406 1953
1954 cf::cede_to_tick;
1407 # now do the right thing for maps 1955 # now do the right thing for maps
1408 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1409
1410 if ($self->{path}->is_style_map) {
1411 $self->{deny_save} = 1;
1412 $self->{deny_reset} = 1;
1413 } else {
1414 $self->decay_objects;
1415 $self->fix_auto_apply;
1416 $self->update_buttons;
1417 $self->set_darkness_map;
1418 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1419 unless $self->difficulty; 1958 unless $self->difficulty;
1959 cf::cede_to_tick;
1960
1961 unless ($self->{deny_activate}) {
1962 $self->decay_objects;
1963 $self->fix_auto_apply;
1964 $self->update_buttons;
1965 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1420 $self->activate; 1968 $self->activate;
1421 } 1969 }
1422 1970
1423 Coro::cede; 1971 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME);
1424 1973
1425 $self->in_memory (cf::MAP_IN_MEMORY); 1974 $self->in_memory (cf::MAP_IN_MEMORY);
1975 }
1976
1977 $self->post_load;
1978}
1979
1980sub customise_for {
1981 my ($self, $ob) = @_;
1982
1983 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player;
1985
1986# return find "?party/" . $ob->name . "/" . $self->{path}
1987# if $self->per_party;
1988
1989 $self
1426} 1990}
1427 1991
1428# find and load all maps in the 3x3 area around a map 1992# find and load all maps in the 3x3 area around a map
1429sub load_diag { 1993sub load_neighbours {
1430 my ($map) = @_; 1994 my ($map) = @_;
1431 1995
1432 my @diag; # diagonal neighbours 1996 my @neigh; # diagonal neighbours
1433 1997
1434 for (0 .. 3) { 1998 for (0 .. 3) {
1435 my $neigh = $map->tile_path ($_) 1999 my $neigh = $map->tile_path ($_)
1436 or next; 2000 or next;
1437 $neigh = find $neigh, $map 2001 $neigh = find $neigh, $map
1438 or next; 2002 or next;
1439 $neigh->load; 2003 $neigh->load;
1440 2004
2005 push @neigh,
1441 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2006 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1442 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2007 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1443 } 2008 }
1444 2009
1445 for (@diag) { 2010 for (grep defined $_->[0], @neigh) {
2011 my ($path, $origin) = @$_;
1446 my $neigh = find @$_ 2012 my $neigh = find $path, $origin
1447 or next; 2013 or next;
1448 $neigh->load; 2014 $neigh->load;
1449 } 2015 }
1450} 2016}
1451 2017
1456} 2022}
1457 2023
1458sub do_load_sync { 2024sub do_load_sync {
1459 my ($map) = @_; 2025 my ($map) = @_;
1460 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1461 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1462} 2031}
1463 2032
1464our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
2034our $MAP_PREFETCHER = undef;
2035
2036sub find_async {
2037 my ($path, $origin, $load) = @_;
2038
2039 $path = normalise $path, $origin && $origin->{path};
2040
2041 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2043 }
2044
2045 $MAP_PREFETCH{$path} |= $load;
2046
1465our $MAP_PREFETCHER = Coro::async { 2047 $MAP_PREFETCHER ||= cf::async {
1466 while () {
1467 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1469 or next; 2050 if (my $map = find $k) {
2051 $map->load if $v;
2052 }
2053
1470 my $path = delete $MAP_PREFETCH{$key}; 2054 delete $MAP_PREFETCH{$k};
1471
1472 my $map = find $path
1473 or next;
1474 $map->load;
1475 } 2055 }
1476 Coro::schedule; 2056 }
2057 undef $MAP_PREFETCHER;
1477 } 2058 };
1478};
1479
1480sub find_async {
1481 my ($path, $origin) = @_;
1482
1483 $path = new cf::path $path, $origin && $origin->path;
1484 my $key = $path->as_string;
1485
1486 if (my $map = $cf::MAP{$key}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 }
1489
1490 $MAP_PREFETCH{$key} = $path;
1491 $MAP_PREFETCHER->ready; 2059 $MAP_PREFETCHER->prio (6);
1492 2060
1493 () 2061 ()
1494} 2062}
1495 2063
1496sub save { 2064sub save {
1497 my ($self) = @_; 2065 my ($self) = @_;
1498 2066
1499 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1500 2068
1501 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1502 2070
1503 return unless $self->dirty; 2071 return unless $self->dirty;
1504 2072
1505 my $save = $self->{path}->save_path; utf8::encode $save; 2073 my $save = $self->save_path; utf8::encode $save;
1506 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 2074 my $uniq = $self->uniq_path; utf8::encode $uniq;
1507 2075
1508 $self->{load_path} = $save; 2076 $self->{load_path} = $save;
1509 2077
1510 return if $self->{deny_save}; 2078 return if $self->{deny_save};
1511 2079
1514 cf::async { 2082 cf::async {
1515 $_->contr->save for $self->players; 2083 $_->contr->save for $self->players;
1516 }; 2084 };
1517 2085
1518 if ($uniq) { 2086 if ($uniq) {
1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1520 $self->save_objects ($uniq, cf::IO_UNIQUES); 2088 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1521 } else { 2089 } else {
1522 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1523 } 2091 }
1524} 2092}
1525 2093
1526sub swap_out { 2094sub swap_out {
1527 my ($self) = @_; 2095 my ($self) = @_;
1528 2096
1529 # save first because save cedes 2097 # save first because save cedes
1530 $self->save; 2098 $self->save;
1531 2099
1532 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
1533 2101
1534 return if $self->players; 2102 return if $self->players;
1535 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
1536 return if $self->{deny_save}; 2104 return if $self->{deny_save};
1537 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
1538 $self->clear; 2110 $self->clear;
1539 $self->in_memory (cf::MAP_SWAPPED);
1540} 2111}
1541 2112
1542sub reset_at { 2113sub reset_at {
1543 my ($self) = @_; 2114 my ($self) = @_;
1544 2115
1545 # TODO: safety, remove and allow resettable per-player maps 2116 # TODO: safety, remove and allow resettable per-player maps
1546 return 1e99 if $self->{path}{user_rel};
1547 return 1e99 if $self->{deny_reset}; 2117 return 1e99 if $self->{deny_reset};
1548 2118
1549 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1550 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1551 2121
1556 my ($self) = @_; 2126 my ($self) = @_;
1557 2127
1558 $self->reset_at <= $cf::RUNTIME 2128 $self->reset_at <= $cf::RUNTIME
1559} 2129}
1560 2130
1561sub rename {
1562 my ($self, $new_path) = @_;
1563
1564 $self->{path}->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 { 2131sub reset {
1575 my ($self) = @_; 2132 my ($self) = @_;
1576 2133
1577 my $lock = cf::lock_acquire "map_data:" . $self->path; 2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 2135
1579 return if $self->players; 2136 return if $self->players;
1580 return if $self->{path}{user_rel};#d#
1581 2137
1582 warn "resetting map ", $self->path;#d# 2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
1583 2149
1584 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
1585 2151
2152 $self->deactivate;
1586 $_->clear_links_to ($self) for values %cf::MAP; 2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
1587 2155
1588 $self->{path}->unlink_save; 2156 $self->unlink_save;
1589 $self->destroy; 2157 $self->destroy;
1590} 2158}
1591 2159
1592my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
1593 2161
1594sub nuke { 2162sub nuke {
1595 my ($self) = @_; 2163 my ($self) = @_;
1596 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2168 delete $cf::MAP{$self->path};
2169
2170 $self->unlink_save;
2171
2172 bless $self, "cf::map";
2173 delete $self->{deny_reset};
1597 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
1598 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
1599 $self->rename ("{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177
2178 $cf::MAP{$self->path} = $self;
2179 }
2180
1600 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
1601} 2182}
1602 2183
1603sub customise_for { 2184=item $maps = cf::map::tmp_maps
1604 my ($map, $ob) = @_;
1605 2185
1606 if ($map->per_player) { 2186Returns an arrayref with all map paths of currently instantiated and saved
1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 2187maps. May block.
2188
2189=cut
2190
2191sub tmp_maps() {
1608 } 2192 [
2193 map {
2194 utf8::decode $_;
2195 /\.map$/
2196 ? normalise $_
2197 : ()
2198 } @{ aio_readdir $TMPDIR or [] }
2199 ]
2200}
1609 2201
1610 $map 2202=item $maps = cf::map::random_maps
2203
2204Returns an arrayref with all map paths of currently instantiated and saved
2205random maps. May block.
2206
2207=cut
2208
2209sub random_maps() {
2210 [
2211 map {
2212 utf8::decode $_;
2213 /\.map$/
2214 ? normalise "?random/$_"
2215 : ()
2216 } @{ aio_readdir $RANDOMDIR or [] }
2217 ]
1611} 2218}
1612 2219
1613=item cf::map::unique_maps 2220=item cf::map::unique_maps
1614 2221
1615Returns an arrayref of cf::path's of all shared maps that have 2222Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 2223instantiated unique items. May block.
1617 2224
1618=cut 2225=cut
1619 2226
1620sub unique_maps() { 2227sub unique_maps() {
1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2228 [
1622 or return; 2229 map {
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_; 2230 utf8::decode $_;
1628 next if /\.pst$/; 2231 /\.map$/
1629 next unless /^$PATH_SEP/o; 2232 ? normalise $_
1630 2233 : ()
1631 push @paths, new cf::path $_; 2234 } @{ aio_readdir $UNIQUEDIR or [] }
1632 } 2235 ]
1633
1634 \@paths
1635} 2236}
1636 2237
1637package cf; 2238package cf;
1638 2239
1639=back 2240=back
1657 map { $_, inv_recursive_ $_->inv } @_ 2258 map { $_, inv_recursive_ $_->inv } @_
1658} 2259}
1659 2260
1660sub inv_recursive { 2261sub inv_recursive {
1661 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2263}
2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
1662} 2294}
1663 2295
1664package cf; 2296package cf;
1665 2297
1666=back 2298=back
1685 2317
1686 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2318 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1687 2319
1688 if ($self->{record_replies}) { 2320 if ($self->{record_replies}) {
1689 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2321 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2322
1690 } else { 2323 } else {
2324 my $pl = $self->contr;
2325
2326 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2327 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329
2330 } else {
1691 $msg = $npc->name . " says: $msg" if $npc; 2331 $msg = $npc->name . " says: $msg" if $npc;
1692 $self->message ($msg, $flags); 2332 $self->message ($msg, $flags);
2333 }
1693 } 2334 }
2335}
2336
2337=item $object->send_msg ($channel, $msg, $color, [extra...])
2338
2339=cut
2340
2341sub cf::object::send_msg {
2342 my $pl = shift->contr
2343 or return;
2344 $pl->send_msg (@_);
1694} 2345}
1695 2346
1696=item $player_object->may ("access") 2347=item $player_object->may ("access")
1697 2348
1698Returns wether the given player is authorized to access resource "access" 2349Returns wether the given player is authorized to access resource "access"
1711 2362
1712=item $player_object->enter_link 2363=item $player_object->enter_link
1713 2364
1714Freezes the player and moves him/her to a special map (C<{link}>). 2365Freezes the player and moves him/her to a special map (C<{link}>).
1715 2366
1716The player should be reaosnably safe there for short amounts of time. You 2367The player should be reasonably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though. 2368I<MUST> call C<leave_link> as soon as possible, though.
1718 2369
2370Will never block.
2371
1719=item $player_object->leave_link ($map, $x, $y) 2372=item $player_object->leave_link ($map, $x, $y)
1720 2373
1721Moves the player out of the specila link map onto the given map. If the 2374Moves 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 2375map. 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, 2376to the location he/she was before the call to C<enter_link>, or, if that
1724to the emergency map position. 2377fails, to the emergency map position.
1725 2378
1726Might block. 2379Might block.
1727 2380
1728=cut 2381=cut
2382
2383sub link_map {
2384 unless ($LINK_MAP) {
2385 $LINK_MAP = cf::map::find "{link}"
2386 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
2387 $LINK_MAP->load;
2388 }
2389
2390 $LINK_MAP
2391}
1729 2392
1730sub cf::object::player::enter_link { 2393sub cf::object::player::enter_link {
1731 my ($self) = @_; 2394 my ($self) = @_;
1732 2395
1733 $self->deactivate_recursive; 2396 $self->deactivate_recursive;
1734 2397
1735 return if $self->map == $LINK_MAP; 2398 return if UNIVERSAL::isa $self->map, "ext::map_link";
1736 2399
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map; 2401 if $self->map && $self->map->{path} ne "{link}";
1739 2402
1740 $self->enter_map ($LINK_MAP, 20, 20); 2403 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1741} 2404}
1742 2405
1743sub cf::object::player::leave_link { 2406sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_; 2407 my ($self, $map, $x, $y) = @_;
2408
2409 return unless $self->contr->active;
1745 2410
1746 my $link_pos = delete $self->{_link_pos}; 2411 my $link_pos = delete $self->{_link_pos};
1747 2412
1748 unless ($map) { 2413 unless ($map) {
1749 # restore original map position 2414 # restore original map position
1763 # use -1 or undef as default coordinates, not 0, 0 2428 # use -1 or undef as default coordinates, not 0, 0
1764 ($x, $y) = ($map->enter_x, $map->enter_y) 2429 ($x, $y) = ($map->enter_x, $map->enter_y)
1765 if $x <=0 && $y <= 0; 2430 if $x <=0 && $y <= 0;
1766 2431
1767 $map->load; 2432 $map->load;
1768 $map->load_diag; 2433 $map->load_neighbours;
1769 2434
1770 return unless $self->contr->active; 2435 return unless $self->contr->active;
1771 $self->activate_recursive; 2436 $self->activate_recursive;
2437
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1772 $self->enter_map ($map, $x, $y); 2439 $self->enter_map ($map, $x, $y);
1773} 2440}
1774 2441
1775cf::player->attach ( 2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1776 on_logout => sub {
1777 my ($pl) = @_;
1778 2443
1779 # abort map switching before logout 2444Moves the player to the given map-path and coordinates by first freezing
1780 if ($pl->ob->{_link_pos}) { 2445her, loading and preparing them map, calling the provided $check callback
1781 cf::sync_job { 2446that has to return the map if sucecssful, and then unfreezes the player on
1782 $pl->ob->leave_link 2447the new (success) or old (failed) map position. In either case, $done will
1783 }; 2448be called at the end of this process.
1784 }
1785 },
1786 on_login => sub {
1787 my ($pl) = @_;
1788 2449
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 2450=cut
2451
2452our $GOTOGEN;
1810 2453
1811sub cf::object::player::goto { 2454sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_; 2455 my ($self, $path, $x, $y, $check, $done) = @_;
1813 2456
1814 $path = new cf::path $path; 2457 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1815 2459
1816 $self->enter_link; 2460 $self->enter_link;
1817 2461
1818 (async { 2462 (async {
1819 my $map = cf::map::find $path->as_string; 2463 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs];
2467
2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2473 }
2474 # else put us there anyways for now #d#
2475
2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2479 }
2480 }
2481
2482 my $map = eval {
2483 my $map = defined $path ? cf::map::find $path : undef;
2484
2485 if ($map) {
1820 $map = $map->customise_for ($self) if $map; 2486 $map = $map->customise_for ($self);
1821 2487 $map = $check->($map) if $check && $map;
1822# warn "entering ", $map->path, " at ($x, $y)\n" 2488 } else {
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2490 }
1826 2491
2492 $map
2493 };
2494
2495 if ($@) {
2496 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2497 LOG llevError | logBacktrace, Carp::longmess $@;
2498 }
2499
2500 if ($gen == $self->{_goto_generation}) {
2501 delete $self->{_goto_generation};
1827 $self->leave_link ($map, $x, $y); 2502 $self->leave_link ($map, $x, $y);
2503 }
2504
2505 $done->() if $done;
1828 })->prio (1); 2506 })->prio (1);
1829} 2507}
1830 2508
1831=item $player_object->enter_exit ($exit_object) 2509=item $player_object->enter_exit ($exit_object)
1832 2510
1834 2512
1835sub parse_random_map_params { 2513sub parse_random_map_params {
1836 my ($spec) = @_; 2514 my ($spec) = @_;
1837 2515
1838 my $rmp = { # defaults 2516 my $rmp = { # defaults
1839 xsize => 10, 2517 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 2518 ysize => (cf::rndm 15, 40),
2519 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2520 #layout => string,
1841 }; 2521 };
1842 2522
1843 for (split /\n/, $spec) { 2523 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 2524 my ($k, $v) = split /\s+/, $_, 2;
1845 2525
1849 $rmp 2529 $rmp
1850} 2530}
1851 2531
1852sub prepare_random_map { 2532sub prepare_random_map {
1853 my ($exit) = @_; 2533 my ($exit) = @_;
2534
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 2536
1855 # all this does is basically replace the /! path by 2537 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 2538 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 2539 # that depends on the exit object
1858 2540
1859 my $rmp = parse_random_map_params $exit->msg; 2541 my $rmp = parse_random_map_params $exit->msg;
1860 2542
1861 if ($exit->map) { 2543 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 2544 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 2545 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 2546 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 2547 $rmp->{origin_y} = $exit->y;
1866 } 2548 }
1867 2549
1868 $rmp->{random_seed} ||= $exit->random_seed; 2550 $rmp->{random_seed} ||= $exit->random_seed;
1869 2551
1870 my $data = cf::to_json $rmp; 2552 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 2553 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta";
1872 2555
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 2557 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh;
2559 aio_rename "$meta~", $meta;
1875 2560
1876 $exit->slaying ("?random/$md5"); 2561 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 2562 $exit->msg (undef);
1878 } 2563 }
1879} 2564}
1881sub cf::object::player::enter_exit { 2566sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 2567 my ($self, $exit) = @_;
1883 2568
1884 return unless $self->type == cf::PLAYER; 2569 return unless $self->type == cf::PLAYER;
1885 2570
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
1886 $self->enter_link; 2582 $self->enter_link;
2583
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
1887 2587
1888 (async { 2588 (async {
1889 $self->deactivate_recursive; # just to be sure 2589 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 2590 unless (eval {
1891 prepare_random_map $exit 2591 $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 2592
1897 1; 2593 1;
1898 }) { 2594 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 2595 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 2596 . "I'll try to bring you back to the map you were before. "
1901 . "Please report this to the dungeon master!", 2597 . "Please report this to the dungeon master!",
1902 cf::NDI_UNIQUE | cf::NDI_RED); 2598 cf::NDI_UNIQUE | cf::NDI_RED);
1903 2599
1904 warn "ERROR in enter_exit: $@"; 2600 warn "ERROR in enter_exit: $@";
1905 $self->leave_link; 2601 $self->leave_link;
1906 } 2602 }
1907 })->prio (1); 2603 })->prio (1);
1920 2616
1921sub cf::client::send_drawinfo { 2617sub cf::client::send_drawinfo {
1922 my ($self, $text, $flags) = @_; 2618 my ($self, $text, $flags) = @_;
1923 2619
1924 utf8::encode $text; 2620 utf8::encode $text;
1925 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2621 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1926} 2622}
1927 2623
2624=item $client->send_msg ($channel, $msg, $color, [extra...])
2625
2626Send a drawinfo or msg packet to the client, formatting the msg for the
2627client if neccessary. C<$type> should be a string identifying the type of
2628the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet.
2630
2631=cut
2632
2633our %CHANNEL = (
2634 "c/identify" => {
2635 id => "identify",
2636 title => "Identify",
2637 reply => undef,
2638 tooltip => "Items recently identified",
2639 },
2640 "c/examine" => {
2641 id => "examine",
2642 title => "Examine",
2643 reply => undef,
2644 tooltip => "Signs and other items you examined",
2645 },
2646);
2647
2648sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_;
2650
2651 $msg = $self->pl->expand_cfpod ($msg);
2652
2653 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654
2655 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2657
2658 if (ref $channel) {
2659 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel)
2663 if $self->can_msg;
2664 }
2665
2666 $channel = $channel->{id};
2667 }
2668
2669 return unless @extra || length $msg;
2670
2671 if ($self->can_msg) {
2672 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF;
2675
2676 $self->send_packet ("msg " . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2678 } else {
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689
2690 $color &= cf::NDI_COLOR_MASK;
2691
2692 utf8::encode $msg;
2693
2694 if (0 && $msg =~ /\[/) {
2695 # COMMAND/INFO
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 }
2703}
2704
2705=item $client->ext_msg ($type, @msg)
2706
2707Sends an ext event to the client.
2708
2709=cut
2710
2711sub cf::client::ext_msg($$@) {
2712 my ($self, $type, @msg) = @_;
2713
2714 if ($self->extcmd == 2) {
2715 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2716 } elsif ($self->extcmd == 1) { # TODO: remove
2717 push @msg, msgtype => "event_$type";
2718 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2719 }
2720}
2721
2722=item $client->ext_reply ($msgid, @msg)
2723
2724Sends an ext reply to the client.
2725
2726=cut
2727
2728sub cf::client::ext_reply($$@) {
2729 my ($self, $id, @msg) = @_;
2730
2731 if ($self->extcmd == 2) {
2732 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2733 } elsif ($self->extcmd == 1) {
2734 #TODO: version 1, remove
2735 unshift @msg, msgtype => "reply", msgid => $id;
2736 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2737 }
2738}
1928 2739
1929=item $success = $client->query ($flags, "text", \&cb) 2740=item $success = $client->query ($flags, "text", \&cb)
1930 2741
1931Queues a query to the client, calling the given callback with 2742Queues a query to the client, calling the given callback with
1932the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2743the 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>. 2744C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1934 2745
1935Queries can fail, so check the return code. Or don't, as queries will become 2746Queries can fail, so check the return code. Or don't, as queries will
1936reliable at some point in the future. 2747become reliable at some point in the future.
1937 2748
1938=cut 2749=cut
1939 2750
1940sub cf::client::query { 2751sub cf::client::query {
1941 my ($self, $flags, $text, $cb) = @_; 2752 my ($self, $flags, $text, $cb) = @_;
1949 utf8::encode $text; 2760 utf8::encode $text;
1950 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2761 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1951 2762
1952 $self->send_packet ($self->{query_queue}[0][0]) 2763 $self->send_packet ($self->{query_queue}[0][0])
1953 if @{ $self->{query_queue} } == 1; 2764 if @{ $self->{query_queue} } == 1;
2765
2766 1
1954} 2767}
1955 2768
1956cf::client->attach ( 2769cf::client->attach (
2770 on_connect => sub {
2771 my ($ns) = @_;
2772
2773 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2774 },
1957 on_reply => sub { 2775 on_reply => sub {
1958 my ($ns, $msg) = @_; 2776 my ($ns, $msg) = @_;
1959 2777
1960 # this weird shuffling is so that direct followup queries 2778 # this weird shuffling is so that direct followup queries
1961 # get handled first 2779 # get handled first
1962 my $queue = delete $ns->{query_queue} 2780 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here 2781 or return; # be conservative, not sure how that can happen, but we saw a crash here
1964 2782
1965 (shift @$queue)->[1]->($msg); 2783 (shift @$queue)->[1]->($msg);
2784 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2785
1967 push @{ $ns->{query_queue} }, @$queue; 2786 push @{ $ns->{query_queue} }, @$queue;
1968 2787
1969 if (@{ $ns->{query_queue} } == @$queue) { 2788 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2789 if (@$queue) {
1972 } else { 2791 } else {
1973 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2792 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1974 } 2793 }
1975 } 2794 }
1976 }, 2795 },
2796 on_exticmd => sub {
2797 my ($ns, $buf) = @_;
2798
2799 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2800
2801 if (ref $msg) {
2802 my ($type, $reply, @payload) =
2803 "ARRAY" eq ref $msg
2804 ? @$msg
2805 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2806
2807 my @reply;
2808
2809 if (my $cb = $EXTICMD{$type}) {
2810 @reply = $cb->($ns, @payload);
2811 }
2812
2813 $ns->ext_reply ($reply, @reply)
2814 if $reply;
2815
2816 } else {
2817 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2818 }
2819
2820 cf::override;
2821 },
1977); 2822);
1978 2823
1979=item $client->async (\&cb) 2824=item $client->async (\&cb)
1980 2825
1981Create a new coroutine, running the specified callback. The coroutine will 2826Create a new coroutine, running the specified callback. The coroutine will
2022our $safe = new Safe "safe"; 2867our $safe = new Safe "safe";
2023our $safe_hole = new Safe::Hole; 2868our $safe_hole = new Safe::Hole;
2024 2869
2025$SIG{FPE} = 'IGNORE'; 2870$SIG{FPE} = 'IGNORE';
2026 2871
2027$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2872$safe->permit_only (Opcode::opset qw(
2873 :base_core :base_mem :base_orig :base_math
2874 grepstart grepwhile mapstart mapwhile
2875 sort time
2876));
2028 2877
2029# here we export the classes and methods available to script code 2878# here we export the classes and methods available to script code
2030 2879
2031=pod 2880=pod
2032 2881
2033The following fucntions and emthods are available within a safe environment: 2882The following functions and methods are available within a safe environment:
2034 2883
2035 cf::object contr pay_amount pay_player map 2884 cf::object
2885 contr pay_amount pay_player map x y force_find force_add
2886 insert remove name archname title slaying race decrease_ob_nr
2887
2036 cf::object::player player 2888 cf::object::player
2037 cf::player peaceful 2889 player
2038 cf::map trigger 2890
2891 cf::player
2892 peaceful
2893
2894 cf::map
2895 trigger
2039 2896
2040=cut 2897=cut
2041 2898
2042for ( 2899for (
2043 ["cf::object" => qw(contr pay_amount pay_player map)], 2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race
2902 decrease_ob_nr)],
2044 ["cf::object::player" => qw(player)], 2903 ["cf::object::player" => qw(player)],
2045 ["cf::player" => qw(peaceful)], 2904 ["cf::player" => qw(peaceful)],
2046 ["cf::map" => qw(trigger)], 2905 ["cf::map" => qw(trigger)],
2047) { 2906) {
2048 no strict 'refs'; 2907 no strict 'refs';
2119=back 2978=back
2120 2979
2121=cut 2980=cut
2122 2981
2123############################################################################# 2982#############################################################################
2983# the server's init and main functions
2124 2984
2125=head2 EXTENSION DATABASE SUPPORT 2985sub load_facedata($) {
2986 my ($path) = @_;
2126 2987
2127Crossfire maintains a very simple database for extension use. It can 2988 # HACK to clear player env face cache, we need some signal framework
2128currently store anything that can be serialised using Storable, which 2989 # for this (global event?)
2129excludes objects. 2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2130 2991
2131The parameter C<$family> should best start with the name of the extension 2992 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2132using it, it should be unique.
2133 2993
2134=over 4 2994 warn "loading facedata from $path\n";
2135 2995
2136=item $hashref = cf::db_get $family 2996 my $facedata;
2997 0 < aio_load $path, $facedata
2998 or die "$path: $!";
2137 2999
2138Return a hashref for use by the extension C<$family>, which can be 3000 $facedata = Coro::Storable::thaw $facedata;
2139modified. After modifications, you have to call C<cf::db_dirty> or
2140C<cf::db_sync>.
2141 3001
2142=item $value = cf::db_get $family => $key 3002 $facedata->{version} == 2
3003 or cf::cleanup "$path: version mismatch, cannot proceed.";
2143 3004
2144Returns a single value from the database 3005 # patch in the exptable
2145 3006 $facedata->{resource}{"res/exp_table"} = {
2146=item cf::db_put $family => $hashref 3007 type => FT_RSRC,
2147 3008 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 }); 3009 };
3010 cf::cede_to_tick;
2197 3011
2198 sub db_dirty() {
2199 $dirty = 1;
2200 $idle->start;
2201 } 3012 {
3013 my $faces = $facedata->{faceinfo};
2202 3014
2203 sub db_get($;$) { 3015 while (my ($face, $info) = each %$faces) {
2204 @_ >= 2 3016 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2205 ? $DB->{$_[0]}{$_[1]} 3017 cf::face::set_visibility $idx, $info->{visibility};
2206 : ($DB->{$_[0]} ||= { }) 3018 cf::face::set_magicmap $idx, $info->{magicmap};
2207 } 3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2208 3021
2209 sub db_put($$;$) { 3022 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 }, 3023 }
2223 );
2224}
2225 3024
2226############################################################################# 3025 while (my ($face, $info) = each %$faces) {
2227# the server's main() 3026 next unless $info->{smooth};
3027 my $idx = cf::face::find $face
3028 or next;
3029 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'";
3034 }
2228 3035
2229sub cfg_load { 3036 cf::cede_to_tick;
3037 }
3038 }
3039
3040 {
3041 my $anims = $facedata->{animinfo};
3042
3043 while (my ($anim, $info) = each %$anims) {
3044 cf::anim::set $anim, $info->{frames}, $info->{facings};
3045 cf::cede_to_tick;
3046 }
3047
3048 cf::anim::invalidate_all; # d'oh
3049 }
3050
3051 {
3052 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource};
3055
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data;
3061
3062 if ($info->{type} & 1) {
3063 # prepend meta info
3064
3065 my $meta = $enc->encode ({
3066 name => $name,
3067 %{ $info->{meta} || {} },
3068 });
3069
3070 $data = pack "(w/a*)*", $meta, $info->{data};
3071 } else {
3072 $data = $info->{data};
3073 }
3074
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick;
3079 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 }
3099
3100 1
3101}
3102
3103register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_;
3105
3106 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v);
3108 }
3109};
3110
3111sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = ();
3115
3116 load_resource_file "$MAPDIR/regions"
3117 or die "unable to load regions file\n";
3118
3119 for (cf::region::list) {
3120 $_->{match} = qr/$_->{match}/
3121 if exists $_->{match};
3122 }
3123}
3124
3125sub reload_facedata {
3126 load_facedata "$DATADIR/facedata"
3127 or die "unable to load facedata\n";
3128}
3129
3130sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138}
3139
3140sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n";
3143}
3144
3145sub reload_resources {
3146 warn "reloading resource files...\n";
3147
3148 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures;
3153
3154 warn "finished reloading resource files\n";
3155}
3156
3157sub init {
3158 reload_resources;
3159}
3160
3161sub reload_config {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 3162 open my $fh, "<:utf8", "$CONFDIR/config"
2231 or return; 3163 or return;
2232 3164
2233 local $/; 3165 local $/;
2234 *CFG = YAML::Syck::Load <$fh>; 3166 *CFG = YAML::Syck::Load <$fh>;
2235 3167
2249 3181
2250sub main { 3182sub main {
2251 # we must not ever block the main coroutine 3183 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 3184 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async {
2254 async { Event::one_event }; 3187 Event::one_event;
3188 })->prio (Coro::PRIO_MAX);
2255 }; 3189 };
2256 3190
2257 cfg_load; 3191 reload_config;
2258 db_load; 3192 db_init;
2259 load_extensions; 3193 load_extensions;
3194
3195 $TICK_WATCHER->start;
2260 Event::loop; 3196 Event::loop;
2261} 3197}
2262 3198
2263############################################################################# 3199#############################################################################
2264# initialisation and cleanup 3200# initialisation and cleanup
2265 3201
2266# install some emergency cleanup handlers 3202# install some emergency cleanup handlers
2267BEGIN { 3203BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 3204 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 3205 Event->signal (
3206 reentrant => 0,
2270 data => WF_AUTOCANCEL, 3207 data => WF_AUTOCANCEL,
2271 signal => $signal, 3208 signal => $signal,
3209 prio => 0,
2272 cb => sub { 3210 cb => sub {
2273 cf::cleanup "SIG$signal"; 3211 cf::cleanup "SIG$signal";
2274 }, 3212 },
2275 ); 3213 );
2276 } 3214 }
2277} 3215}
2278 3216
3217sub write_runtime {
3218 my $runtime = "$LOCALDIR/runtime";
3219
3220 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time.
3222
3223 IO::AIO::aio_utime $runtime, undef, undef;
3224
3225 my $guard = cf::lock_acquire "write_runtime";
3226
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3228 or return;
3229
3230 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server.
3233
3234 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3235 and return;
3236
3237 # always fsync - this file is important
3238 aio_fsync $fh
3239 and return;
3240
3241 # touch it again to show we are up-to-date
3242 aio_utime $fh, undef, undef;
3243
3244 close $fh
3245 or return;
3246
3247 aio_rename "$runtime~", $runtime
3248 and return;
3249
3250 warn "runtime file written.\n";
3251
3252 1
3253}
3254
2279sub emergency_save() { 3255sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop; 3256 my $freeze_guard = cf::freeze_mainloop;
2281 3257
2282 warn "enter emergency perl save\n"; 3258 warn "enter emergency perl save\n";
2283 3259
2284 cf::sync_job { 3260 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 3261 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 3262 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 3263 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 3264 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 3265 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 3266 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 3267 $pl->valid or next;
2292 $pl->save; 3268 $pl->save;
2298 my $map = $cf::MAP{$path} or next; 3274 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next; 3275 $map->valid or next;
2300 $map->save; 3276 $map->save;
2301 } 3277 }
2302 warn "end emergency map save\n"; 3278 warn "end emergency map save\n";
3279
3280 warn "begin emergency database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n";
2303 }; 3283 };
2304 3284
2305 warn "leave emergency perl save\n"; 3285 warn "leave emergency perl save\n";
2306} 3286}
2307 3287
3288sub post_cleanup {
3289 my ($make_core) = @_;
3290
3291 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core;
3293}
3294
2308sub reload() { 3295sub do_reload_perl() {
2309 # can/must only be called in main 3296 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 3297 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 3298 warn "can only reload from main coroutine";
2312 return; 3299 return;
2313 } 3300 }
2314 3301
2315 warn "reloading..."; 3302 warn "reloading...";
2316 3303
2317 warn "freezing server"; 3304 warn "entering sync_job";
2318 my $guard = freeze_mainloop; 3305
3306 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 3308 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark
2320 3310
2321 warn "sync database to disk"; 3311 warn "syncing database to disk";
2322 cf::db_sync; 3312 BDB::db_env_txn_checkpoint $DB_ENV;
2323 IO::AIO::flush;
2324 3313
2325 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 3314 # if anything goes wrong in here, we should simply crash as we already saved
2327 3315
2328 warn "cancel all watchers"; 3316 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 3317 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 3318 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 3319 }
2332 3320
3321 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs;
3327 warn "iterate...";
3328 }
3329
3330 ++$RELOAD;
3331
2333 warn "cancel all extension coros"; 3332 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 3333 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 3334 %EXT_CORO = ();
2336 3335
2337 warn "remove commands"; 3336 warn "removing commands";
2338 %COMMAND = (); 3337 %COMMAND = ();
2339 3338
2340 warn "remove ext commands"; 3339 warn "removing ext/exti commands";
2341 %EXTCMD = (); 3340 %EXTCMD = ();
3341 %EXTICMD = ();
2342 3342
2343 warn "unload/nuke all extensions"; 3343 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 3344 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 3345 warn "... unloading $pkg";
2346 3346
2347 if (my $cb = $pkg->can ("unload")) { 3347 if (my $cb = $pkg->can ("unload")) {
2348 eval { 3348 eval {
2353 3353
2354 warn "... nuking $pkg"; 3354 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 3355 Symbol::delete_package $pkg;
2356 } 3356 }
2357 3357
2358 warn "unload all perl modules loaded from $LIBDIR"; 3358 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 3359 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 3361
2362 warn "removing <$k>"; 3362 warn "... unloading $k";
2363 delete $INC{$k}; 3363 delete $INC{$k};
2364 3364
2365 $k =~ s/\.pm$//; 3365 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 3366 $k =~ s/\//::/g;
2367 3367
2370 } 3370 }
2371 3371
2372 Symbol::delete_package $k; 3372 Symbol::delete_package $k;
2373 } 3373 }
2374 3374
2375 warn "get rid of safe::, as good as possible"; 3375 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 3376 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 3378
2379 warn "unload cf.pm \"a bit\""; 3379 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 3380 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"};
2381 3382
2382 # don't, removes xs symbols, too, 3383 # don't, removes xs symbols, too,
2383 # and global variables created in xs 3384 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 3385 #Symbol::delete_package __PACKAGE__;
2385 3386
3387 warn "unload completed, starting to reload now";
3388
2386 warn "reloading cf.pm"; 3389 warn "reloading cf.pm";
2387 require cf; 3390 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 3392
2390 warn "load config and database again"; 3393 warn "loading config and database again";
2391 cf::cfg_load; 3394 cf::reload_config;
2392 cf::db_load;
2393 3395
2394 warn "load extensions"; 3396 warn "loading extensions";
2395 cf::load_extensions; 3397 cf::load_extensions;
2396 3398
2397 warn "reattach attachments to objects/players"; 3399 warn "reattaching attachments to objects/players";
2398 _global_reattach; 3400 _global_reattach; # objects, sockets
2399 warn "reattach attachments to maps"; 3401 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 3402 reattach $_ for values %MAP;
2401 }; 3403 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER;
2402 3405
2403 if ($@) { 3406 warn "leaving sync_job";
3407
3408 1
3409 } or do {
2404 warn $@; 3410 warn $@;
2405 warn "error while reloading, exiting."; 3411 warn "error while reloading, exiting.";
2406 exit 1; 3412 exit 1;
2407 } 3413 };
2408 3414
2409 warn "reloaded"; 3415 warn "reloaded";
2410}; 3416};
2411 3417
2412############################################################################# 3418our $RELOAD_WATCHER; # used only during reload
2413 3419
2414unless ($LINK_MAP) { 3420sub reload_perl() {
2415 $LINK_MAP = cf::map::new; 3421 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here.
2416 3423
2417 $LINK_MAP->width (41); 3424 $RELOAD_WATCHER ||= Event->timer (
2418 $LINK_MAP->height (41); 3425 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, 3426 after => 0,
3427 data => WF_AUTOCANCEL,
2427 cb => sub { 3428 cb => sub {
2428 $_[0]->w->cancel; 3429 do_reload_perl;
2429 3430 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 }); 3431 },
2448 3432 );
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453} 3433}
2454 3434
2455register_command "reload" => sub { 3435register_command "reload" => sub {
2456 my ($who, $arg) = @_; 3436 my ($who, $arg) = @_;
2457 3437
2458 if ($who->flag (FLAG_WIZ)) { 3438 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload.");
2460 reload;
2461 $who->message ("end of reload."); 3439 $who->message ("reloading server.");
3440 async { reload_perl };
2462 } 3441 }
2463}; 3442};
2464 3443
2465unshift @INC, $LIBDIR; 3444unshift @INC, $LIBDIR;
3445
3446my $bug_warning = 0;
3447
3448our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN;
3450
3451sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main;
3454
3455 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait;
3458}
3459
3460sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main;
3463
3464 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait;
3467}
2466 3468
2467$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 3470 reentrant => 0,
3471 parked => 1,
2469 prio => 0, 3472 prio => 0,
2470 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 3474 data => WF_AUTOCANCEL,
2472 cb => sub { 3475 cb => sub {
3476 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10;
3479 return;
3480 }
3481
2473 $NOW = Event::time; 3482 $NOW = $tick_start = Event::time;
2474 3483
2475 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3485
2476 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 3487 $NEXT_TICK += $TICK;
2478 3488
2479 $WAIT_FOR_TICK->broadcast; 3489 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3490 $NEXT_RUNTIME_WRITE = $NOW + 10;
3491 Coro::async_pool {
3492 write_runtime
3493 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 }
3496
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send;
3499 }
3500 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send;
3502 }
3503
3504 $NOW = Event::time;
2481 3505
2482 # if we are delayed by four ticks or more, skip them all 3506 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2484 3508
2485 $TICK_WATCHER->at ($NEXT_TICK); 3509 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514
3515 _post_tick;
2487 }, 3516 },
2488); 3517);
2489 3518
3519{
3520 BDB::min_parallel 8;
2490IO::AIO::max_poll_time $TICK * 0.2; 3521 BDB::max_poll_time $TICK * 0.1;
2491 3522 $BDB_POLL_WATCHER = Event->io (
2492Event->io ( 3523 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 3524 fd => BDB::poll_fileno,
2494 poll => 'r', 3525 poll => 'r',
2495 prio => 5, 3526 prio => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb,
2498);
2499
2500Event->timer (
2501 data => WF_AUTOCANCEL, 3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545
3546 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create;
3548 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3549 | BDB::LOG_AUTOREMOVE, 1);
3550 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3551 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3552
3553 cf::sync_job {
3554 eval {
3555 BDB::db_env_open
3556 $DB_ENV,
3557 $BDBDIR,
3558 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3559 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3560 0666;
3561
3562 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3563 };
3564
3565 cf::cleanup "db_env_open(db): $@" if $@;
3566 };
3567 }
3568
3569 $BDB_DEADLOCK_WATCHER = Event->timer (
2502 after => 0, 3570 after => 3,
2503 interval => 10, 3571 interval => 1,
3572 hard => 1,
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
2504 cb => sub { 3575 cb => sub {
2505 (Coro::unblock_sub { 3576 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
2506 write_runtime 3577 },
2507 or warn "ERROR: unable to write runtime file: $!"; 3578 );
3579 $BDB_CHECKPOINT_WATCHER = Event->timer (
3580 after => 11,
3581 interval => 60,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3587 },
3588 );
3589 $BDB_TRICKLE_WATCHER = Event->timer (
3590 after => 5,
3591 interval => 10,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3597 },
3598 );
3599}
3600
3601{
3602 IO::AIO::min_parallel 8;
3603
3604 undef $Coro::AIO::WATCHER;
3605 IO::AIO::max_poll_time $TICK * 0.1;
3606 $AIO_POLL_WATCHER = Event->io (
3607 reentrant => 0,
3608 data => WF_AUTOCANCEL,
3609 fd => IO::AIO::poll_fileno,
3610 poll => 'r',
3611 prio => 6,
3612 cb => \&IO::AIO::poll_cb,
3613 );
3614}
3615
3616my $_log_backtrace;
3617
3618sub _log_backtrace {
3619 my ($msg, @addr) = @_;
3620
3621 $msg =~ s/\n//;
3622
3623 # limit the # of concurrent backtraces
3624 if ($_log_backtrace < 2) {
3625 ++$_log_backtrace;
3626 async {
3627 my @bt = fork_call {
3628 @addr = map { sprintf "%x", $_ } @addr;
3629 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3630 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3631 or die "addr2line: $!";
3632
3633 my @funcs;
3634 my @res = <$fh>;
3635 chomp for @res;
3636 while (@res) {
3637 my ($func, $line) = splice @res, 0, 2, ();
3638 push @funcs, "[$func] $line";
3639 }
3640
3641 @funcs
3642 };
3643
3644 LOG llevInfo, "[ABT] $msg\n";
3645 LOG llevInfo, "[ABT] $_\n" for @bt;
3646 --$_log_backtrace;
2508 })->(); 3647 };
3648 } else {
3649 LOG llevInfo, "[ABT] $msg\n";
3650 LOG llevInfo, "[ABT] [suppressed]\n";
2509 }, 3651 }
2510); 3652}
3653
3654# load additional modules
3655use cf::pod;
2511 3656
2512END { cf::emergency_save } 3657END { cf::emergency_save }
2513 3658
25141 36591
2515 3660

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines