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.367 by root, Wed Sep 12 11:10:11 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
87our $DB_ENV;
51 88
52our %CFG; 89our %CFG;
53 90
54our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 92our $RUNTIME;
56 93
57our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
58our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
59our $LINK_MAP; # the special {link} map 96our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61 97
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 98# used to convert map paths into valid unix filenames by replacing / by ∕
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100
101our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing
103our $tick_start; # for load detecting purposes
64 104
65binmode STDOUT; 105binmode STDOUT;
66binmode STDERR; 106binmode STDERR;
67 107
68# read virtual server time, if available 108# read virtual server time, if available
69unless ($RUNTIME || !-e cf::localdir . "/runtime") { 109unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
70 open my $fh, "<", cf::localdir . "/runtime" 110 open my $fh, "<", "$LOCALDIR/runtime"
71 or die "unable to read runtime file: $!"; 111 or die "unable to read runtime file: $!";
72 $RUNTIME = <$fh> + 0.; 112 $RUNTIME = <$fh> + 0.;
73} 113}
74 114
75mkdir cf::localdir; 115mkdir $_
76mkdir cf::localdir . "/" . cf::playerdir; 116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
77mkdir cf::localdir . "/" . cf::tmpdir;
78mkdir cf::localdir . "/" . cf::uniquedir;
79mkdir $RANDOM_MAPS;
80 117
81# a special map that is always available
82our $LINK_MAP;
83our $EMERGENCY_POSITION; 118our $EMERGENCY_POSITION;
119
120sub cf::map::normalise;
84 121
85############################################################################# 122#############################################################################
86 123
87=head2 GLOBAL VARIABLES 124=head2 GLOBAL VARIABLES
88 125
95=item $cf::RUNTIME 132=item $cf::RUNTIME
96 133
97The time this server has run, starts at 0 and is increased by $cf::TICK on 134The time this server has run, starts at 0 and is increased by $cf::TICK on
98every server tick. 135every server tick.
99 136
100=item $cf::LIBDIR 137=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
138$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
139$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
101 140
102The perl library directory, where extensions and cf-specific modules can 141Various directories - "/etc", read-only install directory, perl-library
103be found. It will be added to C<@INC> automatically. 142directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
143unique-items directory, player file directory, random maps directory and
144database environment.
104 145
105=item $cf::NOW 146=item $cf::NOW
106 147
107The time of the last (current) server tick. 148The time of the last (current) server tick.
108 149
109=item $cf::TICK 150=item $cf::TICK
110 151
111The interval between server ticks, in seconds. 152The interval between server ticks, in seconds.
153
154=item $cf::LOADAVG
155
156The current CPU load on the server (alpha-smoothed), as a value between 0
157(none) and 1 (overloaded), indicating how much time is spent on processing
158objects per tick. Healthy values are < 0.5.
159
160=item $cf::LOAD
161
162The raw value load value from the last tick.
112 163
113=item %cf::CFG 164=item %cf::CFG
114 165
115Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/crossfire/config>, or
116from wherever your confdir points to. 167from wherever your confdir points to.
117 168
118=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 169=item cf::wait_for_tick, cf::wait_for_tick_begin
119 170
120These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 171These 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 172returns 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 173per 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. 174
175=item @cf::INVOKE_RESULTS
176
177This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call.
124 180
125=back 181=back
126 182
127=cut 183=cut
128 184
129BEGIN { 185BEGIN {
130 *CORE::GLOBAL::warn = sub { 186 *CORE::GLOBAL::warn = sub {
131 my $msg = join "", @_; 187 my $msg = join "", @_;
132 utf8::encode $msg;
133 188
134 $msg .= "\n" 189 $msg .= "\n"
135 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
191
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
136 193
137 LOG llevError, $msg; 194 LOG llevError, $msg;
138 }; 195 };
139} 196}
140 197
141@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
142@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
143@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
144@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
145@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 202@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
203@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
146@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 204@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
147 205
148# we bless all objects into (empty) derived classes to force a method lookup 206# we bless all objects into (empty) derived classes to force a method lookup
149# within the Safe compartment. 207# within the Safe compartment.
150for my $pkg (qw( 208for my $pkg (qw(
151 cf::global cf::attachable 209 cf::global cf::attachable
159} 217}
160 218
161$Event::DIED = sub { 219$Event::DIED = sub {
162 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
163}; 221};
222
223#############################################################################
164 224
165=head2 UTILITY FUNCTIONS 225=head2 UTILITY FUNCTIONS
166 226
167=over 4 227=over 4
168 228
187 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
188 $d 248 $d
189 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
190} 250}
191 251
192use JSON::Syck (); # TODO# replace by JSON::PC once working
193
194=item $ref = cf::from_json $json 252=item $ref = cf::from_json $json
195 253
196Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
197 255
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 256=item $json = cf::to_json $ref
206 257
207Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
208 259
209=cut 260=cut
210 261
211sub to_json($) { 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
212 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 263
213 JSON::Syck::Dump $_[0] 264sub to_json ($) { $json_coder->encode ($_[0]) }
214} 265sub from_json ($) { $json_coder->decode ($_[0]) }
215 266
216=item cf::lock_wait $string 267=item cf::lock_wait $string
217 268
218Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
219 270
222Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
224for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
225returned. 276returned.
226 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
227Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
228uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
229 283
284=item $locked = cf::lock_active $string
285
286Return true if the lock is currently active, i.e. somebody has locked it.
287
230=cut 288=cut
231 289
232our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
233 292
234sub lock_wait($) { 293sub lock_wait($) {
235 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
236 300
237 # wait for lock, if any 301 # wait for lock, if any
238 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
239 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
240 Coro::schedule; 304 Coro::schedule;
246 310
247 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
248 lock_wait $key; 312 lock_wait $key;
249 313
250 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
251 316
252 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
253 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
254 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
255 } 321 }
256} 322}
257 323
324sub lock_active($) {
325 my ($key) = @_;
326
327 ! ! $LOCK{$key}
328}
329
258sub freeze_mainloop { 330sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active; 331 return unless $TICK_WATCHER->is_active;
260 332
261 my $guard = Coro::guard { $TICK_WATCHER->start }; 333 my $guard = Coro::guard {
334 $TICK_WATCHER->start;
335 };
262 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
263 $guard 337 $guard
338}
339
340=item cf::get_slot $time[, $priority[, $name]]
341
342Allocate $time seconds of blocking CPU time at priority C<$priority>:
343This call blocks and returns only when you have at least C<$time> seconds
344of cpu time till the next tick. The slot is only valid till the next cede.
345
346The optional C<$name> can be used to identify the job to run. It might be
347used for statistical purposes and should identify the same time-class.
348
349Useful for short background jobs.
350
351=cut
352
353our @SLOT_QUEUE;
354our $SLOT_QUEUE;
355
356$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async {
358 my $signal = new Coro::Signal;
359
360 while () {
361 next_job:
362 my $avail = cf::till_tick;
363 if ($avail > 0.01) {
364 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) {
366 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send;
368 Coro::cede;
369 goto next_job;
370 }
371 }
372 }
373
374 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait;
378 } else {
379 Coro::schedule;
380 }
381 }
382};
383
384sub get_slot($;$$) {
385 my ($time, $pri, $name) = @_;
386
387 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal;
389
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready;
393 $sig->wait;
264} 394}
265 395
266=item cf::async { BLOCK } 396=item cf::async { BLOCK }
267 397
268Currently the same as Coro::async_pool, meaning you cannot use 398Currently the same as Coro::async_pool, meaning you cannot use
273 403
274BEGIN { *async = \&Coro::async_pool } 404BEGIN { *async = \&Coro::async_pool }
275 405
276=item cf::sync_job { BLOCK } 406=item cf::sync_job { BLOCK }
277 407
278The design of crossfire+ requires that the main coro ($Coro::main) is 408The design of Crossfire TRT requires that the main coroutine ($Coro::main)
279always able to handle events or runnable, as crossfire+ is only partly 409is 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. 410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable.
281 412
282If it must be done, put the blocking parts into C<sync_job>. This will run 413If 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 414the given BLOCK in another coroutine while waiting for the result. The
284server will be frozen during this time, so the block should either finish 415server will be frozen during this time, so the block should either finish
285fast or be very important. 416fast or be very important.
288 419
289sub sync_job(&) { 420sub sync_job(&) {
290 my ($job) = @_; 421 my ($job) = @_;
291 422
292 if ($Coro::current == $Coro::main) { 423 if ($Coro::current == $Coro::main) {
424 my $time = Event::time;
425
293 # this is the main coro, too bad, we have to block 426 # this is the main coro, too bad, we have to block
294 # till the operation succeeds, freezing the server :/ 427 # till the operation succeeds, freezing the server :/
295 428
296 # TODO: use suspend/resume instead 429 # TODO: use suspend/resume instead
297 # (but this is cancel-safe) 430 # (but this is cancel-safe)
308 441
309 while ($busy) { 442 while ($busy) {
310 Coro::cede or Event::one_event; 443 Coro::cede or Event::one_event;
311 } 444 }
312 445
446 $time = Event::time - $time;
447
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load
452
313 wantarray ? @res : $res[0] 453 wantarray ? @res : $res[0]
314 } else { 454 } else {
315 # we are in another coroutine, how wonderful, everything just works 455 # we are in another coroutine, how wonderful, everything just works
316 456
317 $job->() 457 $job->()
336 $EXT_CORO{$coro+0} = $coro; 476 $EXT_CORO{$coro+0} = $coro;
337 477
338 $coro 478 $coro
339} 479}
340 480
341sub write_runtime { 481=item fork_call { }, $args
342 my $runtime = cf::localdir . "/runtime";
343 482
344 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 483Executes the given code block with the given arguments in a seperate
345 or return; 484process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling.
346 487
347 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 488=cut
348 (aio_write $fh, 0, (length $value), $value, 0) <= 0
349 and return;
350 489
351 aio_fsync $fh 490sub fork_call(&@) {
352 and return; 491 my ($cb, @args) = @_;
353 492
354 close $fh 493 # we seemingly have to make a local copy of the whole thing,
355 or return; 494 # otherwise perl prematurely frees the stuff :/
495 # TODO: investigate and fix (likely this will be rather laborious)
356 496
357 aio_rename "$runtime~", $runtime 497 my @res = Coro::Util::fork_eval {
358 and return; 498 reset_signals;
499 &$cb
500 }, @args;
359 501
502 wantarray ? @res : $res[-1]
503}
504
505=item $value = cf::db_get $family => $key
506
507Returns a single value from the environment database.
508
509=item cf::db_put $family => $key => $value
510
511Stores the given C<$value> in the family. It can currently store binary
512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
537
538our $DB;
539
540sub db_init {
541 cf::sync_job {
542 $DB ||= db_table "db";
543 };
544}
545
546sub db_get($$) {
547 my $key = "$_[0]/$_[1]";
548
549 cf::sync_job {
550 BDB::db_get $DB, undef, $key, my $data;
551
552 $! ? ()
553 : $data
360 1 554 }
555}
556
557sub db_put($$$) {
558 BDB::dbreq_pri 4;
559 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
560}
561
562=item cf::cache $id => [$paths...], $processversion => $process
563
564Generic caching function that returns the value of the resource $id,
565caching and regenerating as required.
566
567This function can block.
568
569=cut
570
571sub cache {
572 my ($id, $src, $processversion, $process) = @_;
573
574 my $meta =
575 join "\x00",
576 $processversion,
577 map {
578 aio_stat $_
579 and Carp::croak "$_: $!";
580
581 ($_, (stat _)[7,9])
582 } @$src;
583
584 my $dbmeta = db_get cache => "$id/meta";
585 if ($dbmeta ne $meta) {
586 # changed, we may need to process
587
588 my @data;
589 my $md5;
590
591 for (0 .. $#$src) {
592 0 <= aio_load $src->[$_], $data[$_]
593 or Carp::croak "$src->[$_]: $!";
594 }
595
596 # if processing is expensive, check
597 # checksum first
598 if (1) {
599 $md5 =
600 join "\x00",
601 $processversion,
602 map {
603 cf::cede_to_tick;
604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
605 } 0.. $#$src;
606
607
608 my $dbmd5 = db_get cache => "$id/md5";
609 if ($dbmd5 eq $md5) {
610 db_put cache => "$id/meta", $meta;
611
612 return db_get cache => "$id/data";
613 }
614 }
615
616 my $t1 = Time::HiRes::time;
617 my $data = $process->(\@data);
618 my $t2 = Time::HiRes::time;
619
620 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
621
622 db_put cache => "$id/data", $data;
623 db_put cache => "$id/md5" , $md5;
624 db_put cache => "$id/meta", $meta;
625
626 return $data;
627 }
628
629 db_get cache => "$id/data"
630}
631
632=item cf::datalog type => key => value, ...
633
634Log a datalog packet of the given type with the given key-value pairs.
635
636=cut
637
638sub datalog($@) {
639 my ($type, %kv) = @_;
640 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
361} 641}
362 642
363=back 643=back
364 644
365=cut 645=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 646
531############################################################################# 647#############################################################################
532 648
533=head2 ATTACHABLE OBJECTS 649=head2 ATTACHABLE OBJECTS
534 650
536attach callbacks/event handlers (a collection of which is called an "attachment") 652attach callbacks/event handlers (a collection of which is called an "attachment")
537to it. All such attachable objects support the following methods. 653to it. All such attachable objects support the following methods.
538 654
539In the following description, CLASS can be any of C<global>, C<object> 655In 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 656C<player>, C<client> or C<map> (i.e. the attachable objects in
541crossfire+). 657Crossfire TRT).
542 658
543=over 4 659=over 4
544 660
545=item $attachable->attach ($attachment, key => $value...) 661=item $attachable->attach ($attachment, key => $value...)
546 662
660our @CB_TYPE = (); # registry for type (cf-object class) based events 776our @CB_TYPE = (); # registry for type (cf-object class) based events
661our @CB_MAP = (); 777our @CB_MAP = ();
662 778
663my %attachment; 779my %attachment;
664 780
781sub cf::attachable::thawer_merge {
782 # simply override everything except _meta
783 local $_[0]{_meta};
784 %{$_[0]} = %{$_[1]};
785}
786
665sub _attach_cb($$$$) { 787sub _attach_cb($$$$) {
666 my ($registry, $event, $prio, $cb) = @_; 788 my ($registry, $event, $prio, $cb) = @_;
667 789
668 use sort 'stable'; 790 use sort 'stable';
669 791
703 $registry = $CB_TYPE[$object_type] ||= []; 825 $registry = $CB_TYPE[$object_type] ||= [];
704 826
705 } elsif ($type eq "subtype") { 827 } elsif ($type eq "subtype") {
706 defined $object_type or Carp::croak "subtype specified without type"; 828 defined $object_type or Carp::croak "subtype specified without type";
707 my $object_subtype = shift @arg; 829 my $object_subtype = shift @arg;
708 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 830 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
709 831
710 } elsif ($type eq "package") { 832 } elsif ($type eq "package") {
711 my $pkg = shift @arg; 833 my $pkg = shift @arg;
712 834
713 while (my ($name, $id) = each %cb_id) { 835 while (my ($name, $id) = each %cb_id) {
742 _attach $registry, $klass, @attach; 864 _attach $registry, $klass, @attach;
743 } 865 }
744 866
745 $obj->{$name} = \%arg; 867 $obj->{$name} = \%arg;
746 } else { 868 } else {
747 warn "object uses attachment '$name' that is not available, postponing.\n"; 869 warn "object uses attachment '$name' which is not available, postponing.\n";
748 } 870 }
749 871
750 $obj->{_attachment}{$name} = undef; 872 $obj->{_attachment}{$name} = undef;
751} 873}
752 874
754 if (ref $_[0]) { 876 if (ref $_[0]) {
755 _object_attach @_; 877 _object_attach @_;
756 } else { 878 } else {
757 _attach shift->_attach_registry, @_; 879 _attach shift->_attach_registry, @_;
758 } 880 }
881 _recalc_want;
759}; 882};
760 883
761# all those should be optimised 884# all those should be optimised
762sub cf::attachable::detach { 885sub cf::attachable::detach {
763 my ($obj, $name) = @_; 886 my ($obj, $name) = @_;
766 delete $obj->{_attachment}{$name}; 889 delete $obj->{_attachment}{$name};
767 reattach ($obj); 890 reattach ($obj);
768 } else { 891 } else {
769 Carp::croak "cannot, currently, detach class attachments"; 892 Carp::croak "cannot, currently, detach class attachments";
770 } 893 }
894 _recalc_want;
771}; 895};
772 896
773sub cf::attachable::attached { 897sub cf::attachable::attached {
774 my ($obj, $name) = @_; 898 my ($obj, $name) = @_;
775 899
790 "; 914 ";
791 die if $@; 915 die if $@;
792} 916}
793 917
794our $override; 918our $override;
795our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 919our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
796 920
797sub override { 921sub override {
798 $override = 1; 922 $override = 1;
799 @invoke_results = (); 923 @INVOKE_RESULTS = (@_);
800} 924}
801 925
802sub do_invoke { 926sub do_invoke {
803 my $event = shift; 927 my $event = shift;
804 my $callbacks = shift; 928 my $callbacks = shift;
805 929
806 @invoke_results = (); 930 @INVOKE_RESULTS = ();
807 931
808 local $override; 932 local $override;
809 933
810 for (@$callbacks) { 934 for (@$callbacks) {
811 eval { &{$_->[1]} }; 935 eval { &{$_->[1]} };
828 952
829Generate an object-specific event with the given arguments. 953Generate an object-specific event with the given arguments.
830 954
831This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 955This 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 956removed in future versions), and there is no public API to access override
833results (if you must, access C<@cf::invoke_results> directly). 957results (if you must, access C<@cf::INVOKE_RESULTS> directly).
834 958
835=back 959=back
836 960
837=cut 961=cut
838 962
839############################################################################# 963#############################################################################
840# object support 964# object support
965#
966
967sub _can_merge {
968 my ($ob1, $ob2) = @_;
969
970 local $Storable::canonical = 1;
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973
974 $fob1 eq $fob2
975}
841 976
842sub reattach { 977sub reattach {
843 # basically do the same as instantiate, without calling instantiate 978 # basically do the same as instantiate, without calling instantiate
844 my ($obj) = @_; 979 my ($obj) = @_;
980
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
845 982
846 my $registry = $obj->registry; 983 my $registry = $obj->registry;
847 984
848 @$registry = (); 985 @$registry = ();
849 986
888); 1025);
889 1026
890sub object_freezer_save { 1027sub object_freezer_save {
891 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
892 1029
1030 my $guard = cf::lock_acquire "io";
1031
893 sync_job { 1032 sync_job {
894 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
895 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
896 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
897 1037
898 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
899 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
900 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
901 aio_fsync $fh; 1041 aio_fsync $fh if $cf::USE_FSYNC;
902 close $fh; 1042 close $fh;
903 1043
904 if (@$objs) { 1044 if (@$objs) {
905 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
906 chmod SAVE_MODE, $fh; 1046 chmod SAVE_MODE, $fh;
907 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1047 my $data = Storable::nfreeze { version => 1, objs => $objs };
908 aio_write $fh, 0, (length $data), $data, 0; 1048 aio_write $fh, 0, (length $data), $data, 0;
909 aio_fsync $fh; 1049 aio_fsync $fh if $cf::USE_FSYNC;
910 close $fh; 1050 close $fh;
911 aio_rename "$filename.pst~", "$filename.pst"; 1051 aio_rename "$filename.pst~", "$filename.pst";
912 } 1052 }
913 } else { 1053 } else {
914 aio_unlink "$filename.pst"; 1054 aio_unlink "$filename.pst";
920 } 1060 }
921 } else { 1061 } else {
922 aio_unlink $filename; 1062 aio_unlink $filename;
923 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
924 } 1064 }
925 } 1065 };
1066
1067 undef $guard;
926} 1068}
927 1069
928sub object_freezer_as_string { 1070sub object_freezer_as_string {
929 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
930 1072
935 1077
936sub object_thawer_load { 1078sub object_thawer_load {
937 my ($filename) = @_; 1079 my ($filename) = @_;
938 1080
939 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
940 1084
941 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
942 or return; 1086 or return;
943 1087
944 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
945 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
946 or return; 1090 or return;
1091
1092 undef $guard;
947 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
948 } 1094 }
949 1095
1096 utf8::decode (my $decname = $filename);
950 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
951 $filename, length $data, scalar @{$av || []};#d# 1098 $decname, length $data, scalar @{$av || []};
1099
952 return ($data, $av); 1100 ($data, $av)
953} 1101}
1102
1103=head2 COMMAND CALLBACKS
1104
1105=over 4
1106
1107=cut
954 1108
955############################################################################# 1109#############################################################################
956# command handling &c 1110# command handling &c
957 1111
958=item cf::register_command $name => \&callback($ob,$args); 1112=item cf::register_command $name => \&callback($ob,$args);
971 push @{ $COMMAND{$name} }, [$caller, $cb]; 1125 push @{ $COMMAND{$name} }, [$caller, $cb];
972} 1126}
973 1127
974=item cf::register_extcmd $name => \&callback($pl,$packet); 1128=item cf::register_extcmd $name => \&callback($pl,$packet);
975 1129
976Register a callbackf ro execution when the client sends an extcmd packet. 1130Register a callback for execution when the client sends an (synchronous)
1131extcmd packet. Ext commands will be processed in the order they are
1132received by the server, like other user commands. The first argument is
1133the logged-in player. Ext commands can only be processed after a player
1134has logged in successfully.
977 1135
978If the callback returns something, it is sent back as if reply was being 1136If the callback returns something, it is sent back as if reply was being
979called. 1137called.
980 1138
1139=item cf::register_exticmd $name => \&callback($ns,$packet);
1140
1141Register a callback for execution when the client sends an (asynchronous)
1142exticmd packet. Exti commands are processed by the server as soon as they
1143are received, i.e. out of order w.r.t. other commands. The first argument
1144is a client socket. Exti commands can be received anytime, even before
1145log-in.
1146
1147If the callback returns something, it is sent back as if reply was being
1148called.
1149
981=cut 1150=cut
982 1151
983sub register_extcmd { 1152sub register_extcmd {
984 my ($name, $cb) = @_; 1153 my ($name, $cb) = @_;
985 1154
986 $EXTCMD{$name} = $cb; 1155 $EXTCMD{$name} = $cb;
1156}
1157
1158sub register_exticmd {
1159 my ($name, $cb) = @_;
1160
1161 $EXTICMD{$name} = $cb;
987} 1162}
988 1163
989cf::player->attach ( 1164cf::player->attach (
990 on_command => sub { 1165 on_command => sub {
991 my ($pl, $name, $params) = @_; 1166 my ($pl, $name, $params) = @_;
1000 cf::override; 1175 cf::override;
1001 }, 1176 },
1002 on_extcmd => sub { 1177 on_extcmd => sub {
1003 my ($pl, $buf) = @_; 1178 my ($pl, $buf) = @_;
1004 1179
1005 my $msg = eval { from_json $buf }; 1180 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1006 1181
1007 if (ref $msg) { 1182 if (ref $msg) {
1183 my ($type, $reply, @payload) =
1184 "ARRAY" eq ref $msg
1185 ? @$msg
1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1187
1188 my @reply;
1189
1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1190 if (my $cb = $EXTCMD{$type}) {
1009 if (my %reply = $cb->($pl, $msg)) { 1191 @reply = $cb->($pl, @payload);
1010 $pl->ext_reply ($msg->{msgid}, %reply);
1011 }
1012 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1013 } else { 1197 } else {
1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1015 } 1199 }
1016 1200
1017 cf::override; 1201 cf::override;
1018 }, 1202 },
1019); 1203);
1020 1204
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 { 1205sub load_extensions {
1206 cf::sync_job {
1207 my %todo;
1208
1049 for my $ext (<$LIBDIR/*.ext>) { 1209 for my $path (<$LIBDIR/*.ext>) {
1050 next unless -r $ext; 1210 next unless -r $path;
1051 eval { 1211
1052 load_extension $ext; 1212 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1213 my $base = $1;
1214 my $pkg = $1;
1215 $pkg =~ s/[^[:word:]]/_/g;
1216 $pkg = "ext::$pkg";
1217
1218 open my $fh, "<:utf8", $path
1219 or die "$path: $!";
1220
1221 my $source = do { local $/; <$fh> };
1222
1223 my %ext = (
1224 path => $path,
1225 base => $base,
1226 pkg => $pkg,
1227 );
1228
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231
1232 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n"
1235 . $source
1236 . "\n};\n1";
1237
1238 $todo{$base} = \%ext;
1239 }
1240
1241 my %done;
1242 while (%todo) {
1243 my $progress;
1244
1245 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip
1248 unless exists $done{$_};
1249 }
1250
1251 warn "... loading '$k' into '$v->{pkg}'\n";
1252
1253 unless (eval $v->{source}) {
1254 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n";
1256
1257 if (exists $v->{meta}{mandatory}) {
1258 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n";
1260 exit 1;
1261 }
1262
1263 warn $msg;
1264 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1053 1 1269 }
1054 } or warn "$ext not loaded: $@"; 1270
1271 skip:
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1273 unless $progress;
1274 }
1055 } 1275 };
1056} 1276}
1057 1277
1058############################################################################# 1278#############################################################################
1059# load/save/clean perl data associated with a map
1060 1279
1061*cf::mapsupport::on_clean = sub { 1280=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 1281
1074=head2 CORE EXTENSIONS 1282=head2 CORE EXTENSIONS
1075 1283
1076Functions and methods that extend core crossfire objects. 1284Functions and methods that extend core crossfire objects.
1077 1285
1083 1291
1084=head3 cf::player 1292=head3 cf::player
1085 1293
1086=over 4 1294=over 4
1087 1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1309
1088=item cf::player::find $login 1310=item cf::player::find $login
1089 1311
1090Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1091 1313
1092=cut 1314=cut
1093 1315
1094sub playerdir($) { 1316sub playerdir($) {
1095 cf::localdir 1317 "$PLAYERDIR/"
1096 . "/"
1097 . cf::playerdir
1098 . "/"
1099 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1318 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1100} 1319}
1101 1320
1102sub path($) { 1321sub path($) {
1103 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1322 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1104 1323
1105 (playerdir $login) . "/$login.pl" 1324 (playerdir $login) . "/playerdata"
1106} 1325}
1107 1326
1108sub find_active($) { 1327sub find_active($) {
1109 $cf::PLAYER{$_[0]} 1328 $cf::PLAYER{$_[0]}
1110 and $cf::PLAYER{$_[0]}->active 1329 and $cf::PLAYER{$_[0]}->active
1113 1332
1114sub exists($) { 1333sub exists($) {
1115 my ($login) = @_; 1334 my ($login) = @_;
1116 1335
1117 $cf::PLAYER{$login} 1336 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login } 1337 or cf::sync_job { !aio_stat path $login }
1119} 1338}
1120 1339
1121sub find($) { 1340sub find($) {
1122 return $cf::PLAYER{$_[0]} || do { 1341 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0]; 1342 my $login = $_[0];
1124 1343
1125 my $guard = cf::lock_acquire "user_find:$login"; 1344 my $guard = cf::lock_acquire "user_find:$login";
1126 1345
1127 $cf::PLAYER{$_[0]} || do { 1346 $cf::PLAYER{$_[0]} || do {
1128 my $pl = load_pl path $login 1347 # rename old playerfiles to new ones
1348 #TODO: remove when no longer required
1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1352 aio_unlink +(playerdir $login) . "/$login.pl";
1353
1354 my $f = new_from_file cf::object::thawer path $login
1129 or return; 1355 or return;
1356
1357 $f->next;
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 {
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 # todo: use ob_blocked to check all tiles of the destination "object"
2470 # for suitability.
2471
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2473 }
2474 }
2475
2476 my $map = eval {
1819 my $map = cf::map::find $path->as_string; 2477 my $map = cf::map::find $path;
2478
2479 if ($map) {
1820 $map = $map->customise_for ($self) if $map; 2480 $map = $map->customise_for ($self);
1821 2481 $map = $check->($map) if $check && $map;
1822# warn "entering ", $map->path, " at ($x, $y)\n" 2482 } else {
1823# if $map;
1824
1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2484 }
1826 2485
2486 $map
2487 };
2488
2489 if ($@) {
2490 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2491 LOG llevError | logBacktrace, Carp::longmess $@;
2492 }
2493
2494 if ($gen == $self->{_goto_generation}) {
2495 delete $self->{_goto_generation};
1827 $self->leave_link ($map, $x, $y); 2496 $self->leave_link ($map, $x, $y);
2497 }
2498
2499 $done->() if $done;
1828 })->prio (1); 2500 })->prio (1);
1829} 2501}
1830 2502
1831=item $player_object->enter_exit ($exit_object) 2503=item $player_object->enter_exit ($exit_object)
1832 2504
1834 2506
1835sub parse_random_map_params { 2507sub parse_random_map_params {
1836 my ($spec) = @_; 2508 my ($spec) = @_;
1837 2509
1838 my $rmp = { # defaults 2510 my $rmp = { # defaults
1839 xsize => 10, 2511 xsize => (cf::rndm 15, 40),
1840 ysize => 10, 2512 ysize => (cf::rndm 15, 40),
2513 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2514 #layout => string,
1841 }; 2515 };
1842 2516
1843 for (split /\n/, $spec) { 2517 for (split /\n/, $spec) {
1844 my ($k, $v) = split /\s+/, $_, 2; 2518 my ($k, $v) = split /\s+/, $_, 2;
1845 2519
1849 $rmp 2523 $rmp
1850} 2524}
1851 2525
1852sub prepare_random_map { 2526sub prepare_random_map {
1853 my ($exit) = @_; 2527 my ($exit) = @_;
2528
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
1854 2530
1855 # all this does is basically replace the /! path by 2531 # all this does is basically replace the /! path by
1856 # a new random map path (?random/...) with a seed 2532 # a new random map path (?random/...) with a seed
1857 # that depends on the exit object 2533 # that depends on the exit object
1858 2534
1859 my $rmp = parse_random_map_params $exit->msg; 2535 my $rmp = parse_random_map_params $exit->msg;
1860 2536
1861 if ($exit->map) { 2537 if ($exit->map) {
1862 $rmp->{region} = $exit->map->region_name; 2538 $rmp->{region} = $exit->region->name;
1863 $rmp->{origin_map} = $exit->map->path; 2539 $rmp->{origin_map} = $exit->map->path;
1864 $rmp->{origin_x} = $exit->x; 2540 $rmp->{origin_x} = $exit->x;
1865 $rmp->{origin_y} = $exit->y; 2541 $rmp->{origin_y} = $exit->y;
1866 } 2542 }
1867 2543
1868 $rmp->{random_seed} ||= $exit->random_seed; 2544 $rmp->{random_seed} ||= $exit->random_seed;
1869 2545
1870 my $data = cf::to_json $rmp; 2546 my $data = cf::to_json $rmp;
1871 my $md5 = Digest::MD5::md5_hex $data; 2547 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta";
1872 2549
1873 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1874 aio_write $fh, 0, (length $data), $data, 0; 2551 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh;
2553 aio_rename "$meta~", $meta;
1875 2554
1876 $exit->slaying ("?random/$md5"); 2555 $exit->slaying ("?random/$md5");
1877 $exit->msg (undef); 2556 $exit->msg (undef);
1878 } 2557 }
1879} 2558}
1881sub cf::object::player::enter_exit { 2560sub cf::object::player::enter_exit {
1882 my ($self, $exit) = @_; 2561 my ($self, $exit) = @_;
1883 2562
1884 return unless $self->type == cf::PLAYER; 2563 return unless $self->type == cf::PLAYER;
1885 2564
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
1886 $self->enter_link; 2576 $self->enter_link;
2577
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
1887 2581
1888 (async { 2582 (async {
1889 $self->deactivate_recursive; # just to be sure 2583 $self->deactivate_recursive; # just to be sure
1890 unless (eval { 2584 unless (eval {
1891 prepare_random_map $exit 2585 $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 2586
1897 1; 2587 1;
1898 }) { 2588 }) {
1899 $self->message ("Something went wrong deep within the crossfire server. " 2589 $self->message ("Something went wrong deep within the crossfire server. "
1900 . "I'll try to bring you back to the map you were before. " 2590 . "I'll try to bring you back to the map you were before. "
1901 . "Please report this to the dungeon master!", 2591 . "Please report this to the dungeon master!",
1902 cf::NDI_UNIQUE | cf::NDI_RED); 2592 cf::NDI_UNIQUE | cf::NDI_RED);
1903 2593
1904 warn "ERROR in enter_exit: $@"; 2594 warn "ERROR in enter_exit: $@";
1905 $self->leave_link; 2595 $self->leave_link;
1906 } 2596 }
1907 })->prio (1); 2597 })->prio (1);
1920 2610
1921sub cf::client::send_drawinfo { 2611sub cf::client::send_drawinfo {
1922 my ($self, $text, $flags) = @_; 2612 my ($self, $text, $flags) = @_;
1923 2613
1924 utf8::encode $text; 2614 utf8::encode $text;
1925 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2615 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1926} 2616}
1927 2617
2618=item $client->send_msg ($channel, $msg, $color, [extra...])
2619
2620Send a drawinfo or msg packet to the client, formatting the msg for the
2621client if neccessary. C<$type> should be a string identifying the type of
2622the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet.
2624
2625=cut
2626
2627our %CHANNEL = (
2628 "c/identify" => {
2629 id => "identify",
2630 title => "Identify",
2631 reply => undef,
2632 tooltip => "Items recently identified",
2633 },
2634 "c/examine" => {
2635 id => "examine",
2636 title => "Examine",
2637 reply => undef,
2638 tooltip => "Signs and other items you examined",
2639 },
2640);
2641
2642sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_;
2644
2645 $msg = $self->pl->expand_cfpod ($msg);
2646
2647 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648
2649 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2651
2652 if (ref $channel) {
2653 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg;
2658 }
2659
2660 $channel = $channel->{id};
2661 }
2662
2663 return unless @extra || length $msg;
2664
2665 if ($self->can_msg) {
2666 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF;
2669
2670 $self->send_packet ("msg " . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2672 } else {
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683
2684 $color &= cf::NDI_COLOR_MASK;
2685
2686 utf8::encode $msg;
2687
2688 if (0 && $msg =~ /\[/) {
2689 # COMMAND/INFO
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 }
2697}
2698
2699=item $client->ext_msg ($type, @msg)
2700
2701Sends an ext event to the client.
2702
2703=cut
2704
2705sub cf::client::ext_msg($$@) {
2706 my ($self, $type, @msg) = @_;
2707
2708 if ($self->extcmd == 2) {
2709 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2710 } elsif ($self->extcmd == 1) { # TODO: remove
2711 push @msg, msgtype => "event_$type";
2712 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2713 }
2714}
2715
2716=item $client->ext_reply ($msgid, @msg)
2717
2718Sends an ext reply to the client.
2719
2720=cut
2721
2722sub cf::client::ext_reply($$@) {
2723 my ($self, $id, @msg) = @_;
2724
2725 if ($self->extcmd == 2) {
2726 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2727 } elsif ($self->extcmd == 1) {
2728 #TODO: version 1, remove
2729 unshift @msg, msgtype => "reply", msgid => $id;
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 }
2732}
1928 2733
1929=item $success = $client->query ($flags, "text", \&cb) 2734=item $success = $client->query ($flags, "text", \&cb)
1930 2735
1931Queues a query to the client, calling the given callback with 2736Queues a query to the client, calling the given callback with
1932the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2737the 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>. 2738C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1934 2739
1935Queries can fail, so check the return code. Or don't, as queries will become 2740Queries can fail, so check the return code. Or don't, as queries will
1936reliable at some point in the future. 2741become reliable at some point in the future.
1937 2742
1938=cut 2743=cut
1939 2744
1940sub cf::client::query { 2745sub cf::client::query {
1941 my ($self, $flags, $text, $cb) = @_; 2746 my ($self, $flags, $text, $cb) = @_;
1949 utf8::encode $text; 2754 utf8::encode $text;
1950 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2755 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1951 2756
1952 $self->send_packet ($self->{query_queue}[0][0]) 2757 $self->send_packet ($self->{query_queue}[0][0])
1953 if @{ $self->{query_queue} } == 1; 2758 if @{ $self->{query_queue} } == 1;
2759
2760 1
1954} 2761}
1955 2762
1956cf::client->attach ( 2763cf::client->attach (
2764 on_connect => sub {
2765 my ($ns) = @_;
2766
2767 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2768 },
1957 on_reply => sub { 2769 on_reply => sub {
1958 my ($ns, $msg) = @_; 2770 my ($ns, $msg) = @_;
1959 2771
1960 # this weird shuffling is so that direct followup queries 2772 # this weird shuffling is so that direct followup queries
1961 # get handled first 2773 # get handled first
1962 my $queue = delete $ns->{query_queue} 2774 my $queue = delete $ns->{query_queue}
1963 or return; # be conservative, not sure how that can happen, but we saw a crash here 2775 or return; # be conservative, not sure how that can happen, but we saw a crash here
1964 2776
1965 (shift @$queue)->[1]->($msg); 2777 (shift @$queue)->[1]->($msg);
2778 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1966 2779
1967 push @{ $ns->{query_queue} }, @$queue; 2780 push @{ $ns->{query_queue} }, @$queue;
1968 2781
1969 if (@{ $ns->{query_queue} } == @$queue) { 2782 if (@{ $ns->{query_queue} } == @$queue) {
1970 if (@$queue) { 2783 if (@$queue) {
1972 } else { 2785 } else {
1973 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2786 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1974 } 2787 }
1975 } 2788 }
1976 }, 2789 },
2790 on_exticmd => sub {
2791 my ($ns, $buf) = @_;
2792
2793 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2794
2795 if (ref $msg) {
2796 my ($type, $reply, @payload) =
2797 "ARRAY" eq ref $msg
2798 ? @$msg
2799 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2800
2801 my @reply;
2802
2803 if (my $cb = $EXTICMD{$type}) {
2804 @reply = $cb->($ns, @payload);
2805 }
2806
2807 $ns->ext_reply ($reply, @reply)
2808 if $reply;
2809
2810 } else {
2811 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2812 }
2813
2814 cf::override;
2815 },
1977); 2816);
1978 2817
1979=item $client->async (\&cb) 2818=item $client->async (\&cb)
1980 2819
1981Create a new coroutine, running the specified callback. The coroutine will 2820Create a new coroutine, running the specified callback. The coroutine will
2022our $safe = new Safe "safe"; 2861our $safe = new Safe "safe";
2023our $safe_hole = new Safe::Hole; 2862our $safe_hole = new Safe::Hole;
2024 2863
2025$SIG{FPE} = 'IGNORE'; 2864$SIG{FPE} = 'IGNORE';
2026 2865
2027$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2866$safe->permit_only (Opcode::opset qw(
2867 :base_core :base_mem :base_orig :base_math
2868 grepstart grepwhile mapstart mapwhile
2869 sort time
2870));
2028 2871
2029# here we export the classes and methods available to script code 2872# here we export the classes and methods available to script code
2030 2873
2031=pod 2874=pod
2032 2875
2033The following fucntions and emthods are available within a safe environment: 2876The following functions and methods are available within a safe environment:
2034 2877
2035 cf::object contr pay_amount pay_player map 2878 cf::object
2879 contr pay_amount pay_player map x y force_find force_add
2880 insert remove name archname title slaying race decrease_ob_nr
2881
2036 cf::object::player player 2882 cf::object::player
2037 cf::player peaceful 2883 player
2038 cf::map trigger 2884
2885 cf::player
2886 peaceful
2887
2888 cf::map
2889 trigger
2039 2890
2040=cut 2891=cut
2041 2892
2042for ( 2893for (
2043 ["cf::object" => qw(contr pay_amount pay_player map)], 2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race
2896 decrease_ob_nr)],
2044 ["cf::object::player" => qw(player)], 2897 ["cf::object::player" => qw(player)],
2045 ["cf::player" => qw(peaceful)], 2898 ["cf::player" => qw(peaceful)],
2046 ["cf::map" => qw(trigger)], 2899 ["cf::map" => qw(trigger)],
2047) { 2900) {
2048 no strict 'refs'; 2901 no strict 'refs';
2119=back 2972=back
2120 2973
2121=cut 2974=cut
2122 2975
2123############################################################################# 2976#############################################################################
2977# the server's init and main functions
2124 2978
2125=head2 EXTENSION DATABASE SUPPORT 2979sub load_facedata($) {
2980 my ($path) = @_;
2126 2981
2127Crossfire maintains a very simple database for extension use. It can 2982 # HACK to clear player env face cache, we need some signal framework
2128currently store anything that can be serialised using Storable, which 2983 # for this (global event?)
2129excludes objects. 2984 %ext::player_env::MUSIC_FACE_CACHE = ();
2130 2985
2131The parameter C<$family> should best start with the name of the extension 2986 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2132using it, it should be unique.
2133 2987
2134=over 4 2988 warn "loading facedata from $path\n";
2135 2989
2136=item $hashref = cf::db_get $family 2990 my $facedata;
2991 0 < aio_load $path, $facedata
2992 or die "$path: $!";
2137 2993
2138Return a hashref for use by the extension C<$family>, which can be 2994 $facedata = Coro::Storable::thaw $facedata;
2139modified. After modifications, you have to call C<cf::db_dirty> or
2140C<cf::db_sync>.
2141 2995
2142=item $value = cf::db_get $family => $key 2996 $facedata->{version} == 2
2997 or cf::cleanup "$path: version mismatch, cannot proceed.";
2143 2998
2144Returns a single value from the database 2999 # patch in the exptable
2145 3000 $facedata->{resource}{"res/exp_table"} = {
2146=item cf::db_put $family => $hashref 3001 type => FT_RSRC,
2147 3002 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 }); 3003 };
3004 cf::cede_to_tick;
2197 3005
2198 sub db_dirty() {
2199 $dirty = 1;
2200 $idle->start;
2201 } 3006 {
3007 my $faces = $facedata->{faceinfo};
2202 3008
2203 sub db_get($;$) { 3009 while (my ($face, $info) = each %$faces) {
2204 @_ >= 2 3010 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2205 ? $DB->{$_[0]}{$_[1]} 3011 cf::face::set_visibility $idx, $info->{visibility};
2206 : ($DB->{$_[0]} ||= { }) 3012 cf::face::set_magicmap $idx, $info->{magicmap};
2207 } 3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2208 3015
2209 sub db_put($$;$) { 3016 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 }, 3017 }
2223 );
2224}
2225 3018
2226############################################################################# 3019 while (my ($face, $info) = each %$faces) {
2227# the server's main() 3020 next unless $info->{smooth};
3021 my $idx = cf::face::find $face
3022 or next;
3023 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'";
3028 }
2228 3029
2229sub cfg_load { 3030 cf::cede_to_tick;
3031 }
3032 }
3033
3034 {
3035 my $anims = $facedata->{animinfo};
3036
3037 while (my ($anim, $info) = each %$anims) {
3038 cf::anim::set $anim, $info->{frames}, $info->{facings};
3039 cf::cede_to_tick;
3040 }
3041
3042 cf::anim::invalidate_all; # d'oh
3043 }
3044
3045 {
3046 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource};
3049
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data;
3055
3056 if ($info->{type} & 1) {
3057 # prepend meta info
3058
3059 my $meta = $enc->encode ({
3060 name => $name,
3061 %{ $info->{meta} || {} },
3062 });
3063
3064 $data = pack "(w/a*)*", $meta, $info->{data};
3065 } else {
3066 $data = $info->{data};
3067 }
3068
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick;
3073 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 }
3093
3094 1
3095}
3096
3097register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_;
3099
3100 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v);
3102 }
3103};
3104
3105sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = ();
3109
3110 load_resource_file "$MAPDIR/regions"
3111 or die "unable to load regions file\n";
3112
3113 for (cf::region::list) {
3114 $_->{match} = qr/$_->{match}/
3115 if exists $_->{match};
3116 }
3117}
3118
3119sub reload_facedata {
3120 load_facedata "$DATADIR/facedata"
3121 or die "unable to load facedata\n";
3122}
3123
3124sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132}
3133
3134sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n";
3137}
3138
3139sub reload_resources {
3140 warn "reloading resource files...\n";
3141
3142 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures;
3147
3148 warn "finished reloading resource files\n";
3149}
3150
3151sub init {
3152 reload_resources;
3153}
3154
3155sub reload_config {
2230 open my $fh, "<:utf8", cf::confdir . "/config" 3156 open my $fh, "<:utf8", "$CONFDIR/config"
2231 or return; 3157 or return;
2232 3158
2233 local $/; 3159 local $/;
2234 *CFG = YAML::Syck::Load <$fh>; 3160 *CFG = YAML::Syck::Load <$fh>;
2235 3161
2249 3175
2250sub main { 3176sub main {
2251 # we must not ever block the main coroutine 3177 # we must not ever block the main coroutine
2252 local $Coro::idle = sub { 3178 local $Coro::idle = sub {
2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async {
2254 async { Event::one_event }; 3181 Event::one_event;
3182 })->prio (Coro::PRIO_MAX);
2255 }; 3183 };
2256 3184
2257 cfg_load; 3185 reload_config;
2258 db_load; 3186 db_init;
2259 load_extensions; 3187 load_extensions;
3188
3189 $TICK_WATCHER->start;
2260 Event::loop; 3190 Event::loop;
2261} 3191}
2262 3192
2263############################################################################# 3193#############################################################################
2264# initialisation and cleanup 3194# initialisation and cleanup
2265 3195
2266# install some emergency cleanup handlers 3196# install some emergency cleanup handlers
2267BEGIN { 3197BEGIN {
2268 for my $signal (qw(INT HUP TERM)) { 3198 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal ( 3199 Event->signal (
3200 reentrant => 0,
2270 data => WF_AUTOCANCEL, 3201 data => WF_AUTOCANCEL,
2271 signal => $signal, 3202 signal => $signal,
3203 prio => 0,
2272 cb => sub { 3204 cb => sub {
2273 cf::cleanup "SIG$signal"; 3205 cf::cleanup "SIG$signal";
2274 }, 3206 },
2275 ); 3207 );
2276 } 3208 }
2277} 3209}
2278 3210
3211sub write_runtime {
3212 my $runtime = "$LOCALDIR/runtime";
3213
3214 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time.
3216
3217 IO::AIO::aio_utime $runtime, undef, undef;
3218
3219 my $guard = cf::lock_acquire "write_runtime";
3220
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3222 or return;
3223
3224 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server.
3227
3228 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3229 and return;
3230
3231 # always fsync - this file is important
3232 aio_fsync $fh
3233 and return;
3234
3235 # touch it again to show we are up-to-date
3236 aio_utime $fh, undef, undef;
3237
3238 close $fh
3239 or return;
3240
3241 aio_rename "$runtime~", $runtime
3242 and return;
3243
3244 warn "runtime file written.\n";
3245
3246 1
3247}
3248
2279sub emergency_save() { 3249sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop; 3250 my $freeze_guard = cf::freeze_mainloop;
2281 3251
2282 warn "enter emergency perl save\n"; 3252 warn "enter emergency perl save\n";
2283 3253
2284 cf::sync_job { 3254 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl 3255 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players 3256 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously. 3257 # and maps saved/destroyed asynchronously.
2288 warn "begin emergency player save\n"; 3258 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) { 3259 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next; 3260 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next; 3261 $pl->valid or next;
2292 $pl->save; 3262 $pl->save;
2298 my $map = $cf::MAP{$path} or next; 3268 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next; 3269 $map->valid or next;
2300 $map->save; 3270 $map->save;
2301 } 3271 }
2302 warn "end emergency map save\n"; 3272 warn "end emergency map save\n";
3273
3274 warn "begin emergency database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n";
2303 }; 3277 };
2304 3278
2305 warn "leave emergency perl save\n"; 3279 warn "leave emergency perl save\n";
2306} 3280}
2307 3281
3282sub post_cleanup {
3283 my ($make_core) = @_;
3284
3285 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core;
3287}
3288
2308sub reload() { 3289sub do_reload_perl() {
2309 # can/must only be called in main 3290 # can/must only be called in main
2310 if ($Coro::current != $Coro::main) { 3291 if ($Coro::current != $Coro::main) {
2311 warn "can only reload from main coroutine\n"; 3292 warn "can only reload from main coroutine";
2312 return; 3293 return;
2313 } 3294 }
2314 3295
2315 warn "reloading..."; 3296 warn "reloading...";
2316 3297
2317 warn "freezing server"; 3298 warn "entering sync_job";
2318 my $guard = freeze_mainloop; 3299
3300 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark
2319 cf::emergency_save; 3302 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark
2320 3304
2321 warn "sync database to disk"; 3305 warn "syncing database to disk";
2322 cf::db_sync; 3306 BDB::db_env_txn_checkpoint $DB_ENV;
2323 IO::AIO::flush;
2324 3307
2325 eval {
2326 # if anything goes wrong in here, we should simply crash as we already saved 3308 # if anything goes wrong in here, we should simply crash as we already saved
2327 3309
2328 warn "cancel all watchers"; 3310 warn "cancelling all WF_AUTOCANCEL watchers";
2329 for (Event::all_watchers) { 3311 for (Event::all_watchers) {
2330 $_->cancel if $_->data & WF_AUTOCANCEL; 3312 $_->cancel if $_->data & WF_AUTOCANCEL;
2331 } 3313 }
2332 3314
3315 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs;
3321 warn "iterate...";
3322 }
3323
3324 ++$RELOAD;
3325
2333 warn "cancel all extension coros"; 3326 warn "cancelling all extension coros";
2334 $_->cancel for values %EXT_CORO; 3327 $_->cancel for values %EXT_CORO;
2335 %EXT_CORO = (); 3328 %EXT_CORO = ();
2336 3329
2337 warn "remove commands"; 3330 warn "removing commands";
2338 %COMMAND = (); 3331 %COMMAND = ();
2339 3332
2340 warn "remove ext commands"; 3333 warn "removing ext/exti commands";
2341 %EXTCMD = (); 3334 %EXTCMD = ();
3335 %EXTICMD = ();
2342 3336
2343 warn "unload/nuke all extensions"; 3337 warn "unloading/nuking all extensions";
2344 for my $pkg (@EXTS) { 3338 for my $pkg (@EXTS) {
2345 warn "... unloading $pkg"; 3339 warn "... unloading $pkg";
2346 3340
2347 if (my $cb = $pkg->can ("unload")) { 3341 if (my $cb = $pkg->can ("unload")) {
2348 eval { 3342 eval {
2353 3347
2354 warn "... nuking $pkg"; 3348 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg; 3349 Symbol::delete_package $pkg;
2356 } 3350 }
2357 3351
2358 warn "unload all perl modules loaded from $LIBDIR"; 3352 warn "unloading all perl modules loaded from $LIBDIR";
2359 while (my ($k, $v) = each %INC) { 3353 while (my ($k, $v) = each %INC) {
2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2361 3355
2362 warn "removing <$k>"; 3356 warn "... unloading $k";
2363 delete $INC{$k}; 3357 delete $INC{$k};
2364 3358
2365 $k =~ s/\.pm$//; 3359 $k =~ s/\.pm$//;
2366 $k =~ s/\//::/g; 3360 $k =~ s/\//::/g;
2367 3361
2370 } 3364 }
2371 3365
2372 Symbol::delete_package $k; 3366 Symbol::delete_package $k;
2373 } 3367 }
2374 3368
2375 warn "get rid of safe::, as good as possible"; 3369 warn "getting rid of safe::, as good as possible";
2376 Symbol::delete_package "safe::$_" 3370 Symbol::delete_package "safe::$_"
2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2378 3372
2379 warn "unload cf.pm \"a bit\""; 3373 warn "unloading cf.pm \"a bit\"";
2380 delete $INC{"cf.pm"}; 3374 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"};
2381 3376
2382 # don't, removes xs symbols, too, 3377 # don't, removes xs symbols, too,
2383 # and global variables created in xs 3378 # and global variables created in xs
2384 #Symbol::delete_package __PACKAGE__; 3379 #Symbol::delete_package __PACKAGE__;
2385 3380
3381 warn "unload completed, starting to reload now";
3382
2386 warn "reloading cf.pm"; 3383 warn "reloading cf.pm";
2387 require cf; 3384 require cf;
2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2389 3386
2390 warn "load config and database again"; 3387 warn "loading config and database again";
2391 cf::cfg_load; 3388 cf::reload_config;
2392 cf::db_load;
2393 3389
2394 warn "load extensions"; 3390 warn "loading extensions";
2395 cf::load_extensions; 3391 cf::load_extensions;
2396 3392
2397 warn "reattach attachments to objects/players"; 3393 warn "reattaching attachments to objects/players";
2398 _global_reattach; 3394 _global_reattach; # objects, sockets
2399 warn "reattach attachments to maps"; 3395 warn "reattaching attachments to maps";
2400 reattach $_ for values %MAP; 3396 reattach $_ for values %MAP;
2401 }; 3397 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER;
2402 3399
2403 if ($@) { 3400 warn "leaving sync_job";
3401
3402 1
3403 } or do {
2404 warn $@; 3404 warn $@;
2405 warn "error while reloading, exiting."; 3405 warn "error while reloading, exiting.";
2406 exit 1; 3406 exit 1;
2407 } 3407 };
2408 3408
2409 warn "reloaded"; 3409 warn "reloaded";
2410}; 3410};
2411 3411
2412############################################################################# 3412our $RELOAD_WATCHER; # used only during reload
2413 3413
2414unless ($LINK_MAP) { 3414sub reload_perl() {
2415 $LINK_MAP = cf::map::new; 3415 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here.
2416 3417
2417 $LINK_MAP->width (41); 3418 $RELOAD_WATCHER ||= Event->timer (
2418 $LINK_MAP->height (41); 3419 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, 3420 after => 0,
3421 data => WF_AUTOCANCEL,
2427 cb => sub { 3422 cb => sub {
2428 $_[0]->w->cancel; 3423 do_reload_perl;
2429 3424 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 }); 3425 },
2448 3426 );
2449 $LINK_MAP->{deny_save} = 1;
2450 $LINK_MAP->{deny_reset} = 1;
2451
2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2453} 3427}
2454 3428
2455register_command "reload" => sub { 3429register_command "reload" => sub {
2456 my ($who, $arg) = @_; 3430 my ($who, $arg) = @_;
2457 3431
2458 if ($who->flag (FLAG_WIZ)) { 3432 if ($who->flag (FLAG_WIZ)) {
2459 $who->message ("start of reload.");
2460 reload;
2461 $who->message ("end of reload."); 3433 $who->message ("reloading server.");
3434 async { reload_perl };
2462 } 3435 }
2463}; 3436};
2464 3437
2465unshift @INC, $LIBDIR; 3438unshift @INC, $LIBDIR;
3439
3440my $bug_warning = 0;
3441
3442our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN;
3444
3445sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main;
3448
3449 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait;
3452}
3453
3454sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main;
3457
3458 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait;
3461}
3462
3463our $stat_fh;
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
2466 3465
2467$TICK_WATCHER = Event->timer ( 3466$TICK_WATCHER = Event->timer (
2468 reentrant => 0, 3467 reentrant => 0,
3468 parked => 1,
2469 prio => 0, 3469 prio => 0,
2470 at => $NEXT_TICK || $TICK, 3470 at => $NEXT_TICK || $TICK,
2471 data => WF_AUTOCANCEL, 3471 data => WF_AUTOCANCEL,
2472 cb => sub { 3472 cb => sub {
3473 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10;
3476 return;
3477 }
3478
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
2473 $NOW = Event::time; 3481 $NOW = $tick_start = Event::time;
2474 3482
2475 cf::server_tick; # one server iteration 3483 cf::server_tick; # one server iteration
3484
2476 $RUNTIME += $TICK; 3485 $RUNTIME += $TICK;
2477 $NEXT_TICK += $TICK; 3486 $NEXT_TICK += $TICK;
2478 3487
2479 $WAIT_FOR_TICK->broadcast; 3488 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3489 $NEXT_RUNTIME_WRITE = $NOW + 10;
3490 Coro::async_pool {
3491 write_runtime
3492 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 }
3495
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send;
3501 }
3502 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send;
3504 }
3505
3506 $NOW = Event::time;
2481 3507
2482 # if we are delayed by four ticks or more, skip them all 3508 # if we are delayed by four ticks or more, skip them all
2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2484 3510
2485 $TICK_WATCHER->at ($NEXT_TICK); 3511 $TICK_WATCHER->at ($NEXT_TICK);
2486 $TICK_WATCHER->start; 3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516
3517 _post_tick;
3518
3519 # gather some statistics#d#
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
2487 }, 3522 },
2488); 3523);
2489 3524
3525{
3526 BDB::min_parallel 8;
2490IO::AIO::max_poll_time $TICK * 0.2; 3527 BDB::max_poll_time $TICK * 0.1;
2491 3528 $BDB_POLL_WATCHER = Event->io (
2492Event->io ( 3529 reentrant => 0,
2493 fd => IO::AIO::poll_fileno, 3530 fd => BDB::poll_fileno,
2494 poll => 'r', 3531 poll => 'r',
2495 prio => 5, 3532 prio => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => \&IO::AIO::poll_cb,
2498);
2499
2500Event->timer (
2501 data => WF_AUTOCANCEL, 3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551
3552 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create;
3554
3555 cf::sync_job {
3556 eval {
3557 BDB::db_env_open
3558 $DB_ENV,
3559 $BDBDIR,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666;
3563
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 };
3570
3571 cf::cleanup "db_env_open(db): $@" if $@;
3572 };
3573 }
3574
3575 $BDB_CHECKPOINT_WATCHER = Event->timer (
2502 after => 0, 3576 after => 11,
2503 interval => 10, 3577 interval => 60,
3578 hard => 1,
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
2504 cb => sub { 3581 cb => sub {
2505 (Coro::unblock_sub { 3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
2506 write_runtime 3583 },
2507 or warn "ERROR: unable to write runtime file: $!"; 3584 );
3585 $BDB_TRICKLE_WATCHER = Event->timer (
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 );
3595}
3596
3597{
3598 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io (
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610}
3611
3612my $_log_backtrace;
3613
3614sub _log_backtrace {
3615 my ($msg, @addr) = @_;
3616
3617 $msg =~ s/\n//;
3618
3619 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace;
3622 async {
3623 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!";
3628
3629 my @funcs;
3630 my @res = <$fh>;
3631 chomp for @res;
3632 while (@res) {
3633 my ($func, $line) = splice @res, 0, 2, ();
3634 push @funcs, "[$func] $line";
3635 }
3636
3637 @funcs
3638 };
3639
3640 LOG llevInfo, "[ABT] $msg\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace;
2508 })->(); 3643 };
3644 } else {
3645 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n";
2509 }, 3647 }
2510); 3648}
3649
3650# load additional modules
3651use cf::pod;
2511 3652
2512END { cf::emergency_save } 3653END { cf::emergency_save }
2513 3654
25141 36551
2515 3656

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines