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.250 by root, Wed Apr 18 14:24:10 2007 UTC vs.
Revision 1.440 by root, Mon Aug 11 23:23:41 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB 1.6;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
49use JSON::XS 2.01 ();
25use BDB (); 50use BDB ();
26use Data::Dumper; 51use Data::Dumper;
27use Digest::MD5; 52use Digest::MD5;
28use Fcntl; 53use Fcntl;
29use YAML::Syck (); 54use YAML ();
30use IO::AIO 2.32 (); 55use IO::AIO ();
31use Time::HiRes; 56use Time::HiRes;
32use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
33 61
34# configure various modules to our taste 62# configure various modules to our taste
35# 63#
36$Storable::canonical = 1; # reduce rsync transfers 64$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 67
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 69
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 71
49our %COMMAND = (); 72our %COMMAND = ();
50our %COMMAND_TIME = (); 73our %COMMAND_TIME = ();
51 74
52our @EXTS = (); # list of extension package names 75our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 76our %EXTCMD = ();
77our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 78our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 79our %EXT_MAP = (); # pluggable maps
56 80
57our $RELOAD; # number of reloads so far 81our $RELOAD; # number of reloads so far
58our @EVENT; 82our @EVENT;
59our $LIBDIR = datadir . "/ext"; 83
84our $CONFDIR = confdir;
85our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE;
60 96
61our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
62our $TICK_WATCHER;
63our $AIO_POLL_WATCHER;
64our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
65our $NEXT_TICK; 99our $NEXT_TICK;
66our $NOW;
67our $USE_FSYNC = 1; # use fsync to write maps - default off 100our $USE_FSYNC = 1; # use fsync to write maps - default off
68 101
102our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER;
69our $BDB_POLL_WATCHER; 104our $BDB_TRICKLE_WATCHER;
70our $DB_ENV; 105our $DB_ENV;
71 106
72our %CFG; 107our %CFG;
73 108
74our $UPTIME; $UPTIME ||= time; 109our $UPTIME; $UPTIME ||= time;
75our $RUNTIME; 110our $RUNTIME;
111our $NOW;
76 112
77our %PLAYER; # all users 113our (%PLAYER, %PLAYER_LOADING); # all users
78our %MAP; # all maps 114our (%MAP, %MAP_LOADING ); # all maps
79our $LINK_MAP; # the special {link} map, which is always available 115our $LINK_MAP; # the special {link} map, which is always available
80our $RANDOM_MAPS = cf::localdir . "/random";
81our $BDB_ENV_DIR = cf::localdir . "/db";
82 116
83# used to convert map paths into valid unix filenames by replacing / by ∕ 117# used to convert map paths into valid unix filenames by replacing / by ∕
84our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 118our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
85 119
120our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes
124
86binmode STDOUT; 125binmode STDOUT;
87binmode STDERR; 126binmode STDERR;
88 127
89# read virtual server time, if available 128# read virtual server time, if available
90unless ($RUNTIME || !-e cf::localdir . "/runtime") { 129unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
91 open my $fh, "<", cf::localdir . "/runtime" 130 open my $fh, "<", "$LOCALDIR/runtime"
92 or die "unable to read runtime file: $!"; 131 or die "unable to read runtime file: $!";
93 $RUNTIME = <$fh> + 0.; 132 $RUNTIME = <$fh> + 0.;
94} 133}
95 134
96mkdir cf::localdir; 135mkdir $_
97mkdir cf::localdir . "/" . cf::playerdir; 136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
98mkdir cf::localdir . "/" . cf::tmpdir;
99mkdir cf::localdir . "/" . cf::uniquedir;
100mkdir $RANDOM_MAPS;
101mkdir $BDB_ENV_DIR;
102 137
103our $EMERGENCY_POSITION; 138our $EMERGENCY_POSITION;
104 139
105sub cf::map::normalise; 140sub cf::map::normalise;
106 141
117=item $cf::RUNTIME 152=item $cf::RUNTIME
118 153
119The time this server has run, starts at 0 and is increased by $cf::TICK on 154The time this server has run, starts at 0 and is increased by $cf::TICK on
120every server tick. 155every server tick.
121 156
122=item $cf::LIBDIR 157=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
158$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
159$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
123 160
124The perl library directory, where extensions and cf-specific modules can 161Various directories - "/etc", read-only install directory, perl-library
125be found. It will be added to C<@INC> automatically. 162directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
163unique-items directory, player file directory, random maps directory and
164database environment.
126 165
127=item $cf::NOW 166=item $cf::NOW
128 167
129The time of the last (current) server tick. 168The time of the last (current) server tick.
130 169
131=item $cf::TICK 170=item $cf::TICK
132 171
133The interval between server ticks, in seconds. 172The interval between server ticks, in seconds.
134 173
174=item $cf::LOADAVG
175
176The current CPU load on the server (alpha-smoothed), as a value between 0
177(none) and 1 (overloaded), indicating how much time is spent on processing
178objects per tick. Healthy values are < 0.5.
179
180=item $cf::LOAD
181
182The raw value load value from the last tick.
183
135=item %cf::CFG 184=item %cf::CFG
136 185
137Configuration for the server, loaded from C</etc/crossfire/config>, or 186Configuration for the server, loaded from C</etc/deliantra-server/config>, or
138from wherever your confdir points to. 187from wherever your confdir points to.
139 188
140=item cf::wait_for_tick, cf::wait_for_tick_begin 189=item cf::wait_for_tick, cf::wait_for_tick_begin
141 190
142These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
143returns directly I<after> the tick processing (and consequently, can only wake one process 192returns directly I<after> the tick processing (and consequently, can only wake one process
144per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 193per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
145 194
195=item @cf::INVOKE_RESULTS
196
197This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call.
200
146=back 201=back
147 202
148=cut 203=cut
149 204
150BEGIN { 205BEGIN {
152 my $msg = join "", @_; 207 my $msg = join "", @_;
153 208
154 $msg .= "\n" 209 $msg .= "\n"
155 unless $msg =~ /\n$/; 210 unless $msg =~ /\n$/;
156 211
157 $msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
158 213
159 utf8::encode $msg;
160 LOG llevError, $msg; 214 LOG llevError, $msg;
161 }; 215 };
162} 216}
217
218$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "=="
220
221 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d#
224 }#d#
225
226 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate
229};
230
231$SIG{__DIE__} = sub { }; #d#?
163 232
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 237@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
238@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 239@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 240
171# we bless all objects into (empty) derived classes to force a method lookup 241# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 242# within the Safe compartment.
173for my $pkg (qw( 243for my $pkg (qw(
174 cf::global cf::attachable 244 cf::global cf::attachable
175 cf::object cf::object::player 245 cf::object cf::object::player
176 cf::client cf::player 246 cf::client cf::player
177 cf::arch cf::living 247 cf::arch cf::living
248 cf::map cf::mapspace
178 cf::map cf::party cf::region 249 cf::party cf::region
179)) { 250)) {
180 no strict 'refs'; 251 no strict 'refs';
181 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
182} 253}
183 254
184$Event::DIED = sub { 255$EV::DIED = sub {
185 warn "error in event callback: @_"; 256 warn "error in event callback: @_";
186}; 257};
258
259#############################################################################
187 260
188=head2 UTILITY FUNCTIONS 261=head2 UTILITY FUNCTIONS
189 262
190=over 4 263=over 4
191 264
210 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 283 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
211 $d 284 $d
212 } || "[unable to dump $_[0]: '$@']"; 285 } || "[unable to dump $_[0]: '$@']";
213} 286}
214 287
215use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
216
217=item $ref = cf::from_json $json 288=item $ref = cf::decode_json $json
218 289
219Converts a JSON string into the corresponding perl data structure. 290Converts a JSON string into the corresponding perl data structure.
220 291
221=item $json = cf::to_json $ref 292=item $json = cf::encode_json $ref
222 293
223Converts a perl data structure into its JSON representation. 294Converts a perl data structure into its JSON representation.
295
296=cut
297
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299
300sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) }
224 302
225=item cf::lock_wait $string 303=item cf::lock_wait $string
226 304
227Wait until the given lock is available. See cf::lock_acquire. 305Wait until the given lock is available. See cf::lock_acquire.
228 306
231Wait until the given lock is available and then acquires it and returns 309Wait until the given lock is available and then acquires it and returns
232a Coro::guard object. If the guard object gets destroyed (goes out of scope, 310a Coro::guard object. If the guard object gets destroyed (goes out of scope,
233for example when the coroutine gets canceled), the lock is automatically 311for example when the coroutine gets canceled), the lock is automatically
234returned. 312returned.
235 313
314Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro.
316
236Lock names should begin with a unique identifier (for example, cf::map::find 317Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 318uses map_find and cf::map::load uses map_load).
238 319
320=item $locked = cf::lock_active $string
321
322Return true if the lock is currently active, i.e. somebody has locked it.
323
239=cut 324=cut
240 325
241our %LOCK; 326our %LOCK;
327our %LOCKER;#d#
242 328
243sub lock_wait($) { 329sub lock_wait($) {
244 my ($key) = @_; 330 my ($key) = @_;
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
245 336
246 # wait for lock, if any 337 # wait for lock, if any
247 while ($LOCK{$key}) { 338 while ($LOCK{$key}) {
248 push @{ $LOCK{$key} }, $Coro::current; 339 push @{ $LOCK{$key} }, $Coro::current;
249 Coro::schedule; 340 Coro::schedule;
255 346
256 # wait, to be sure we are not locked 347 # wait, to be sure we are not locked
257 lock_wait $key; 348 lock_wait $key;
258 349
259 $LOCK{$key} = []; 350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
260 352
261 Coro::guard { 353 Coro::guard {
354 delete $LOCKER{$key};#d#
262 # wake up all waiters, to be on the safe side 355 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 356 $_->ready for @{ delete $LOCK{$key} };
264 } 357 }
265} 358}
266 359
360sub lock_active($) {
361 my ($key) = @_;
362
363 ! ! $LOCK{$key}
364}
365
267sub freeze_mainloop { 366sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 367 tick_inhibit_inc;
269 368
270 my $guard = Coro::guard { 369 Coro::guard \&tick_inhibit_dec;
271 $TICK_WATCHER->start; 370}
371
372=item cf::periodic $interval, $cb
373
374Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer.
376
377=cut
378
379sub periodic($$) {
380 my ($interval, $cb) = @_;
381
382 my $start = rand List::Util::min 180, $interval;
383
384 EV::periodic $start, $interval, 0, $cb
385}
386
387=item cf::get_slot $time[, $priority[, $name]]
388
389Allocate $time seconds of blocking CPU time at priority C<$priority>:
390This call blocks and returns only when you have at least C<$time> seconds
391of cpu time till the next tick. The slot is only valid till the next cede.
392
393The optional C<$name> can be used to identify the job to run. It might be
394used for statistical purposes and should identify the same time-class.
395
396Useful for short background jobs.
397
398=cut
399
400our @SLOT_QUEUE;
401our $SLOT_QUEUE;
402
403$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager");
406
407 my $signal = new Coro::Signal;
408
409 while () {
410 next_job:
411 my $avail = cf::till_tick;
412 if ($avail > 0.01) {
413 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) {
415 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send;
417 Coro::cede;
418 goto next_job;
419 }
420 }
421 }
422
423 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait;
427 } else {
428 Coro::schedule;
429 }
272 }; 430 }
273 $TICK_WATCHER->stop; 431};
274 $guard 432
433sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main;
435
436 my ($time, $pri, $name) = @_;
437
438 $time = $TICK * .6 if $time > $TICK * .6;
439 my $sig = new Coro::Signal;
440
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready;
444 $sig->wait;
275} 445}
276 446
277=item cf::async { BLOCK } 447=item cf::async { BLOCK }
278 448
279Currently the same as Coro::async_pool, meaning you cannot use 449Currently the same as Coro::async_pool, meaning you cannot use
284 454
285BEGIN { *async = \&Coro::async_pool } 455BEGIN { *async = \&Coro::async_pool }
286 456
287=item cf::sync_job { BLOCK } 457=item cf::sync_job { BLOCK }
288 458
289The design of crossfire+ requires that the main coro ($Coro::main) is 459The design of Deliantra requires that the main coroutine ($Coro::main)
290always able to handle events or runnable, as crossfire+ is only partly 460is always able to handle events or runnable, as Deliantra is only
291reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 461partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
462acceptable.
292 463
293If it must be done, put the blocking parts into C<sync_job>. This will run 464If it must be done, put the blocking parts into C<sync_job>. This will run
294the given BLOCK in another coroutine while waiting for the result. The 465the given BLOCK in another coroutine while waiting for the result. The
295server will be frozen during this time, so the block should either finish 466server will be frozen during this time, so the block should either finish
296fast or be very important. 467fast or be very important.
299 470
300sub sync_job(&) { 471sub sync_job(&) {
301 my ($job) = @_; 472 my ($job) = @_;
302 473
303 if ($Coro::current == $Coro::main) { 474 if ($Coro::current == $Coro::main) {
475 my $time = EV::time;
476
304 # this is the main coro, too bad, we have to block 477 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 478 # till the operation succeeds, freezing the server :/
306 479
307 # TODO: use suspend/resume instead 480 LOG llevError, Carp::longmess "sync job";#d#
308 # (but this is cancel-safe) 481
309 my $freeze_guard = freeze_mainloop; 482 my $freeze_guard = freeze_mainloop;
310 483
311 my $busy = 1; 484 my $busy = 1;
312 my @res; 485 my @res;
313 486
314 (async { 487 (async {
488 $Coro::current->desc ("sync job coro");
315 @res = eval { $job->() }; 489 @res = eval { $job->() };
316 warn $@ if $@; 490 warn $@ if $@;
317 undef $busy; 491 undef $busy;
318 })->prio (Coro::PRIO_MAX); 492 })->prio (Coro::PRIO_MAX);
319 493
320 while ($busy) { 494 while ($busy) {
321 Coro::cede or Event::one_event; 495 if (Coro::nready) {
496 Coro::cede_notself;
497 } else {
498 EV::loop EV::LOOP_ONESHOT;
322 } 499 }
500 }
501
502 my $time = EV::time - $time;
503
504 $TICK_START += $time; # do not account sync jobs to server load
323 505
324 wantarray ? @res : $res[0] 506 wantarray ? @res : $res[0]
325 } else { 507 } else {
326 # we are in another coroutine, how wonderful, everything just works 508 # we are in another coroutine, how wonderful, everything just works
327 509
347 $EXT_CORO{$coro+0} = $coro; 529 $EXT_CORO{$coro+0} = $coro;
348 530
349 $coro 531 $coro
350} 532}
351 533
352sub write_runtime { 534=item fork_call { }, $args
353 my $guard = cf::lock_acquire "write_runtime";
354 535
355 my $runtime = cf::localdir . "/runtime"; 536Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling.
356 540
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 541=cut
358 or return;
359 542
360 my $value = $cf::RUNTIME + 90 + 10; 543sub fork_call(&@) {
361 # 10 is the runtime save interval, for a monotonic clock 544 my ($cb, @args) = @_;
362 # 60 allows for the watchdog to kill the server.
363 545
364 (aio_write $fh, 0, (length $value), $value, 0) <= 0 546 # we seemingly have to make a local copy of the whole thing,
365 and return; 547 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious)
366 549
367 # always fsync - this file is important 550 my @res = Coro::Util::fork_eval {
368 aio_fsync $fh 551 reset_signals;
369 and return; 552 &$cb
553 }, @args;
370 554
371 close $fh 555 wantarray ? @res : $res[-1]
372 or return; 556}
373 557
374 aio_rename "$runtime~", $runtime 558=item $coin = coin_from_name $name
375 and return;
376 559
560=cut
561
562our %coin_alias = (
563 "silver" => "silvercoin",
564 "silvercoin" => "silvercoin",
565 "silvercoins" => "silvercoin",
566 "gold" => "goldcoin",
567 "goldcoin" => "goldcoin",
568 "goldcoins" => "goldcoin",
569 "platinum" => "platinacoin",
570 "platinumcoin" => "platinacoin",
571 "platinumcoins" => "platinacoin",
572 "platina" => "platinacoin",
573 "platinacoin" => "platinacoin",
574 "platinacoins" => "platinacoin",
575 "royalty" => "royalty",
576 "royalties" => "royalty",
577);
578
579sub coin_from_name($) {
580 $coin_alias{$_[0]}
581 ? cf::arch::find $coin_alias{$_[0]}
582 : undef
583}
584
585=item $value = cf::db_get $family => $key
586
587Returns a single value from the environment database.
588
589=item cf::db_put $family => $key => $value
590
591Stores the given C<$value> in the family. It can currently store binary
592data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
593
594=item $db = cf::db_table "name"
595
596Create and/or open a new database table. The string must not be "db" and must be unique
597within each server.
598
599=cut
600
601sub db_table($) {
602 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV;
604
605 eval {
606 $db->set_flags (BDB::CHKSUM);
607
608 utf8::encode $name;
609 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
610 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
611 cf::cleanup "db_open(db): $!" if $!;
612 };
613 cf::cleanup "db_open(db): $@" if $@;
614
615 $db
616}
617
618our $DB;
619
620sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db";
623 };
624}
625
626sub db_get($$) {
627 my $key = "$_[0]/$_[1]";
628
629 cf::sync_job {
630 BDB::db_get $DB, undef, $key, my $data;
631
632 $! ? ()
633 : $data
377 1 634 }
635}
636
637sub db_put($$$) {
638 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
640}
641
642=item cf::cache $id => [$paths...], $processversion => $process
643
644Generic caching function that returns the value of the resource $id,
645caching and regenerating as required.
646
647This function can block.
648
649=cut
650
651sub cache {
652 my ($id, $src, $processversion, $process) = @_;
653
654 my $meta =
655 join "\x00",
656 $processversion,
657 map {
658 aio_stat $_
659 and Carp::croak "$_: $!";
660
661 ($_, (stat _)[7,9])
662 } @$src;
663
664 my $dbmeta = db_get cache => "$id/meta";
665 if ($dbmeta ne $meta) {
666 # changed, we may need to process
667
668 my @data;
669 my $md5;
670
671 for (0 .. $#$src) {
672 0 <= aio_load $src->[$_], $data[$_]
673 or Carp::croak "$src->[$_]: $!";
674 }
675
676 # if processing is expensive, check
677 # checksum first
678 if (1) {
679 $md5 =
680 join "\x00",
681 $processversion,
682 map {
683 cf::cede_to_tick;
684 ($src->[$_], Digest::MD5::md5_hex $data[$_])
685 } 0.. $#$src;
686
687
688 my $dbmd5 = db_get cache => "$id/md5";
689 if ($dbmd5 eq $md5) {
690 db_put cache => "$id/meta", $meta;
691
692 return db_get cache => "$id/data";
693 }
694 }
695
696 my $t1 = Time::HiRes::time;
697 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time;
699
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
701
702 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta;
705
706 return $data;
707 }
708
709 db_get cache => "$id/data"
378} 710}
379 711
380=item cf::datalog type => key => value, ... 712=item cf::datalog type => key => value, ...
381 713
382Log a datalog packet of the given type with the given key-value pairs. 714Log a datalog packet of the given type with the given key-value pairs.
400attach callbacks/event handlers (a collection of which is called an "attachment") 732attach callbacks/event handlers (a collection of which is called an "attachment")
401to it. All such attachable objects support the following methods. 733to it. All such attachable objects support the following methods.
402 734
403In the following description, CLASS can be any of C<global>, C<object> 735In the following description, CLASS can be any of C<global>, C<object>
404C<player>, C<client> or C<map> (i.e. the attachable objects in 736C<player>, C<client> or C<map> (i.e. the attachable objects in
405crossfire+). 737Deliantra).
406 738
407=over 4 739=over 4
408 740
409=item $attachable->attach ($attachment, key => $value...) 741=item $attachable->attach ($attachment, key => $value...)
410 742
573 $registry = $CB_TYPE[$object_type] ||= []; 905 $registry = $CB_TYPE[$object_type] ||= [];
574 906
575 } elsif ($type eq "subtype") { 907 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 908 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 909 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 910 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 911
580 } elsif ($type eq "package") { 912 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 913 my $pkg = shift @arg;
582 914
583 while (my ($name, $id) = each %cb_id) { 915 while (my ($name, $id) = each %cb_id) {
612 _attach $registry, $klass, @attach; 944 _attach $registry, $klass, @attach;
613 } 945 }
614 946
615 $obj->{$name} = \%arg; 947 $obj->{$name} = \%arg;
616 } else { 948 } else {
617 warn "object uses attachment '$name' that is not available, postponing.\n"; 949 warn "object uses attachment '$name' which is not available, postponing.\n";
618 } 950 }
619 951
620 $obj->{_attachment}{$name} = undef; 952 $obj->{_attachment}{$name} = undef;
621} 953}
622 954
624 if (ref $_[0]) { 956 if (ref $_[0]) {
625 _object_attach @_; 957 _object_attach @_;
626 } else { 958 } else {
627 _attach shift->_attach_registry, @_; 959 _attach shift->_attach_registry, @_;
628 } 960 }
961 _recalc_want;
629}; 962};
630 963
631# all those should be optimised 964# all those should be optimised
632sub cf::attachable::detach { 965sub cf::attachable::detach {
633 my ($obj, $name) = @_; 966 my ($obj, $name) = @_;
636 delete $obj->{_attachment}{$name}; 969 delete $obj->{_attachment}{$name};
637 reattach ($obj); 970 reattach ($obj);
638 } else { 971 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 972 Carp::croak "cannot, currently, detach class attachments";
640 } 973 }
974 _recalc_want;
641}; 975};
642 976
643sub cf::attachable::attached { 977sub cf::attachable::attached {
644 my ($obj, $name) = @_; 978 my ($obj, $name) = @_;
645 979
660 "; 994 ";
661 die if $@; 995 die if $@;
662} 996}
663 997
664our $override; 998our $override;
665our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 999our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
666 1000
667sub override { 1001sub override {
668 $override = 1; 1002 $override = 1;
669 @invoke_results = (); 1003 @INVOKE_RESULTS = (@_);
670} 1004}
671 1005
672sub do_invoke { 1006sub do_invoke {
673 my $event = shift; 1007 my $event = shift;
674 my $callbacks = shift; 1008 my $callbacks = shift;
675 1009
676 @invoke_results = (); 1010 @INVOKE_RESULTS = ();
677 1011
678 local $override; 1012 local $override;
679 1013
680 for (@$callbacks) { 1014 for (@$callbacks) {
681 eval { &{$_->[1]} }; 1015 eval { &{$_->[1]} };
690 } 1024 }
691 1025
692 0 1026 0
693} 1027}
694 1028
695=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1029=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
696 1030
697=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1031=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
698 1032
699Generate an object-specific event with the given arguments. 1033Generate an object-specific event with the given arguments.
700 1034
701This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1035This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
702removed in future versions), and there is no public API to access override 1036removed in future versions), and there is no public API to access override
703results (if you must, access C<@cf::invoke_results> directly). 1037results (if you must, access C<@cf::INVOKE_RESULTS> directly).
704 1038
705=back 1039=back
706 1040
707=cut 1041=cut
708 1042
709############################################################################# 1043#############################################################################
710# object support 1044# object support
1045
1046sub _object_equal($$);
1047sub _object_equal($$) {
1048 my ($a, $b) = @_;
1049
1050 return 0 unless (ref $a) eq (ref $b);
1051
1052 if ("HASH" eq ref $a) {
1053 my @ka = keys %$a;
1054 my @kb = keys %$b;
1055
1056 return 0 if @ka != @kb;
1057
1058 for (0 .. $#ka) {
1059 return 0 unless $ka[$_] eq $kb[$_];
1060 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1061 }
1062
1063 } elsif ("ARRAY" eq ref $a) {
1064
1065 return 0 if @$a != @$b;
1066
1067 for (0 .. $#$a) {
1068 return 0 unless _object_equal $a->[$_], $b->[$_];
1069 }
1070
1071 } elsif ($a ne $b) {
1072 return 0;
1073 }
1074
1075 1
1076}
1077
1078our $SLOW_MERGES;#d#
1079sub _can_merge {
1080 my ($ob1, $ob2) = @_;
1081
1082 ++$SLOW_MERGES;#d#
1083
1084 # we do the slow way here
1085 return _object_equal $ob1, $ob2
1086}
711 1087
712sub reattach { 1088sub reattach {
713 # basically do the same as instantiate, without calling instantiate 1089 # basically do the same as instantiate, without calling instantiate
714 my ($obj) = @_; 1090 my ($obj) = @_;
715 1091
736cf::attachable->attach ( 1112cf::attachable->attach (
737 prio => -1000000, 1113 prio => -1000000,
738 on_instantiate => sub { 1114 on_instantiate => sub {
739 my ($obj, $data) = @_; 1115 my ($obj, $data) = @_;
740 1116
741 $data = from_json $data; 1117 $data = decode_json $data;
742 1118
743 for (@$data) { 1119 for (@$data) {
744 my ($name, $args) = @$_; 1120 my ($name, $args) = @$_;
745 1121
746 $obj->attach ($name, %{$args || {} }); 1122 $obj->attach ($name, %{$args || {} });
762sub object_freezer_save { 1138sub object_freezer_save {
763 my ($filename, $rdata, $objs) = @_; 1139 my ($filename, $rdata, $objs) = @_;
764 1140
765 sync_job { 1141 sync_job {
766 if (length $$rdata) { 1142 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename);
767 warn sprintf "saving %s (%d,%d)\n", 1144 warn sprintf "saving %s (%d,%d)\n",
768 $filename, length $$rdata, scalar @$objs; 1145 $decname, length $$rdata, scalar @$objs;
769 1146
770 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
771 chmod SAVE_MODE, $fh; 1148 aio_chmod $fh, SAVE_MODE;
772 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
773 aio_fsync $fh if $cf::USE_FSYNC; 1150 aio_fsync $fh if $cf::USE_FSYNC;
774 close $fh; 1151 aio_close $fh;
775 1152
776 if (@$objs) { 1153 if (@$objs) {
777 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
778 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
779 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
780 aio_write $fh, 0, (length $data), $data, 0; 1157 aio_write $fh, 0, (length $data), $data, 0;
781 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
782 close $fh; 1159 aio_close $fh;
783 aio_rename "$filename.pst~", "$filename.pst"; 1160 aio_rename "$filename.pst~", "$filename.pst";
784 } 1161 }
785 } else { 1162 } else {
786 aio_unlink "$filename.pst"; 1163 aio_unlink "$filename.pst";
787 } 1164 }
792 } 1169 }
793 } else { 1170 } else {
794 aio_unlink $filename; 1171 aio_unlink $filename;
795 aio_unlink "$filename.pst"; 1172 aio_unlink "$filename.pst";
796 } 1173 }
797 } 1174 };
798} 1175}
799 1176
800sub object_freezer_as_string { 1177sub object_freezer_as_string {
801 my ($rdata, $objs) = @_; 1178 my ($rdata, $objs) = @_;
802 1179
814 or return; 1191 or return;
815 1192
816 unless (aio_stat "$filename.pst") { 1193 unless (aio_stat "$filename.pst") {
817 (aio_load "$filename.pst", $av) >= 0 1194 (aio_load "$filename.pst", $av) >= 0
818 or return; 1195 or return;
1196
819 $av = eval { (Storable::thaw $av)->{objs} }; 1197 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs};
820 } 1199 }
821 1200
1201 utf8::decode (my $decname = $filename);
822 warn sprintf "loading %s (%d)\n", 1202 warn sprintf "loading %s (%d,%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 1203 $decname, length $data, scalar @{$av || []};
1204
824 return ($data, $av); 1205 ($data, $av)
825} 1206}
1207
1208=head2 COMMAND CALLBACKS
1209
1210=over 4
1211
1212=cut
826 1213
827############################################################################# 1214#############################################################################
828# command handling &c 1215# command handling &c
829 1216
830=item cf::register_command $name => \&callback($ob,$args); 1217=item cf::register_command $name => \&callback($ob,$args);
843 push @{ $COMMAND{$name} }, [$caller, $cb]; 1230 push @{ $COMMAND{$name} }, [$caller, $cb];
844} 1231}
845 1232
846=item cf::register_extcmd $name => \&callback($pl,$packet); 1233=item cf::register_extcmd $name => \&callback($pl,$packet);
847 1234
848Register a callbackf ro execution when the client sends an extcmd packet. 1235Register a callback for execution when the client sends an (synchronous)
1236extcmd packet. Ext commands will be processed in the order they are
1237received by the server, like other user commands. The first argument is
1238the logged-in player. Ext commands can only be processed after a player
1239has logged in successfully.
849 1240
850If the callback returns something, it is sent back as if reply was being 1241If the callback returns something, it is sent back as if reply was being
851called. 1242called.
852 1243
1244=item cf::register_exticmd $name => \&callback($ns,$packet);
1245
1246Register a callback for execution when the client sends an (asynchronous)
1247exticmd packet. Exti commands are processed by the server as soon as they
1248are received, i.e. out of order w.r.t. other commands. The first argument
1249is a client socket. Exti commands can be received anytime, even before
1250log-in.
1251
1252If the callback returns something, it is sent back as if reply was being
1253called.
1254
853=cut 1255=cut
854 1256
855sub register_extcmd { 1257sub register_extcmd {
856 my ($name, $cb) = @_; 1258 my ($name, $cb) = @_;
857 1259
858 $EXTCMD{$name} = $cb; 1260 $EXTCMD{$name} = $cb;
1261}
1262
1263sub register_exticmd {
1264 my ($name, $cb) = @_;
1265
1266 $EXTICMD{$name} = $cb;
859} 1267}
860 1268
861cf::player->attach ( 1269cf::player->attach (
862 on_command => sub { 1270 on_command => sub {
863 my ($pl, $name, $params) = @_; 1271 my ($pl, $name, $params) = @_;
872 cf::override; 1280 cf::override;
873 }, 1281 },
874 on_extcmd => sub { 1282 on_extcmd => sub {
875 my ($pl, $buf) = @_; 1283 my ($pl, $buf) = @_;
876 1284
877 my $msg = eval { from_json $buf }; 1285 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
878 1286
879 if (ref $msg) { 1287 if (ref $msg) {
1288 my ($type, $reply, @payload) =
1289 "ARRAY" eq ref $msg
1290 ? @$msg
1291 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1292
1293 my @reply;
1294
880 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1295 if (my $cb = $EXTCMD{$type}) {
881 if (my %reply = $cb->($pl, $msg)) { 1296 @reply = $cb->($pl, @payload);
882 $pl->ext_reply ($msg->{msgid}, %reply);
883 }
884 } 1297 }
1298
1299 $pl->ext_reply ($reply, @reply)
1300 if $reply;
1301
885 } else { 1302 } else {
886 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
887 } 1304 }
888 1305
889 cf::override; 1306 cf::override;
890 }, 1307 },
891); 1308);
892 1309
893sub load_extension {
894 my ($path) = @_;
895
896 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
897 my $base = $1;
898 my $pkg = $1;
899 $pkg =~ s/[^[:word:]]/_/g;
900 $pkg = "ext::$pkg";
901
902 warn "... loading '$path' into '$pkg'\n";
903
904 open my $fh, "<:utf8", $path
905 or die "$path: $!";
906
907 my $source =
908 "package $pkg; use strict; use utf8;\n"
909 . "#line 1 \"$path\"\n{\n"
910 . (do { local $/; <$fh> })
911 . "\n};\n1";
912
913 unless (eval $source) {
914 my $msg = $@ ? "$path: $@\n"
915 : "extension disabled.\n";
916 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
917 warn $@;
918 warn "mandatory extension failed to load, exiting.\n";
919 exit 1;
920 }
921 die $@;
922 }
923
924 push @EXTS, $pkg;
925}
926
927sub load_extensions { 1310sub load_extensions {
1311 cf::sync_job {
1312 my %todo;
1313
928 for my $ext (<$LIBDIR/*.ext>) { 1314 for my $path (<$LIBDIR/*.ext>) {
929 next unless -r $ext; 1315 next unless -r $path;
930 eval { 1316
931 load_extension $ext; 1317 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1318 my $base = $1;
1319 my $pkg = $1;
1320 $pkg =~ s/[^[:word:]]/_/g;
1321 $pkg = "ext::$pkg";
1322
1323 open my $fh, "<:utf8", $path
1324 or die "$path: $!";
1325
1326 my $source = do { local $/; <$fh> };
1327
1328 my %ext = (
1329 path => $path,
1330 base => $base,
1331 pkg => $pkg,
1332 );
1333
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336
1337 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n"
1340 . $source
1341 . "\n};\n1";
1342
1343 $todo{$base} = \%ext;
1344 }
1345
1346 my %done;
1347 while (%todo) {
1348 my $progress;
1349
1350 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip
1353 unless exists $done{$_};
1354 }
1355
1356 warn "... loading '$k' into '$v->{pkg}'\n";
1357
1358 unless (eval $v->{source}) {
1359 my $msg = $@ ? "$v->{path}: $@\n"
1360 : "$v->{base}: extension inactive.\n";
1361
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting.";
1365 }
1366
1367 warn $msg;
1368 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
932 1 1373 }
933 } or warn "$ext not loaded: $@"; 1374
1375 skip:
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1377 unless $progress;
1378 }
934 } 1379 };
935} 1380}
936 1381
937############################################################################# 1382#############################################################################
938 1383
1384=back
1385
939=head2 CORE EXTENSIONS 1386=head2 CORE EXTENSIONS
940 1387
941Functions and methods that extend core crossfire objects. 1388Functions and methods that extend core crossfire objects.
942 1389
943=cut 1390=cut
948 1395
949=head3 cf::player 1396=head3 cf::player
950 1397
951=over 4 1398=over 4
952 1399
1400=item cf::player::num_playing
1401
1402Returns the official number of playing players, as per the Crossfire metaserver rules.
1403
1404=cut
1405
1406sub num_playing {
1407 scalar grep
1408 $_->ob->map
1409 && !$_->hidden
1410 && !$_->ob->flag (cf::FLAG_WIZ),
1411 cf::player::list
1412}
1413
953=item cf::player::find $login 1414=item cf::player::find $login
954 1415
955Returns the given player object, loading it if necessary (might block). 1416Returns the given player object, loading it if necessary (might block).
956 1417
957=cut 1418=cut
958 1419
959sub playerdir($) { 1420sub playerdir($) {
960 cf::localdir 1421 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1422 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1423}
966 1424
967sub path($) { 1425sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1426 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1453 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1454 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1455 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl"; 1456 aio_unlink +(playerdir $login) . "/$login.pl";
999 1457
1000 my $pl = load_pl path $login 1458 my $f = new_from_file cf::object::thawer path $login
1001 or return; 1459 or return;
1460
1461 my $pl = cf::player::load_pl $f
1462 or return;
1463
1464 local $cf::PLAYER_LOADING{$login} = $pl;
1465 $f->resolve_delayed_derefs;
1002 $cf::PLAYER{$login} = $pl 1466 $cf::PLAYER{$login} = $pl
1003 } 1467 }
1004 } 1468 }
1005} 1469}
1006 1470
1015 return if $pl->{deny_save}; 1479 return if $pl->{deny_save};
1016 1480
1017 aio_mkdir playerdir $pl, 0770; 1481 aio_mkdir playerdir $pl, 0770;
1018 $pl->{last_save} = $cf::RUNTIME; 1482 $pl->{last_save} = $cf::RUNTIME;
1019 1483
1484 cf::get_slot 0.01;
1485
1020 $pl->save_pl ($path); 1486 $pl->save_pl ($path);
1021 Coro::cede; 1487 cf::cede_to_tick;
1022} 1488}
1023 1489
1024sub new($) { 1490sub new($) {
1025 my ($login) = @_; 1491 my ($login) = @_;
1026 1492
1032 $cf::PLAYER{$login} = $self; 1498 $cf::PLAYER{$login} = $self;
1033 1499
1034 $self 1500 $self
1035} 1501}
1036 1502
1503=item $player->send_msg ($channel, $msg, $color, [extra...])
1504
1505=cut
1506
1507sub send_msg {
1508 my $ns = shift->ns
1509 or return;
1510 $ns->send_msg (@_);
1511}
1512
1037=item $pl->quit_character 1513=item $pl->quit_character
1038 1514
1039Nukes the player without looking back. If logged in, the connection will 1515Nukes the player without looking back. If logged in, the connection will
1040be destroyed. May block for a long time. 1516be destroyed. May block for a long time.
1041 1517
1049 $pl->{deny_save} = 1; 1525 $pl->{deny_save} = 1;
1050 $pl->password ("*"); # this should lock out the player until we nuked the dir 1526 $pl->password ("*"); # this should lock out the player until we nuked the dir
1051 1527
1052 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1053 $pl->deactivate; 1529 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score;
1054 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1532 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1055 $pl->ns->destroy if $pl->ns; 1533 $pl->ns->destroy if $pl->ns;
1056 1534
1057 my $path = playerdir $pl; 1535 my $path = playerdir $pl;
1058 my $temp = "$path~$cf::RUNTIME~deleting~"; 1536 my $temp = "$path~$cf::RUNTIME~deleting~";
1088while and may block, so not sync_job-capable, ever. 1566while and may block, so not sync_job-capable, ever.
1089 1567
1090=cut 1568=cut
1091 1569
1092sub list_logins { 1570sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1571 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1572 or return [];
1095 1573
1096 my @logins; 1574 my @logins;
1097 1575
1098 for my $login (@$dirs) { 1576 for my $login (@$dirs) {
1577 my $path = path $login;
1578
1579 # a .pst is a dead give-away for a valid player
1580 # if no pst file found, open and chekc for blocked users
1581 if (aio_stat "$path.pst") {
1099 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1582 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1100 aio_read $fh, 0, 512, my $buf, 0 or next; 1583 aio_read $fh, 0, 512, my $buf, 0 or next;
1101 $buf !~ /^password -------------$/m or next; # official not-valid tag 1584 $buf !~ /^password -------------$/m or next; # official not-valid tag
1585 }
1102 1586
1103 utf8::decode $login; 1587 utf8::decode $login;
1104 push @logins, $login; 1588 push @logins, $login;
1105 } 1589 }
1106 1590
1133 } 1617 }
1134 1618
1135 \@paths 1619 \@paths
1136} 1620}
1137 1621
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1623
1624Expand crossfire pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714
1138=item $player->ext_reply ($msgid, %msg) 1715=item $player->ext_reply ($msgid, @msg)
1139 1716
1140Sends an ext reply to the player. 1717Sends an ext reply to the player.
1141 1718
1142=cut 1719=cut
1143 1720
1144sub ext_reply($$%) { 1721sub ext_reply($$@) {
1145 my ($self, $id, %msg) = @_; 1722 my ($self, $id, @msg) = @_;
1146 1723
1147 $msg{msgid} = $id; 1724 $self->ns->ext_reply ($id, @msg)
1148
1149 $self->send ("ext " . cf::to_json \%msg);
1150} 1725}
1151 1726
1152=item $player->ext_event ($type, %msg) 1727=item $player->ext_msg ($type, @msg)
1153 1728
1154Sends an ext event to the client. 1729Sends an ext event to the client.
1155 1730
1156=cut 1731=cut
1157 1732
1158sub ext_event($$%) { 1733sub ext_msg($$@) {
1159 my ($self, $type, %msg) = @_; 1734 my ($self, $type, @msg) = @_;
1160 1735
1161 $self->ns->ext_event ($type, %msg); 1736 $self->ns->ext_msg ($type, @msg);
1162} 1737}
1163 1738
1164=head3 cf::region 1739=head3 cf::region
1165 1740
1166=over 4 1741=over 4
1169 1744
1170package cf::region; 1745package cf::region;
1171 1746
1172=item cf::region::find_by_path $path 1747=item cf::region::find_by_path $path
1173 1748
1174Tries to decuce the probable region for a map knowing only its path. 1749Tries to decuce the likely region for a map knowing only its path.
1175 1750
1176=cut 1751=cut
1177 1752
1178sub find_by_path($) { 1753sub find_by_path($) {
1179 my ($path) = @_; 1754 my ($path) = @_;
1180 1755
1181 my ($match, $specificity); 1756 my ($match, $specificity);
1182 1757
1183 for my $region (list) { 1758 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) { 1759 if ($region->{match} && $path =~ $region->{match}) {
1185 ($match, $specificity) = ($region, $region->specificity) 1760 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity; 1761 if $region->specificity > $specificity;
1187 } 1762 }
1188 } 1763 }
1189 1764
1210our $MAX_RESET = 3600; 1785our $MAX_RESET = 3600;
1211our $DEFAULT_RESET = 3000; 1786our $DEFAULT_RESET = 3000;
1212 1787
1213sub generate_random_map { 1788sub generate_random_map {
1214 my ($self, $rmp) = @_; 1789 my ($self, $rmp) = @_;
1790
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792
1215 # mit "rum" bekleckern, nicht 1793 # mit "rum" bekleckern, nicht
1216 $self->_create_random_map ( 1794 $self->_create_random_map (
1217 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1218 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1219 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1253 my ($self, $merge) = @_; 1831 my ($self, $merge) = @_;
1254 1832
1255 # we have to keep some variables in memory intact 1833 # we have to keep some variables in memory intact
1256 local $self->{path}; 1834 local $self->{path};
1257 local $self->{load_path}; 1835 local $self->{load_path};
1258 local $self->{deny_save};
1259 local $self->{deny_reset};
1260 1836
1261 $self->SUPER::thawer_merge ($merge); 1837 $self->SUPER::thawer_merge ($merge);
1262} 1838}
1263 1839
1264sub normalise { 1840sub normalise {
1311 $self->init; # pass $1 etc. 1887 $self->init; # pass $1 etc.
1312 return $self; 1888 return $self;
1313 } 1889 }
1314 } 1890 }
1315 1891
1316 Carp::carp "unable to resolve path '$path' (base '$base')."; 1892 Carp::cluck "unable to resolve path '$path' (base '$base').";
1317 () 1893 ()
1318} 1894}
1319 1895
1320sub init { 1896sub init {
1321 my ($self) = @_; 1897 my ($self) = @_;
1336 1912
1337# the original (read-only) location 1913# the original (read-only) location
1338sub load_path { 1914sub load_path {
1339 my ($self) = @_; 1915 my ($self) = @_;
1340 1916
1341 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1917 "$MAPDIR/$self->{path}.map"
1342} 1918}
1343 1919
1344# the temporary/swap location 1920# the temporary/swap location
1345sub save_path { 1921sub save_path {
1346 my ($self) = @_; 1922 my ($self) = @_;
1347 1923
1348 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1924 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1349 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1925 "$TMPDIR/$path.map"
1350} 1926}
1351 1927
1352# the unique path, undef == no special unique path 1928# the unique path, undef == no special unique path
1353sub uniq_path { 1929sub uniq_path {
1354 my ($self) = @_; 1930 my ($self) = @_;
1355 1931
1356 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1357 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1933 "$UNIQUEDIR/$path"
1358} 1934}
1359 1935
1360# and all this just because we cannot iterate over 1936# and all this just because we cannot iterate over
1361# all maps in C++... 1937# all maps in C++...
1362sub change_all_map_light { 1938sub change_all_map_light {
1364 1940
1365 $_->change_map_light ($change) 1941 $_->change_map_light ($change)
1366 for grep $_->outdoor, values %cf::MAP; 1942 for grep $_->outdoor, values %cf::MAP;
1367} 1943}
1368 1944
1945sub decay_objects {
1946 my ($self) = @_;
1947
1948 return if $self->{deny_reset};
1949
1950 $self->do_decay_objects;
1951}
1952
1369sub unlink_save { 1953sub unlink_save {
1370 my ($self) = @_; 1954 my ($self) = @_;
1371 1955
1372 utf8::encode (my $save = $self->save_path); 1956 utf8::encode (my $save = $self->save_path);
1373 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1957 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1376 1960
1377sub load_header_from($) { 1961sub load_header_from($) {
1378 my ($self, $path) = @_; 1962 my ($self, $path) = @_;
1379 1963
1380 utf8::encode $path; 1964 utf8::encode $path;
1381 #aio_open $path, O_RDONLY, 0 1965 my $f = new_from_file cf::object::thawer $path
1382 # or return;
1383
1384 $self->_load_header ($path)
1385 or return; 1966 or return;
1967
1968 $self->_load_header ($f)
1969 or return;
1970
1971 local $MAP_LOADING{$self->{path}} = $self;
1972 $f->resolve_delayed_derefs;
1386 1973
1387 $self->{load_path} = $path; 1974 $self->{load_path} = $path;
1388 1975
1389 1 1976 1
1390} 1977}
1429 $self->load_header_orig 2016 $self->load_header_orig
1430 or return; 2017 or return;
1431 $self->prepare_orig; 2018 $self->prepare_orig;
1432 } 2019 }
1433 2020
2021 $self->{deny_reset} = 1
2022 if $self->no_reset;
2023
1434 $self->default_region (cf::region::find_by_path $self->{path}) 2024 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region; 2025 unless $self->default_region;
1436 2026
1437 1 2027 1
1438} 2028}
1441sub find { 2031sub find {
1442 my ($path, $origin) = @_; 2032 my ($path, $origin) = @_;
1443 2033
1444 $path = normalise $path, $origin && $origin->path; 2034 $path = normalise $path, $origin && $origin->path;
1445 2035
2036 cf::lock_wait "map_data:$path";#d#remove
1446 cf::lock_wait "map_find:$path"; 2037 cf::lock_wait "map_find:$path";
1447 2038
1448 $cf::MAP{$path} || do { 2039 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1449 my $guard = cf::lock_acquire "map_find:$path"; 2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
1450 my $map = new_from_path cf::map $path 2043 my $map = new_from_path cf::map $path
1451 or return; 2044 or return;
1452 2045
1453 $map->{last_save} = $cf::RUNTIME; 2046 $map->{last_save} = $cf::RUNTIME;
1454 2047
1455 $map->load_header 2048 $map->load_header
1456 or return; 2049 or return;
1457 2050
1458 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2051 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1459 # doing this can freeze the server in a sync job, obviously 2052 # doing this can freeze the server in a sync job, obviously
1460 #$cf::WAIT_FOR_TICK->wait; 2053 #$cf::WAIT_FOR_TICK->wait;
2054 undef $guard2;
2055 undef $guard1;
1461 $map->reset; 2056 $map->reset;
1462 undef $guard;
1463 return find $path; 2057 return find $path;
1464 } 2058 }
1465 2059
1466 $cf::MAP{$path} = $map 2060 $cf::MAP{$path} = $map
1467 } 2061 }
1474 my ($self) = @_; 2068 my ($self) = @_;
1475 2069
1476 local $self->{deny_reset} = 1; # loading can take a long time 2070 local $self->{deny_reset} = 1; # loading can take a long time
1477 2071
1478 my $path = $self->{path}; 2072 my $path = $self->{path};
2073
2074 {
1479 my $guard = cf::lock_acquire "map_load:$path"; 2075 my $guard = cf::lock_acquire "map_data:$path";
1480 2076
2077 return unless $self->valid;
1481 return if $self->in_memory != cf::MAP_SWAPPED; 2078 return unless $self->in_memory == cf::MAP_SWAPPED;
1482 2079
1483 $self->in_memory (cf::MAP_LOADING); 2080 $self->in_memory (cf::MAP_LOADING);
1484 2081
1485 $self->alloc; 2082 $self->alloc;
1486 2083
1487 $self->pre_load; 2084 $self->pre_load;
1488 Coro::cede; 2085 cf::cede_to_tick;
1489 2086
1490 $self->_load_objects ($self->{load_path}, 1) 2087 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block;
2089 $self->_load_objects ($f)
1491 or return; 2090 or return;
1492 2091
1493 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2092 $self->post_load_original
1494 if delete $self->{load_original}; 2093 if delete $self->{load_original};
1495 2094
1496 if (my $uniq = $self->uniq_path) { 2095 if (my $uniq = $self->uniq_path) {
1497 utf8::encode $uniq; 2096 utf8::encode $uniq;
1498 if (aio_open $uniq, O_RDONLY, 0) { 2097 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) {
1499 $self->clear_unique_items; 2099 $self->clear_unique_items;
1500 $self->_load_objects ($uniq, 0); 2100 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs;
2102 }
1501 } 2103 }
1502 } 2104 }
1503 2105
1504 Coro::cede; 2106 $f->resolve_delayed_derefs;
2107
2108 cf::cede_to_tick;
1505 # now do the right thing for maps 2109 # now do the right thing for maps
1506 $self->link_multipart_objects; 2110 $self->link_multipart_objects;
1507 Coro::cede;
1508
1509 unless ($self->{deny_activate}) {
1510 $self->decay_objects;
1511 $self->fix_auto_apply;
1512 $self->update_buttons;
1513 Coro::cede;
1514 $self->set_darkness_map;
1515 $self->difficulty ($self->estimate_difficulty) 2111 $self->difficulty ($self->estimate_difficulty)
1516 unless $self->difficulty; 2112 unless $self->difficulty;
1517 Coro::cede; 2113 cf::cede_to_tick;
2114
2115 unless ($self->{deny_activate}) {
2116 $self->decay_objects;
2117 $self->fix_auto_apply;
2118 $self->update_buttons;
2119 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick;
1518 $self->activate; 2122 $self->activate;
1519 Coro::cede; 2123 }
2124
2125 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME);
2127
2128 $self->in_memory (cf::MAP_ACTIVE);
1520 } 2129 }
1521 2130
1522 $self->post_load; 2131 $self->post_load;
1523 Coro::cede;
1524
1525 $self->in_memory (cf::MAP_IN_MEMORY);
1526} 2132}
1527 2133
1528sub customise_for { 2134sub customise_for {
1529 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
1530 2136
1531 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
1532 if $self->per_player; 2138 if $self->per_player;
1533 2139
2140# return find "?party/" . $ob->name . "/" . $self->{path}
2141# if $self->per_party;
2142
1534 $self 2143 $self
1535} 2144}
1536 2145
1537# find and load all maps in the 3x3 area around a map 2146# find and load all maps in the 3x3 area around a map
1538sub load_diag { 2147sub load_neighbours {
1539 my ($map) = @_; 2148 my ($map) = @_;
1540 2149
1541 my @diag; # diagonal neighbours 2150 my @neigh; # diagonal neighbours
1542 2151
1543 for (0 .. 3) { 2152 for (0 .. 3) {
1544 my $neigh = $map->tile_path ($_) 2153 my $neigh = $map->tile_path ($_)
1545 or next; 2154 or next;
1546 $neigh = find $neigh, $map 2155 $neigh = find $neigh, $map
1547 or next; 2156 or next;
1548 $neigh->load; 2157 $neigh->load;
1549 2158
2159 push @neigh,
1550 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1551 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1552 } 2162 }
1553 2163
1554 for (@diag) { 2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
1555 my $neigh = find @$_ 2166 my $neigh = find $path, $origin
1556 or next; 2167 or next;
1557 $neigh->load; 2168 $neigh->load;
1558 } 2169 }
1559} 2170}
1560 2171
1565} 2176}
1566 2177
1567sub do_load_sync { 2178sub do_load_sync {
1568 my ($map) = @_; 2179 my ($map) = @_;
1569 2180
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main;
2183
1570 cf::sync_job { $map->load }; 2184 cf::sync_job { $map->load };
1571} 2185}
1572 2186
1573our %MAP_PREFETCH; 2187our %MAP_PREFETCH;
1574our $MAP_PREFETCHER = undef; 2188our $MAP_PREFETCHER = undef;
1575 2189
1576sub find_async { 2190sub find_async {
1577 my ($path, $origin) = @_; 2191 my ($path, $origin, $load) = @_;
1578 2192
1579 $path = normalise $path, $origin && $origin->{path}; 2193 $path = normalise $path, $origin && $origin->{path};
1580 2194
1581 if (my $map = $cf::MAP{$path}) { 2195 if (my $map = $cf::MAP{$path}) {
1582 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1583 } 2197 }
1584 2198
1585 undef $MAP_PREFETCH{$path}; 2199 $MAP_PREFETCH{$path} |= $load;
2200
1586 $MAP_PREFETCHER ||= cf::async { 2201 $MAP_PREFETCHER ||= cf::async {
2202 $Coro::current->{desc} = "map prefetcher";
2203
1587 while (%MAP_PREFETCH) { 2204 while (%MAP_PREFETCH) {
1588 for my $path (keys %MAP_PREFETCH) { 2205 while (my ($k, $v) = each %MAP_PREFETCH) {
1589 my $map = find $path 2206 if (my $map = find $k) {
1590 or next;
1591 $map->load; 2207 $map->load if $v;
2208 }
1592 2209
1593 delete $MAP_PREFETCH{$path}; 2210 delete $MAP_PREFETCH{$k};
1594 } 2211 }
1595 } 2212 }
1596 undef $MAP_PREFETCHER; 2213 undef $MAP_PREFETCHER;
1597 }; 2214 };
1598 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
1601} 2218}
1602 2219
1603sub save { 2220sub save {
1604 my ($self) = @_; 2221 my ($self) = @_;
1605 2222
1606 my $lock = cf::lock_acquire "map_data:" . $self->path; 2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
1607 2224
1608 $self->{last_save} = $cf::RUNTIME; 2225 $self->{last_save} = $cf::RUNTIME;
1609 2226
1610 return unless $self->dirty; 2227 return unless $self->dirty;
1611 2228
1617 return if $self->{deny_save}; 2234 return if $self->{deny_save};
1618 2235
1619 local $self->{last_access} = $self->last_access;#d# 2236 local $self->{last_access} = $self->last_access;#d#
1620 2237
1621 cf::async { 2238 cf::async {
2239 $Coro::current->{desc} = "map player save";
1622 $_->contr->save for $self->players; 2240 $_->contr->save for $self->players;
1623 }; 2241 };
2242
2243 cf::get_slot 0.02;
1624 2244
1625 if ($uniq) { 2245 if ($uniq) {
1626 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1627 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2247 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1628 } else { 2248 } else {
1634 my ($self) = @_; 2254 my ($self) = @_;
1635 2255
1636 # save first because save cedes 2256 # save first because save cedes
1637 $self->save; 2257 $self->save;
1638 2258
1639 my $lock = cf::lock_acquire "map_data:" . $self->path; 2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 2260
1641 return if $self->players; 2261 return if $self->players;
1642 return if $self->in_memory != cf::MAP_IN_MEMORY; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
1643 return if $self->{deny_save}; 2263 return if $self->{deny_save};
1644 2264
2265 $self->in_memory (cf::MAP_SWAPPED);
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
1645 $self->clear; 2269 $self->clear;
1646 $self->in_memory (cf::MAP_SWAPPED);
1647} 2270}
1648 2271
1649sub reset_at { 2272sub reset_at {
1650 my ($self) = @_; 2273 my ($self) = @_;
1651 2274
1652 # TODO: safety, remove and allow resettable per-player maps 2275 # TODO: safety, remove and allow resettable per-player maps
1653 return 1e99 if $self->isa ("ext::map_per_player");#d#
1654 return 1e99 if $self->{deny_reset}; 2276 return 1e99 if $self->{deny_reset};
1655 2277
1656 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1657 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1658 2280
1669 my ($self) = @_; 2291 my ($self) = @_;
1670 2292
1671 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
1672 2294
1673 return if $self->players; 2295 return if $self->players;
1674 return if $self->isa ("ext::map_per_player");#d#
1675 2296
1676 warn "resetting map ", $self->path;#d# 2297 warn "resetting map ", $self->path;
1677 2298
1678 $self->in_memory (cf::MAP_SWAPPED); 2299 $self->in_memory (cf::MAP_SWAPPED);
1679 2300
1680 # need to save uniques path 2301 # need to save uniques path
1681 unless ($self->{deny_save}) { 2302 unless ($self->{deny_save}) {
1685 if $uniq; 2306 if $uniq;
1686 } 2307 }
1687 2308
1688 delete $cf::MAP{$self->path}; 2309 delete $cf::MAP{$self->path};
1689 2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
1690 $self->clear; 2313 $self->clear;
1691
1692 $_->clear_links_to ($self) for values %cf::MAP;
1693 2314
1694 $self->unlink_save; 2315 $self->unlink_save;
1695 $self->destroy; 2316 $self->destroy;
1696} 2317}
1697 2318
1698my $nuke_counter = "aaaa"; 2319my $nuke_counter = "aaaa";
1699 2320
1700sub nuke { 2321sub nuke {
1701 my ($self) = @_; 2322 my ($self) = @_;
1702 2323
2324 {
2325 my $lock = cf::lock_acquire "map_data:$self->{path}";
2326
1703 delete $cf::MAP{$self->path}; 2327 delete $cf::MAP{$self->path};
1704 2328
1705 $self->unlink_save; 2329 $self->unlink_save;
1706 2330
1707 bless $self, "cf::map"; 2331 bless $self, "cf::map";
1708 delete $self->{deny_reset}; 2332 delete $self->{deny_reset};
1709 $self->{deny_save} = 1; 2333 $self->{deny_save} = 1;
1710 $self->reset_timeout (1); 2334 $self->reset_timeout (1);
1711 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1712 2336
1713 $cf::MAP{$self->path} = $self; 2337 $cf::MAP{$self->path} = $self;
2338 }
1714 2339
1715 $self->reset; # polite request, might not happen 2340 $self->reset; # polite request, might not happen
2341}
2342
2343=item $maps = cf::map::tmp_maps
2344
2345Returns an arrayref with all map paths of currently instantiated and saved
2346maps. May block.
2347
2348=cut
2349
2350sub tmp_maps() {
2351 [
2352 map {
2353 utf8::decode $_;
2354 /\.map$/
2355 ? normalise $_
2356 : ()
2357 } @{ aio_readdir $TMPDIR or [] }
2358 ]
2359}
2360
2361=item $maps = cf::map::random_maps
2362
2363Returns an arrayref with all map paths of currently instantiated and saved
2364random maps. May block.
2365
2366=cut
2367
2368sub random_maps() {
2369 [
2370 map {
2371 utf8::decode $_;
2372 /\.map$/
2373 ? normalise "?random/$_"
2374 : ()
2375 } @{ aio_readdir $RANDOMDIR or [] }
2376 ]
1716} 2377}
1717 2378
1718=item cf::map::unique_maps 2379=item cf::map::unique_maps
1719 2380
1720Returns an arrayref of paths of all shared maps that have 2381Returns an arrayref of paths of all shared maps that have
1721instantiated unique items. May block. 2382instantiated unique items. May block.
1722 2383
1723=cut 2384=cut
1724 2385
1725sub unique_maps() { 2386sub unique_maps() {
1726 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2387 [
1727 or return; 2388 map {
1728
1729 my @paths;
1730
1731 for (@$files) {
1732 utf8::decode $_; 2389 utf8::decode $_;
1733 next if /\.pst$/; 2390 s/\.map$//; # TODO future compatibility hack
1734 next unless /^$PATH_SEP/o; 2391 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1735 2392 ? ()
1736 push @paths, cf::map::normalise $_; 2393 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] }
1737 } 2395 ]
1738
1739 \@paths
1740} 2396}
1741
1742package cf;
1743 2397
1744=back 2398=back
1745 2399
1746=head3 cf::object 2400=head3 cf::object
1747 2401
1751 2405
1752=over 4 2406=over 4
1753 2407
1754=item $ob->inv_recursive 2408=item $ob->inv_recursive
1755 2409
1756Returns the inventory of the object _and_ their inventories, recursively. 2410Returns the inventory of the object I<and> their inventories, recursively,
2411but I<not> the object itself.
1757 2412
1758=cut 2413=cut
1759 2414
1760sub inv_recursive_; 2415sub inv_recursive_;
1761sub inv_recursive_ { 2416sub inv_recursive_ {
1764 2419
1765sub inv_recursive { 2420sub inv_recursive {
1766 inv_recursive_ inv $_[0] 2421 inv_recursive_ inv $_[0]
1767} 2422}
1768 2423
2424=item $ref = $ob->ref
2425
2426Creates and returns a persistent reference to an object that can be stored as a string.
2427
2428=item $ob = cf::object::deref ($refstring)
2429
2430returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2431even if the object actually exists. May block.
2432
2433=cut
2434
2435sub deref {
2436 my ($ref) = @_;
2437
2438 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2439 my ($uuid, $name) = ($1, $2);
2440 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2441 or return;
2442 $pl->ob->uuid eq $uuid
2443 or return;
2444
2445 $pl->ob
2446 } else {
2447 warn "$ref: cannot resolve object reference\n";
2448 undef
2449 }
2450}
2451
1769package cf; 2452package cf;
1770 2453
1771=back 2454=back
1772 2455
1773=head3 cf::object::player 2456=head3 cf::object::player
1779Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2462Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1780can be C<undef>. Does the right thing when the player is currently in a 2463can be C<undef>. Does the right thing when the player is currently in a
1781dialogue with the given NPC character. 2464dialogue with the given NPC character.
1782 2465
1783=cut 2466=cut
2467
2468our $SAY_CHANNEL = {
2469 id => "say",
2470 title => "Map",
2471 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2473};
2474
2475our $CHAT_CHANNEL = {
2476 id => "chat",
2477 title => "Chat",
2478 reply => "chat ",
2479 tooltip => "Player chat and shouts, global to the server.",
2480};
1784 2481
1785# rough implementation of a future "reply" method that works 2482# rough implementation of a future "reply" method that works
1786# with dialog boxes. 2483# with dialog boxes.
1787#TODO: the first argument must go, split into a $npc->reply_to ( method 2484#TODO: the first argument must go, split into a $npc->reply_to ( method
1788sub cf::object::player::reply($$$;$) { 2485sub cf::object::player::reply($$$;$) {
1790 2487
1791 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2488 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1792 2489
1793 if ($self->{record_replies}) { 2490 if ($self->{record_replies}) {
1794 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2491 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2492
1795 } else { 2493 } else {
2494 my $pl = $self->contr;
2495
2496 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2497 my $dialog = $pl->{npc_dialog};
2498 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2499
2500 } else {
1796 $msg = $npc->name . " says: $msg" if $npc; 2501 $msg = $npc->name . " says: $msg" if $npc;
1797 $self->message ($msg, $flags); 2502 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2503 }
1798 } 2504 }
2505}
2506
2507=item $object->send_msg ($channel, $msg, $color, [extra...])
2508
2509=cut
2510
2511sub cf::object::send_msg {
2512 my $pl = shift->contr
2513 or return;
2514 $pl->send_msg (@_);
1799} 2515}
1800 2516
1801=item $player_object->may ("access") 2517=item $player_object->may ("access")
1802 2518
1803Returns wether the given player is authorized to access resource "access" 2519Returns wether the given player is authorized to access resource "access"
1850 $self->deactivate_recursive; 2566 $self->deactivate_recursive;
1851 2567
1852 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2568 return if UNIVERSAL::isa $self->map, "ext::map_link";
1853 2569
1854 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1855 if $self->map; 2571 if $self->map && $self->map->{path} ne "{link}";
1856 2572
1857 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2573 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1858} 2574}
1859 2575
1860sub cf::object::player::leave_link { 2576sub cf::object::player::leave_link {
1861 my ($self, $map, $x, $y) = @_; 2577 my ($self, $map, $x, $y) = @_;
2578
2579 return unless $self->contr->active;
1862 2580
1863 my $link_pos = delete $self->{_link_pos}; 2581 my $link_pos = delete $self->{_link_pos};
1864 2582
1865 unless ($map) { 2583 unless ($map) {
1866 # restore original map position 2584 # restore original map position
1880 # use -1 or undef as default coordinates, not 0, 0 2598 # use -1 or undef as default coordinates, not 0, 0
1881 ($x, $y) = ($map->enter_x, $map->enter_y) 2599 ($x, $y) = ($map->enter_x, $map->enter_y)
1882 if $x <=0 && $y <= 0; 2600 if $x <=0 && $y <= 0;
1883 2601
1884 $map->load; 2602 $map->load;
1885 $map->load_diag; 2603 $map->load_neighbours;
1886 2604
1887 return unless $self->contr->active; 2605 return unless $self->contr->active;
1888 $self->activate_recursive; 2606 $self->activate_recursive;
1889 2607
1890 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1891 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
1892} 2610}
1893 2611
1894cf::player->attach ( 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1895 on_logout => sub {
1896 my ($pl) = @_;
1897 2613
1898 # abort map switching before logout 2614Moves the player to the given map-path and coordinates by first freezing
1899 if ($pl->ob->{_link_pos}) { 2615her, loading and preparing them map, calling the provided $check callback
1900 cf::sync_job { 2616that has to return the map if sucecssful, and then unfreezes the player on
1901 $pl->ob->leave_link 2617the new (success) or old (failed) map position. In either case, $done will
1902 }; 2618be called at the end of this process.
1903 }
1904 },
1905 on_login => sub {
1906 my ($pl) = @_;
1907 2619
1908 # try to abort aborted map switching on player login :) 2620Note that $check will be called with a potentially non-loaded map, so if
1909 # should happen only on crashes 2621it needs a loaded map it has to call C<< ->load >>.
1910 if ($pl->ob->{_link_pos}) {
1911 $pl->ob->enter_link;
1912 (async {
1913 $pl->ob->reply (undef,
1914 "There was an internal problem at your last logout, "
1915 . "the server will try to bring you to your intended destination in a second.",
1916 cf::NDI_RED);
1917 # we need this sleep as the login has a concurrent enter_exit running
1918 # and this sleep increases chances of the player not ending up in scorn
1919 Coro::Timer::sleep 1;
1920 $pl->ob->leave_link;
1921 })->prio (2);
1922 }
1923 },
1924);
1925 2622
1926=item $player_object->goto ($path, $x, $y)
1927
1928=cut 2623=cut
2624
2625our $GOTOGEN;
1929 2626
1930sub cf::object::player::goto { 2627sub cf::object::player::goto {
1931 my ($self, $path, $x, $y) = @_; 2628 my ($self, $path, $x, $y, $check, $done) = @_;
2629
2630 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1932 2632
1933 $self->enter_link; 2633 $self->enter_link;
1934 2634
1935 (async { 2635 (async {
2636 $Coro::current->{desc} = "player::goto $path $x $y";
2637
2638 # *tag paths override both path and x|y
2639 if ($path =~ /^\*(.*)$/) {
2640 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2641 my $ob = $obs[rand @obs];
2642
2643 # see if we actually can go there
2644 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2645 $ob = $obs[rand @obs];
2646 } else {
2647 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2648 }
2649 # else put us there anyways for now #d#
2650
2651 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2652 } else {
2653 ($path, $x, $y) = (undef, undef, undef);
2654 }
2655 }
2656
1936 my $map = eval { 2657 my $map = eval {
1937 my $map = cf::map::find $path; 2658 my $map = defined $path ? cf::map::find $path : undef;
2659
2660 if ($map) {
1938 $map = $map->customise_for ($self) if $map; 2661 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map;
2663 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 }
2666
1939 $map 2667 $map
2668 };
2669
2670 if ($@) {
2671 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2672 LOG llevError | logBacktrace, Carp::longmess $@;
1940 } or 2673 }
1941 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1942 2674
2675 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation};
1943 $self->leave_link ($map, $x, $y); 2677 $self->leave_link ($map, $x, $y);
2678 }
2679
2680 $done->() if $done;
1944 })->prio (1); 2681 })->prio (1);
1945} 2682}
1946 2683
1947=item $player_object->enter_exit ($exit_object) 2684=item $player_object->enter_exit ($exit_object)
1948 2685
1968} 2705}
1969 2706
1970sub prepare_random_map { 2707sub prepare_random_map {
1971 my ($exit) = @_; 2708 my ($exit) = @_;
1972 2709
1973 my $guard = cf::lock_acquire "exit_prepare:$exit";
1974
1975 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
1976 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
1977 # that depends on the exit object 2712 # that depends on the exit object
1978 2713
1979 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
1981 if ($exit->map) { 2716 if ($exit->map) {
1982 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
1983 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
1984 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
1985 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
1986 } 2723 }
1987 2724
1988 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
1989 2726
1990 my $data = cf::to_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
1991 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
1992 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
1993 2730
1994 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1995 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
1996 undef $fh; 2733 undef $fh;
1997 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
1998 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
1999 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2000 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2001 } 2742 }
2002} 2743}
2003 2744
2004sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2005 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2006 2747
2007 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2008 2749
2009 if ($exit->slaying eq "/!") {
2010 #TODO: this should de-fi-ni-te-ly not be a sync-job
2011 # the problem is that $exit might not survive long enough
2012 # so it needs to be done right now, right here
2013 cf::sync_job { prepare_random_map $exit };
2014 }
2015
2016 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2017 my $hp = $exit->stats->hp;
2018 my $sp = $exit->stats->sp;
2019
2020 $self->enter_link; 2750 $self->enter_link;
2021 2751
2022 (async { 2752 (async {
2023 $self->deactivate_recursive; # just to be sure 2753 $Coro::current->{desc} = "enter_exit";
2754
2024 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2025 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2026 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2027 1; 2776 1
2028 }) { 2777 }) {
2029 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the crossfire server. "
2030 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2031 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2032 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2053 2802
2054 utf8::encode $text; 2803 utf8::encode $text;
2055 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2056} 2805}
2057 2806
2807=item $client->send_msg ($channel, $msg, $color, [extra...])
2808
2809Send a drawinfo or msg packet to the client, formatting the msg for the
2810client if neccessary. C<$type> should be a string identifying the type of
2811the message, with C<log> being the default. If C<$color> is negative, suppress
2812the message unless the client supports the msg packet.
2813
2814=cut
2815
2816# non-persistent channels (usually the info channel)
2817our %CHANNEL = (
2818 "c/identify" => {
2819 id => "infobox",
2820 title => "Identify",
2821 reply => undef,
2822 tooltip => "Items recently identified",
2823 },
2824 "c/examine" => {
2825 id => "infobox",
2826 title => "Examine",
2827 reply => undef,
2828 tooltip => "Signs and other items you examined",
2829 },
2830 "c/book" => {
2831 id => "infobox",
2832 title => "Book",
2833 reply => undef,
2834 tooltip => "The contents of a note or book",
2835 },
2836 "c/lookat" => {
2837 id => "infobox",
2838 title => "Look",
2839 reply => undef,
2840 tooltip => "What you saw there",
2841 },
2842 "c/who" => {
2843 id => "infobox",
2844 title => "Players",
2845 reply => undef,
2846 tooltip => "Shows players who are currently online",
2847 },
2848 "c/body" => {
2849 id => "infobox",
2850 title => "Body Parts",
2851 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available",
2853 },
2854 "c/uptime" => {
2855 id => "infobox",
2856 title => "Uptime",
2857 reply => undef,
2858 tooltip => "How long the server has been running since last restart",
2859 },
2860 "c/mapinfo" => {
2861 id => "infobox",
2862 title => "Map Info",
2863 reply => undef,
2864 tooltip => "Information related to the maps",
2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872);
2873
2874sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_;
2876
2877 $msg = $self->pl->expand_cfpod ($msg);
2878
2879 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880
2881 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel};
2884
2885 $self->ext_msg (channel_info => $channel)
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id};
2889
2890 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel)
2895 if $self->can_msg;
2896 }
2897
2898 $channel = $channel->{id};
2899 }
2900
2901 return unless @extra || length $msg;
2902
2903 if ($self->can_msg) {
2904 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF;
2907
2908 $self->send_packet ("msg " . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2910 } else {
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921
2922 $color &= cf::NDI_COLOR_MASK;
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935}
2936
2058=item $client->ext_event ($type, %msg) 2937=item $client->ext_msg ($type, @msg)
2059 2938
2060Sends an exti event to the client. 2939Sends an ext event to the client.
2061 2940
2062=cut 2941=cut
2063 2942
2064sub cf::client::ext_event($$%) { 2943sub cf::client::ext_msg($$@) {
2065 my ($self, $type, %msg) = @_; 2944 my ($self, $type, @msg) = @_;
2066 2945
2946 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove
2067 $msg{msgtype} = "event_$type"; 2949 push @msg, msgtype => "event_$type";
2068 $self->send_packet ("ext " . cf::to_json \%msg); 2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 }
2952}
2953
2954=item $client->ext_reply ($msgid, @msg)
2955
2956Sends an ext reply to the client.
2957
2958=cut
2959
2960sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_;
2962
2963 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2069} 2970}
2070 2971
2071=item $success = $client->query ($flags, "text", \&cb) 2972=item $success = $client->query ($flags, "text", \&cb)
2072 2973
2073Queues a query to the client, calling the given callback with 2974Queues a query to the client, calling the given callback with
2074the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2975the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2075C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2976C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2076 2977
2077Queries can fail, so check the return code. Or don't, as queries will become 2978Queries can fail, so check the return code. Or don't, as queries will
2078reliable at some point in the future. 2979become reliable at some point in the future.
2079 2980
2080=cut 2981=cut
2081 2982
2082sub cf::client::query { 2983sub cf::client::query {
2083 my ($self, $flags, $text, $cb) = @_; 2984 my ($self, $flags, $text, $cb) = @_;
2091 utf8::encode $text; 2992 utf8::encode $text;
2092 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2993 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2093 2994
2094 $self->send_packet ($self->{query_queue}[0][0]) 2995 $self->send_packet ($self->{query_queue}[0][0])
2095 if @{ $self->{query_queue} } == 1; 2996 if @{ $self->{query_queue} } == 1;
2997
2998 1
2096} 2999}
2097 3000
2098cf::client->attach ( 3001cf::client->attach (
3002 on_connect => sub {
3003 my ($ns) = @_;
3004
3005 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3006 },
2099 on_reply => sub { 3007 on_reply => sub {
2100 my ($ns, $msg) = @_; 3008 my ($ns, $msg) = @_;
2101 3009
2102 # this weird shuffling is so that direct followup queries 3010 # this weird shuffling is so that direct followup queries
2103 # get handled first 3011 # get handled first
2115 } else { 3023 } else {
2116 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3024 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2117 } 3025 }
2118 } 3026 }
2119 }, 3027 },
3028 on_exticmd => sub {
3029 my ($ns, $buf) = @_;
3030
3031 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3032
3033 if (ref $msg) {
3034 my ($type, $reply, @payload) =
3035 "ARRAY" eq ref $msg
3036 ? @$msg
3037 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3038
3039 my @reply;
3040
3041 if (my $cb = $EXTICMD{$type}) {
3042 @reply = $cb->($ns, @payload);
3043 }
3044
3045 $ns->ext_reply ($reply, @reply)
3046 if $reply;
3047
3048 } else {
3049 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3050 }
3051
3052 cf::override;
3053 },
2120); 3054);
2121 3055
2122=item $client->async (\&cb) 3056=item $client->async (\&cb)
2123 3057
2124Create a new coroutine, running the specified callback. The coroutine will 3058Create a new coroutine, running the specified callback. The coroutine will
2165our $safe = new Safe "safe"; 3099our $safe = new Safe "safe";
2166our $safe_hole = new Safe::Hole; 3100our $safe_hole = new Safe::Hole;
2167 3101
2168$SIG{FPE} = 'IGNORE'; 3102$SIG{FPE} = 'IGNORE';
2169 3103
2170$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3104$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math
3106 grepstart grepwhile mapstart mapwhile
3107 sort time
3108));
2171 3109
2172# here we export the classes and methods available to script code 3110# here we export the classes and methods available to script code
2173 3111
2174=pod 3112=pod
2175 3113
2176The following functions and methods are available within a safe environment: 3114The following functions and methods are available within a safe environment:
2177 3115
2178 cf::object contr pay_amount pay_player map 3116 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split
3119
2179 cf::object::player player 3120 cf::object::player
2180 cf::player peaceful 3121 player
2181 cf::map trigger 3122
3123 cf::player
3124 peaceful
3125
3126 cf::map
3127 trigger
2182 3128
2183=cut 3129=cut
2184 3130
2185for ( 3131for (
2186 ["cf::object" => qw(contr pay_amount pay_player map)], 3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)],
2187 ["cf::object::player" => qw(player)], 3135 ["cf::object::player" => qw(player)],
2188 ["cf::player" => qw(peaceful)], 3136 ["cf::player" => qw(peaceful)],
2189 ["cf::map" => qw(trigger)], 3137 ["cf::map" => qw(trigger)],
2190) { 3138) {
2191 no strict 'refs'; 3139 no strict 'refs';
2262=back 3210=back
2263 3211
2264=cut 3212=cut
2265 3213
2266############################################################################# 3214#############################################################################
2267
2268=head2 EXTENSION DATABASE SUPPORT
2269
2270Crossfire maintains a very simple database for extension use. It can
2271currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2272convert to/from binary).
2273
2274The parameter C<$family> should best start with the name of the extension
2275using it, it should be unique.
2276
2277=over 4
2278
2279=item $value = cf::db_get $family => $key
2280
2281Returns a single value from the database.
2282
2283=item cf::db_put $family => $key => $value
2284
2285Stores the given C<$value> in the family.
2286
2287=cut
2288
2289our $DB;
2290
2291sub db_init {
2292 unless ($DB) {
2293 $DB = BDB::db_create $DB_ENV;
2294
2295 cf::sync_job {
2296 eval {
2297 $DB->set_flags (BDB::CHKSUM);
2298
2299 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2300 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2301 cf::cleanup "db_open(db): $!" if $!;
2302 };
2303 cf::cleanup "db_open(db): $@" if $@;
2304 };
2305 }
2306}
2307
2308sub db_get($$) {
2309 my $key = "$_[0]/$_[1]";
2310
2311 cf::sync_job {
2312 BDB::db_get $DB, undef, $key, my $data;
2313
2314 $! ? ()
2315 : $data
2316 }
2317}
2318
2319sub db_put($$$) {
2320 BDB::dbreq_pri 4;
2321 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2322}
2323
2324=item cf::cache $id => [$paths...], $processversion => $process
2325
2326Generic caching function that returns the value of the resource $id,
2327caching and regenerating as required.
2328
2329This function can block.
2330
2331=cut
2332
2333sub cache {
2334 my ($id, $src, $processversion, $process) = @_;
2335
2336 my $meta =
2337 join "\x00",
2338 $processversion,
2339 map {
2340 aio_stat $_
2341 and Carp::croak "$_: $!";
2342
2343 ($_, (stat _)[7,9])
2344 } @$src;
2345
2346 my $dbmeta = db_get cache => "$id/meta";
2347 if ($dbmeta ne $meta) {
2348 # changed, we may need to process
2349
2350 my @data;
2351 my $md5;
2352
2353 for (0 .. $#$src) {
2354 0 <= aio_load $src->[$_], $data[$_]
2355 or Carp::croak "$src->[$_]: $!";
2356 }
2357
2358 # if processing is expensive, check
2359 # checksum first
2360 if (1) {
2361 $md5 =
2362 join "\x00",
2363 $processversion,
2364 map {
2365 Coro::cede;
2366 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2367 } 0.. $#$src;
2368
2369
2370 my $dbmd5 = db_get cache => "$id/md5";
2371 if ($dbmd5 eq $md5) {
2372 db_put cache => "$id/meta", $meta;
2373
2374 return db_get cache => "$id/data";
2375 }
2376 }
2377
2378 my $data = $process->(\@data);
2379
2380 db_put cache => "$id/data", $data;
2381 db_put cache => "$id/md5" , $md5;
2382 db_put cache => "$id/meta", $meta;
2383
2384 return $data;
2385 }
2386
2387 db_get cache => "$id/data"
2388}
2389
2390=item fork_call { }, $args
2391
2392Executes the given code block with the given arguments in a seperate
2393process, returning the results. Everything must be serialisable with
2394Coro::Storable. May, of course, block. Note that the executed sub may
2395never block itself or use any form of Event handling.
2396
2397=cut
2398
2399sub fork_call(&@) {
2400 my ($cb, @args) = @_;
2401
2402# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2403# or die "socketpair: $!";
2404 pipe my $fh1, my $fh2
2405 or die "pipe: $!";
2406
2407 if (my $pid = fork) {
2408 close $fh2;
2409
2410 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2411 $res = Coro::Storable::thaw $res;
2412
2413 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2414
2415 die $$res unless "ARRAY" eq ref $res;
2416
2417 return wantarray ? @$res : $res->[-1];
2418 } else {
2419 eval {
2420 local $SIG{__DIE__};
2421 local $SIG{__WARN__};
2422 close $fh1;
2423
2424 my @res = eval { $cb->(@args) };
2425 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2426 };
2427
2428 _exit 0;
2429 }
2430}
2431
2432
2433
2434#############################################################################
2435# the server's init and main functions 3215# the server's init and main functions
2436 3216
2437sub load_facedata($) { 3217sub load_facedata($) {
2438 my ($path) = @_; 3218 my ($path) = @_;
3219
3220 # HACK to clear player env face cache, we need some signal framework
3221 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = ();
3223
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2439 3225
2440 warn "loading facedata from $path\n"; 3226 warn "loading facedata from $path\n";
2441 3227
2442 my $facedata; 3228 my $facedata;
2443 0 < aio_load $path, $facedata 3229 0 < aio_load $path, $facedata
2446 $facedata = Coro::Storable::thaw $facedata; 3232 $facedata = Coro::Storable::thaw $facedata;
2447 3233
2448 $facedata->{version} == 2 3234 $facedata->{version} == 2
2449 or cf::cleanup "$path: version mismatch, cannot proceed."; 3235 or cf::cleanup "$path: version mismatch, cannot proceed.";
2450 3236
3237 # patch in the exptable
3238 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3241 };
3242 cf::cede_to_tick;
3243
2451 { 3244 {
2452 my $faces = $facedata->{faceinfo}; 3245 my $faces = $facedata->{faceinfo};
2453 3246
2454 while (my ($face, $info) = each %$faces) { 3247 while (my ($face, $info) = each %$faces) {
2455 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3248 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249
2456 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3250 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap};
2457 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2458 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2459 Coro::cede; 3254
3255 cf::cede_to_tick;
2460 } 3256 }
2461 3257
2462 while (my ($face, $info) = each %$faces) { 3258 while (my ($face, $info) = each %$faces) {
2463 next unless $info->{smooth}; 3259 next unless $info->{smooth};
3260
2464 my $idx = cf::face::find $face 3261 my $idx = cf::face::find $face
2465 or next; 3262 or next;
3263
2466 if (my $smooth = cf::face::find $info->{smooth}) { 3264 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth;
2467 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2468 } else { 3267 } else {
2469 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3268 warn "smooth face '$info->{smooth}' not found for face '$face'";
2470 } 3269 }
2471 Coro::cede; 3270
3271 cf::cede_to_tick;
2472 } 3272 }
2473 } 3273 }
2474 3274
2475 { 3275 {
2476 my $anims = $facedata->{animinfo}; 3276 my $anims = $facedata->{animinfo};
2477 3277
2478 while (my ($anim, $info) = each %$anims) { 3278 while (my ($anim, $info) = each %$anims) {
2479 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3279 cf::anim::set $anim, $info->{frames}, $info->{facings};
2480 Coro::cede; 3280 cf::cede_to_tick;
2481 } 3281 }
2482 3282
2483 cf::anim::invalidate_all; # d'oh 3283 cf::anim::invalidate_all; # d'oh
2484 } 3284 }
2485 3285
3286 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource};
3290
3291 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295
3296 if ($info->{type} & 1) {
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type};
3311 } else {
3312 $RESOURCE{$name} = $info;
3313 }
3314
3315 cf::cede_to_tick;
3316 }
3317 }
3318
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320
2486 1 3321 1
2487} 3322}
2488 3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343
3344register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_;
3346
3347 while (my ($k, $v) = each %$want) {
3348 $ns->fx_want ($k, $v);
3349 }
3350};
3351
3352sub load_resource_file($) {
3353 my $guard = lock_acquire "load_resource_file";
3354
3355 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100;
3357 cf::arch::commit_load;
3358
3359 $status
3360}
3361
3362sub reload_regions {
3363 # HACK to clear player env face cache, we need some signal framework
3364 # for this (global event?)
3365 %ext::player_env::MUSIC_FACE_CACHE = ();
3366
3367 load_resource_file "$MAPDIR/regions"
3368 or die "unable to load regions file\n";
3369
3370 for (cf::region::list) {
3371 $_->{match} = qr/$_->{match}/
3372 if exists $_->{match};
3373 }
3374}
3375
2489sub reload_facedata { 3376sub reload_facedata {
2490 load_facedata sprintf "%s/facedata", cf::datadir 3377 load_facedata "$DATADIR/facedata"
2491 or die "unable to load facedata\n"; 3378 or die "unable to load facedata\n";
2492} 3379}
2493 3380
2494sub reload_regions {
2495 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2496 or die "unable to load regions file\n";
2497}
2498
2499sub reload_archetypes { 3381sub reload_archetypes {
2500 load_resource_file sprintf "%s/archetypes", cf::datadir 3382 load_resource_file "$DATADIR/archetypes"
2501 or die "unable to load archetypes\n"; 3383 or die "unable to load archetypes\n";
2502} 3384}
2503 3385
2504sub reload_treasures { 3386sub reload_treasures {
2505 load_resource_file sprintf "%s/treasures", cf::datadir 3387 load_resource_file "$DATADIR/treasures"
2506 or die "unable to load treasurelists\n"; 3388 or die "unable to load treasurelists\n";
2507} 3389}
2508 3390
2509sub reload_resources { 3391sub reload_resources {
2510 warn "reloading resource files...\n"; 3392 warn "reloading resource files...\n";
2511 3393
2512 reload_regions;
2513 reload_facedata; 3394 reload_facedata;
2514 reload_archetypes; 3395 reload_archetypes;
3396 reload_regions;
2515 reload_treasures; 3397 reload_treasures;
2516 3398
2517 warn "finished reloading resource files\n"; 3399 warn "finished reloading resource files\n";
2518} 3400}
2519 3401
2520sub init { 3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
2521 reload_resources; 3407 reload_resources;
2522} 3408}
2523 3409
2524sub cfg_load { 3410sub reload_config {
2525 open my $fh, "<:utf8", cf::confdir . "/config" 3411 open my $fh, "<:utf8", "$CONFDIR/config"
2526 or return; 3412 or return;
2527 3413
2528 local $/; 3414 local $/;
2529 *CFG = YAML::Syck::Load <$fh>; 3415 *CFG = YAML::Load <$fh>;
2530 3416
2531 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2532 3418
2533 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2534 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2545sub main { 3431sub main {
2546 # we must not ever block the main coroutine 3432 # we must not ever block the main coroutine
2547 local $Coro::idle = sub { 3433 local $Coro::idle = sub {
2548 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2549 (async { 3435 (async {
2550 Event::one_event; 3436 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT;
2551 })->prio (Coro::PRIO_MAX); 3438 })->prio (Coro::PRIO_MAX);
2552 }; 3439 };
2553 3440
2554 cfg_load; 3441 {
3442 my $guard = freeze_mainloop;
3443 reload_config;
2555 db_init; 3444 db_init;
2556 load_extensions; 3445 load_extensions;
2557 3446
2558 $TICK_WATCHER->start; 3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3448 }
3449
2559 Event::loop; 3450 EV::loop;
2560} 3451}
2561 3452
2562############################################################################# 3453#############################################################################
2563# initialisation and cleanup 3454# initialisation and cleanup
2564 3455
2565# install some emergency cleanup handlers 3456# install some emergency cleanup handlers
2566BEGIN { 3457BEGIN {
3458 our %SIGWATCHER = ();
2567 for my $signal (qw(INT HUP TERM)) { 3459 for my $signal (qw(INT HUP TERM)) {
2568 Event->signal ( 3460 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2569 reentrant => 0,
2570 data => WF_AUTOCANCEL,
2571 signal => $signal,
2572 prio => 0,
2573 cb => sub {
2574 cf::cleanup "SIG$signal"; 3461 cf::cleanup "SIG$signal";
2575 },
2576 ); 3462 };
3463 }
3464}
3465
3466sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime";
3468
3469 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time.
3471
3472 IO::AIO::aio_utime $runtime, undef, undef;
3473
3474 my $guard = cf::lock_acquire "write_runtime";
3475
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server.
3482
3483 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3484 and return;
3485
3486 # always fsync - this file is important
3487 aio_fsync $fh
3488 and return;
3489
3490 # touch it again to show we are up-to-date
3491 aio_utime $fh, undef, undef;
3492
3493 close $fh
3494 or return;
3495
3496 aio_rename "$runtime~", $runtime
3497 and return;
3498
3499 warn "runtime file written.\n";
3500
2577 } 3501 1
3502}
3503
3504our $uuid_lock;
3505our $uuid_skip;
3506
3507sub write_uuid_sync($) {
3508 $uuid_skip ||= $_[0];
3509
3510 return if $uuid_lock;
3511 local $uuid_lock = 1;
3512
3513 my $uuid = "$LOCALDIR/uuid";
3514
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return;
3517
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
2578} 3545}
2579 3546
2580sub emergency_save() { 3547sub emergency_save() {
2581 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
2582 3549
2588 # and maps saved/destroyed asynchronously. 3555 # and maps saved/destroyed asynchronously.
2589 warn "begin emergency player save\n"; 3556 warn "begin emergency player save\n";
2590 for my $login (keys %cf::PLAYER) { 3557 for my $login (keys %cf::PLAYER) {
2591 my $pl = $cf::PLAYER{$login} or next; 3558 my $pl = $cf::PLAYER{$login} or next;
2592 $pl->valid or next; 3559 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2593 $pl->save; 3561 $pl->save;
2594 } 3562 }
2595 warn "end emergency player save\n"; 3563 warn "end emergency player save\n";
2596 3564
2597 warn "begin emergency map save\n"; 3565 warn "begin emergency map save\n";
2603 warn "end emergency map save\n"; 3571 warn "end emergency map save\n";
2604 3572
2605 warn "begin emergency database checkpoint\n"; 3573 warn "begin emergency database checkpoint\n";
2606 BDB::db_env_txn_checkpoint $DB_ENV; 3574 BDB::db_env_txn_checkpoint $DB_ENV;
2607 warn "end emergency database checkpoint\n"; 3575 warn "end emergency database checkpoint\n";
3576
3577 warn "begin write uuid\n";
3578 write_uuid_sync 1;
3579 warn "end write uuid\n";
2608 }; 3580 };
2609 3581
2610 warn "leave emergency perl save\n"; 3582 warn "leave emergency perl save\n";
2611} 3583}
2612 3584
2627 warn "reloading..."; 3599 warn "reloading...";
2628 3600
2629 warn "entering sync_job"; 3601 warn "entering sync_job";
2630 3602
2631 cf::sync_job { 3603 cf::sync_job {
2632 cf::write_runtime; # external watchdog should not bark 3604 cf::write_runtime_sync; # external watchdog should not bark
2633 cf::emergency_save; 3605 cf::emergency_save;
2634 cf::write_runtime; # external watchdog should not bark 3606 cf::write_runtime_sync; # external watchdog should not bark
2635 3607
2636 warn "syncing database to disk"; 3608 warn "syncing database to disk";
2637 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
2638 3610
2639 # if anything goes wrong in here, we should simply crash as we already saved 3611 # if anything goes wrong in here, we should simply crash as we already saved
2640
2641 warn "cancelling all WF_AUTOCANCEL watchers";
2642 for (Event::all_watchers) {
2643 $_->cancel if $_->data & WF_AUTOCANCEL;
2644 }
2645 3612
2646 warn "flushing outstanding aio requests"; 3613 warn "flushing outstanding aio requests";
2647 for (;;) { 3614 for (;;) {
2648 BDB::flush; 3615 BDB::flush;
2649 IO::AIO::flush; 3616 IO::AIO::flush;
2650 Coro::cede; 3617 Coro::cede_notself;
2651 last unless IO::AIO::nreqs || BDB::nreqs; 3618 last unless IO::AIO::nreqs || BDB::nreqs;
2652 warn "iterate..."; 3619 warn "iterate...";
2653 } 3620 }
2654 3621
2655 ++$RELOAD; 3622 ++$RELOAD;
2659 %EXT_CORO = (); 3626 %EXT_CORO = ();
2660 3627
2661 warn "removing commands"; 3628 warn "removing commands";
2662 %COMMAND = (); 3629 %COMMAND = ();
2663 3630
2664 warn "removing ext commands"; 3631 warn "removing ext/exti commands";
2665 %EXTCMD = (); 3632 %EXTCMD = ();
3633 %EXTICMD = ();
2666 3634
2667 warn "unloading/nuking all extensions"; 3635 warn "unloading/nuking all extensions";
2668 for my $pkg (@EXTS) { 3636 for my $pkg (@EXTS) {
2669 warn "... unloading $pkg"; 3637 warn "... unloading $pkg";
2670 3638
2700 Symbol::delete_package "safe::$_" 3668 Symbol::delete_package "safe::$_"
2701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2702 3670
2703 warn "unloading cf.pm \"a bit\""; 3671 warn "unloading cf.pm \"a bit\"";
2704 delete $INC{"cf.pm"}; 3672 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"};
2705 3674
2706 # don't, removes xs symbols, too, 3675 # don't, removes xs symbols, too,
2707 # and global variables created in xs 3676 # and global variables created in xs
2708 #Symbol::delete_package __PACKAGE__; 3677 #Symbol::delete_package __PACKAGE__;
2709 3678
2712 warn "reloading cf.pm"; 3681 warn "reloading cf.pm";
2713 require cf; 3682 require cf;
2714 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2715 3684
2716 warn "loading config and database again"; 3685 warn "loading config and database again";
2717 cf::cfg_load; 3686 cf::reload_config;
2718 3687
2719 warn "loading extensions"; 3688 warn "loading extensions";
2720 cf::load_extensions; 3689 cf::load_extensions;
2721 3690
2722 warn "reattaching attachments to objects/players"; 3691 warn "reattaching attachments to objects/players";
2729 warn "leaving sync_job"; 3698 warn "leaving sync_job";
2730 3699
2731 1 3700 1
2732 } or do { 3701 } or do {
2733 warn $@; 3702 warn $@;
2734 warn "error while reloading, exiting."; 3703 cf::cleanup "error while reloading, exiting.";
2735 exit 1;
2736 }; 3704 };
2737 3705
2738 warn "reloaded"; 3706 warn "reloaded";
2739}; 3707};
2740 3708
2742 3710
2743sub reload_perl() { 3711sub reload_perl() {
2744 # doing reload synchronously and two reloads happen back-to-back, 3712 # doing reload synchronously and two reloads happen back-to-back,
2745 # coro crashes during coro_state_free->destroy here. 3713 # coro crashes during coro_state_free->destroy here.
2746 3714
2747 $RELOAD_WATCHER ||= Event->timer ( 3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2748 reentrant => 0,
2749 after => 0,
2750 data => WF_AUTOCANCEL,
2751 cb => sub {
2752 do_reload_perl; 3716 do_reload_perl;
2753 undef $RELOAD_WATCHER; 3717 undef $RELOAD_WATCHER;
2754 },
2755 ); 3718 };
2756} 3719}
2757 3720
2758register_command "reload" => sub { 3721register_command "reload" => sub {
2759 my ($who, $arg) = @_; 3722 my ($who, $arg) = @_;
2760 3723
2761 if ($who->flag (FLAG_WIZ)) { 3724 if ($who->flag (FLAG_WIZ)) {
2762 $who->message ("reloading server."); 3725 $who->message ("reloading server.");
3726 async {
3727 $Coro::current->{desc} = "perl_reload";
2763 async { reload_perl }; 3728 reload_perl;
3729 };
2764 } 3730 }
2765}; 3731};
2766 3732
2767unshift @INC, $LIBDIR; 3733unshift @INC, $LIBDIR;
2768 3734
2770 3736
2771our @WAIT_FOR_TICK; 3737our @WAIT_FOR_TICK;
2772our @WAIT_FOR_TICK_BEGIN; 3738our @WAIT_FOR_TICK_BEGIN;
2773 3739
2774sub wait_for_tick { 3740sub wait_for_tick {
2775 return unless $TICK_WATCHER->is_active;
2776 return if $Coro::current == $Coro::main; 3741 return if tick_inhibit || $Coro::current == $Coro::main;
2777 3742
2778 my $signal = new Coro::Signal; 3743 my $signal = new Coro::Signal;
2779 push @WAIT_FOR_TICK, $signal; 3744 push @WAIT_FOR_TICK, $signal;
2780 $signal->wait; 3745 $signal->wait;
2781} 3746}
2782 3747
2783sub wait_for_tick_begin { 3748sub wait_for_tick_begin {
2784 return unless $TICK_WATCHER->is_active;
2785 return if $Coro::current == $Coro::main; 3749 return if tick_inhibit || $Coro::current == $Coro::main;
2786 3750
2787 my $signal = new Coro::Signal; 3751 my $signal = new Coro::Signal;
2788 push @WAIT_FOR_TICK_BEGIN, $signal; 3752 push @WAIT_FOR_TICK_BEGIN, $signal;
2789 $signal->wait; 3753 $signal->wait;
2790} 3754}
2791 3755
2792$TICK_WATCHER = Event->timer ( 3756sub tick {
2793 reentrant => 0,
2794 parked => 1,
2795 prio => 0,
2796 at => $NEXT_TICK || $TICK,
2797 data => WF_AUTOCANCEL,
2798 cb => sub {
2799 if ($Coro::current != $Coro::main) { 3757 if ($Coro::current != $Coro::main) {
2800 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3758 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2801 unless ++$bug_warning > 10; 3759 unless ++$bug_warning > 10;
2802 return; 3760 return;
2803 } 3761 }
2804 3762
2805 $NOW = Event::time;
2806
2807 cf::server_tick; # one server iteration 3763 cf::server_tick; # one server iteration
2808 3764
2809 $RUNTIME += $TICK;
2810 $NEXT_TICK += $TICK;
2811
2812 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3765 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2813 $NEXT_RUNTIME_WRITE = $NOW + 10; 3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2814 Coro::async_pool { 3767 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver";
2815 write_runtime 3769 write_runtime_sync
2816 or warn "ERROR: unable to write runtime file: $!"; 3770 or warn "ERROR: unable to write runtime file: $!";
2817 };
2818 } 3771 };
3772 }
2819 3773
2820# my $AFTER = Event::time;
2821# warn $AFTER - $NOW;#d#
2822
2823 # if we are delayed by four ticks or more, skip them all
2824 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2825
2826 $TICK_WATCHER->at ($NEXT_TICK);
2827 $TICK_WATCHER->start;
2828
2829 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2830 $sig->send; 3775 $sig->send;
2831 } 3776 }
2832 while (my $sig = shift @WAIT_FOR_TICK) { 3777 while (my $sig = shift @WAIT_FOR_TICK) {
2833 $sig->send; 3778 $sig->send;
2834 }
2835
2836 _post_tick;
2837 }, 3779 }
2838); 3780
3781 $LOAD = ($NOW - $TICK_START) / $TICK;
3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3783
3784 if (0) {
3785 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d#
3789 }
3790 }
3791}
2839 3792
2840{ 3793{
2841 BDB::max_poll_time $TICK * 0.1; 3794 # configure BDB
2842 $BDB_POLL_WATCHER = Event->io ( 3795
2843 reentrant => 0,
2844 fd => BDB::poll_fileno,
2845 poll => 'r',
2846 prio => 0,
2847 data => WF_AUTOCANCEL,
2848 cb => \&BDB::poll_cb,
2849 );
2850 BDB::min_parallel 8; 3796 BDB::min_parallel 8;
2851 3797 BDB::max_poll_reqs $TICK * 0.1;
2852 BDB::set_sync_prepare { 3798 $AnyEvent::BDB::WATCHER->priority (1);
2853 my $status;
2854 my $current = $Coro::current;
2855 (
2856 sub {
2857 $status = $!;
2858 $current->ready; undef $current;
2859 },
2860 sub {
2861 Coro::schedule while defined $current;
2862 $! = $status;
2863 },
2864 )
2865 };
2866 3799
2867 unless ($DB_ENV) { 3800 unless ($DB_ENV) {
2868 $DB_ENV = BDB::db_env_create; 3801 $DB_ENV = BDB::db_env_create;
3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3803 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3804 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3805 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3806 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2869 3807
2870 cf::sync_job { 3808 cf::sync_job {
2871 eval { 3809 eval {
2872 BDB::db_env_open 3810 BDB::db_env_open
2873 $DB_ENV, 3811 $DB_ENV,
2874 $BDB_ENV_DIR, 3812 $BDBDIR,
2875 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3813 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2876 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3814 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2877 0666; 3815 0666;
2878 3816
2879 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3817 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2880
2881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2882 $DB_ENV->set_lk_detect;
2883 }; 3818 };
2884 3819
2885 cf::cleanup "db_env_open(db): $@" if $@; 3820 cf::cleanup "db_env_open(db): $@" if $@;
2886 }; 3821 };
2887 } 3822 }
3823
3824 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3825 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3826 };
3827 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3828 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3829 };
3830 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3831 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3832 };
2888} 3833}
2889 3834
2890{ 3835{
3836 # configure IO::AIO
3837
2891 IO::AIO::min_parallel 8; 3838 IO::AIO::min_parallel 8;
2892
2893 undef $Coro::AIO::WATCHER;
2894 IO::AIO::max_poll_time $TICK * 0.1; 3839 IO::AIO::max_poll_time $TICK * 0.1;
2895 $AIO_POLL_WATCHER = Event->io ( 3840 undef $AnyEvent::AIO::WATCHER;
2896 reentrant => 0, 3841}
2897 data => WF_AUTOCANCEL, 3842
2898 fd => IO::AIO::poll_fileno, 3843my $_log_backtrace;
2899 poll => 'r', 3844
2900 prio => 6, 3845sub _log_backtrace {
2901 cb => \&IO::AIO::poll_cb, 3846 my ($msg, @addr) = @_;
2902 ); 3847
3848 $msg =~ s/\n//;
3849
3850 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace;
3853 async {
3854 $Coro::current->{desc} = "abt $msg";
3855
3856 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr;
3858 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3859 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3860 or die "addr2line: $!";
3861
3862 my @funcs;
3863 my @res = <$fh>;
3864 chomp for @res;
3865 while (@res) {
3866 my ($func, $line) = splice @res, 0, 2, ();
3867 push @funcs, "[$func] $line";
3868 }
3869
3870 @funcs
3871 };
3872
3873 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace;
3876 };
3877 } else {
3878 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n";
3880 }
2903} 3881}
2904 3882
2905# load additional modules 3883# load additional modules
2906use cf::pod; 3884use cf::pod;
2907 3885

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines