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.279 by root, Mon Jun 11 22:16:53 2007 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5; 56use Digest::MD5;
28use Fcntl; 57use Fcntl;
29use YAML::Syck (); 58use YAML ();
30use IO::AIO 2.32 (); 59use IO::AIO ();
31use Time::HiRes; 60use Time::HiRes;
32use Compress::LZF; 61use Compress::LZF;
62use Digest::MD5 ();
63
64AnyEvent::detect;
33 65
34# configure various modules to our taste 66# configure various modules to our taste
35# 67#
36$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39
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
46 76
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 78
49our %COMMAND = (); 79our %COMMAND = ();
50our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
51 81
52our @EXTS = (); # list of extension package names 82our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 83our %EXTCMD = ();
84our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
56 87
57our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 89our @EVENT;
59 90
60our $CONFDIR = confdir; 91our $CONFDIR = confdir;
61our $DATADIR = datadir; 92our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
71 106
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 109our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
79 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
82 118
83our %CFG; 119our %CFG;
84 120
85our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 122our $RUNTIME;
123our $NOW;
87 124
88our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
91 128
92# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 131
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
98 140
99binmode STDOUT; 141binmode STDOUT;
100binmode STDERR; 142binmode STDERR;
101 143
102# read virtual server time, if available 144# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
107} 149}
108 150
109mkdir $_ 151mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 197
156The raw value load value from the last tick. 198The raw value load value from the last tick.
157 199
158=item %cf::CFG 200=item %cf::CFG
159 201
160Configuration for the server, loaded from C</etc/crossfire/config>, or 202Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 203from wherever your confdir points to.
162 204
163=item cf::wait_for_tick, cf::wait_for_tick_begin 205=item cf::wait_for_tick, cf::wait_for_tick_begin
164 206
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 207These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 208returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 209per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 210
211=item @cf::INVOKE_RESULTS
212
213This array contains the results of the last C<invoke ()> call. When
214C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
215that call.
216
169=back 217=back
170 218
171=cut 219=cut
172 220
173BEGIN { 221BEGIN {
… …
177 $msg .= "\n" 225 $msg .= "\n"
178 unless $msg =~ /\n$/; 226 unless $msg =~ /\n$/;
179 227
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 229
182 utf8::encode $msg;
183 LOG llevError, $msg; 230 LOG llevError, $msg;
184 }; 231 };
185} 232}
233
234$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "=="
236
237 if ($Coro::current == $Coro::main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d#
240 }#d#
241
242 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate
245};
246
247$SIG{__DIE__} = sub { }; #d#?
186 248
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 259for my $pkg (qw(
198 cf::global cf::attachable 260 cf::global cf::attachable
199 cf::object cf::object::player 261 cf::object cf::object::player
200 cf::client cf::player 262 cf::client cf::player
201 cf::arch cf::living 263 cf::arch cf::living
264 cf::map cf::mapspace
202 cf::map cf::party cf::region 265 cf::party cf::region
203)) { 266)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 268}
207 269
208$Event::DIED = sub { 270$EV::DIED = sub {
209 warn "error in event callback: @_"; 271 warn "error in event callback: @_";
210}; 272};
273
274#############################################################################
211 275
212=head2 UTILITY FUNCTIONS 276=head2 UTILITY FUNCTIONS
213 277
214=over 4 278=over 4
215 279
… …
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 298 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 299 $d
236 } || "[unable to dump $_[0]: '$@']"; 300 } || "[unable to dump $_[0]: '$@']";
237} 301}
238 302
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 303=item $ref = cf::decode_json $json
242 304
243Converts a JSON string into the corresponding perl data structure. 305Converts a JSON string into the corresponding perl data structure.
244 306
245=item $json = cf::to_json $ref 307=item $json = cf::encode_json $ref
246 308
247Converts a perl data structure into its JSON representation. 309Converts a perl data structure into its JSON representation.
248 310
311=cut
312
313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
314
315sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) }
317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
249=item cf::lock_wait $string 332=item cf::lock_wait $string
250 333
251Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
252 335
253=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
254 337
255Wait until the given lock is available and then acquires it and returns 338Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
258returned. 341returned.
259 342
343Locks are *not* recursive, locking from the same coro twice results in a
344deadlocked coro.
345
260Lock names should begin with a unique identifier (for example, cf::map::find 346Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 347uses map_find and cf::map::load uses map_load).
262 348
263=item $locked = cf::lock_active $string 349=item $locked = cf::lock_active $string
264 350
265Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
266 352
267=cut 353=cut
268 354
269our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
270 356
271sub lock_wait($) { 357sub lock_wait($) {
272 my ($key) = @_; 358 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 359}
280 360
281sub lock_acquire($) { 361sub lock_acquire($) {
282 my ($key) = @_; 362 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 363}
294 364
295sub lock_active($) { 365sub lock_active($) {
296 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 367}
300 368
301sub freeze_mainloop { 369sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 370 tick_inhibit_inc;
303 371
304 my $guard = Coro::guard { 372 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 373}
374
375=item cf::periodic $interval, $cb
376
377Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer.
379
380=cut
381
382sub periodic($$) {
383 my ($interval, $cb) = @_;
384
385 my $start = rand List::Util::min 180, $interval;
386
387 EV::periodic $start, $interval, 0, $cb
388}
389
390=item cf::get_slot $time[, $priority[, $name]]
391
392Allocate $time seconds of blocking CPU time at priority C<$priority>:
393This call blocks and returns only when you have at least C<$time> seconds
394of cpu time till the next tick. The slot is only valid till the next cede.
395
396The optional C<$name> can be used to identify the job to run. It might be
397used for statistical purposes and should identify the same time-class.
398
399Useful for short background jobs.
400
401=cut
402
403our @SLOT_QUEUE;
404our $SLOT_QUEUE;
405
406$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager");
409
410 my $signal = new Coro::Signal;
411
412 while () {
413 next_job:
414 my $avail = cf::till_tick;
415 if ($avail > 0.01) {
416 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) {
418 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send;
420 Coro::cede;
421 goto next_job;
422 }
423 }
424 }
425
426 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait;
430 } else {
431 Coro::schedule;
432 }
306 }; 433 }
307 $TICK_WATCHER->stop; 434};
308 $guard 435
436sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main;
438
439 my ($time, $pri, $name) = @_;
440
441 $time = $TICK * .6 if $time > $TICK * .6;
442 my $sig = new Coro::Signal;
443
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready;
447 $sig->wait;
309} 448}
310 449
311=item cf::async { BLOCK } 450=item cf::async { BLOCK }
312 451
313Currently the same as Coro::async_pool, meaning you cannot use 452Currently the same as Coro::async_pool, meaning you cannot use
… …
318 457
319BEGIN { *async = \&Coro::async_pool } 458BEGIN { *async = \&Coro::async_pool }
320 459
321=item cf::sync_job { BLOCK } 460=item cf::sync_job { BLOCK }
322 461
323The design of crossfire+ requires that the main coro ($Coro::main) is 462The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 463is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 464partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
465acceptable.
326 466
327If it must be done, put the blocking parts into C<sync_job>. This will run 467If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 468the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 469server will be frozen during this time, so the block should either finish
330fast or be very important. 470fast or be very important.
… …
333 473
334sub sync_job(&) { 474sub sync_job(&) {
335 my ($job) = @_; 475 my ($job) = @_;
336 476
337 if ($Coro::current == $Coro::main) { 477 if ($Coro::current == $Coro::main) {
338 my $time = Event::time; 478 my $time = EV::time;
339 479
340 # this is the main coro, too bad, we have to block 480 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 481 # till the operation succeeds, freezing the server :/
342 482
343 # TODO: use suspend/resume instead 483 LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 484
345 my $freeze_guard = freeze_mainloop; 485 my $freeze_guard = freeze_mainloop;
346 486
347 my $busy = 1; 487 my $busy = 1;
348 my @res; 488 my @res;
349 489
350 (async { 490 (async {
491 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 492 @res = eval { $job->() };
352 warn $@ if $@; 493 warn $@ if $@;
353 undef $busy; 494 undef $busy;
354 })->prio (Coro::PRIO_MAX); 495 })->prio (Coro::PRIO_MAX);
355 496
356 while ($busy) { 497 while ($busy) {
357 Coro::cede or Event::one_event; 498 if (Coro::nready) {
499 Coro::cede_notself;
500 } else {
501 EV::loop EV::LOOP_ONESHOT;
358 } 502 }
503 }
359 504
360 $time = Event::time - $time; 505 my $time = EV::time - $time;
361 506
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 507 $TICK_START += $time; # do not account sync jobs to server load
366 508
367 wantarray ? @res : $res[0] 509 wantarray ? @res : $res[0]
368 } else { 510 } else {
369 # we are in another coroutine, how wonderful, everything just works 511 # we are in another coroutine, how wonderful, everything just works
370 512
… …
390 $EXT_CORO{$coro+0} = $coro; 532 $EXT_CORO{$coro+0} = $coro;
391 533
392 $coro 534 $coro
393} 535}
394 536
395sub write_runtime { 537=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 538
398 # first touch the runtime file to show we are still running: 539Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 540process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling.
400 543
401 IO::AIO::aio_utime $runtime, undef, undef; 544=cut
402 545
403 my $guard = cf::lock_acquire "write_runtime"; 546sub fork_call(&@) {
547 my ($cb, @args) = @_;
404 548
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 549 # we seemingly have to make a local copy of the whole thing,
406 or return; 550 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious)
407 552
408 my $value = $cf::RUNTIME + 90 + 10; 553 my @res = Coro::Util::fork_eval {
409 # 10 is the runtime save interval, for a monotonic clock 554 reset_signals;
410 # 60 allows for the watchdog to kill the server. 555 &$cb
556 }, @args;
411 557
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 558 wantarray ? @res : $res[-1]
413 and return; 559}
414 560
415 # always fsync - this file is important 561=item $coin = coin_from_name $name
416 aio_fsync $fh
417 and return;
418 562
419 # touch it again to show we are up-to-date 563=cut
420 aio_utime $fh, undef, undef;
421 564
422 close $fh 565our %coin_alias = (
423 or return; 566 "silver" => "silvercoin",
567 "silvercoin" => "silvercoin",
568 "silvercoins" => "silvercoin",
569 "gold" => "goldcoin",
570 "goldcoin" => "goldcoin",
571 "goldcoins" => "goldcoin",
572 "platinum" => "platinacoin",
573 "platinumcoin" => "platinacoin",
574 "platinumcoins" => "platinacoin",
575 "platina" => "platinacoin",
576 "platinacoin" => "platinacoin",
577 "platinacoins" => "platinacoin",
578 "royalty" => "royalty",
579 "royalties" => "royalty",
580);
424 581
425 aio_rename "$runtime~", $runtime 582sub coin_from_name($) {
426 and return; 583 $coin_alias{$_[0]}
584 ? cf::arch::find $coin_alias{$_[0]}
585 : undef
586}
427 587
428 warn "runtime file written.\n"; 588=item $value = cf::db_get $family => $key
429 589
590Returns a single value from the environment database.
591
592=item cf::db_put $family => $key => $value
593
594Stores the given C<$value> in the family. It can currently store binary
595data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
596
597=item $db = cf::db_table "name"
598
599Create and/or open a new database table. The string must not be "db" and must be unique
600within each server.
601
602=cut
603
604sub db_table($) {
605 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV;
607
608 eval {
609 $db->set_flags (BDB::CHKSUM);
610
611 utf8::encode $name;
612 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
613 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
614 cf::cleanup "db_open(db): $!" if $!;
615 };
616 cf::cleanup "db_open(db): $@" if $@;
617
618 $db
619}
620
621our $DB;
622
623sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db";
626 };
627}
628
629sub db_get($$) {
630 my $key = "$_[0]/$_[1]";
631
632 cf::sync_job {
633 BDB::db_get $DB, undef, $key, my $data;
634
635 $! ? ()
636 : $data
430 1 637 }
638}
639
640sub db_put($$$) {
641 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
643}
644
645=item cf::cache $id => [$paths...], $processversion => $process
646
647Generic caching function that returns the value of the resource $id,
648caching and regenerating as required.
649
650This function can block.
651
652=cut
653
654sub cache {
655 my ($id, $src, $processversion, $process) = @_;
656
657 my $meta =
658 join "\x00",
659 $processversion,
660 map {
661 aio_stat $_
662 and Carp::croak "$_: $!";
663
664 ($_, (stat _)[7,9])
665 } @$src;
666
667 my $dbmeta = db_get cache => "$id/meta";
668 if ($dbmeta ne $meta) {
669 # changed, we may need to process
670
671 my @data;
672 my $md5;
673
674 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_]
676 or Carp::croak "$src->[$_]: $!";
677 }
678
679 # if processing is expensive, check
680 # checksum first
681 if (1) {
682 $md5 =
683 join "\x00",
684 $processversion,
685 map {
686 cf::cede_to_tick;
687 ($src->[$_], Digest::MD5::md5_hex $data[$_])
688 } 0.. $#$src;
689
690
691 my $dbmd5 = db_get cache => "$id/md5";
692 if ($dbmd5 eq $md5) {
693 db_put cache => "$id/meta", $meta;
694
695 return db_get cache => "$id/data";
696 }
697 }
698
699 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time;
702
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
704
705 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta;
708
709 return $data;
710 }
711
712 db_get cache => "$id/data"
431} 713}
432 714
433=item cf::datalog type => key => value, ... 715=item cf::datalog type => key => value, ...
434 716
435Log a datalog packet of the given type with the given key-value pairs. 717Log a datalog packet of the given type with the given key-value pairs.
… …
447 729
448############################################################################# 730#############################################################################
449 731
450=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
451 733
452Many objects in crossfire are so-called attachable objects. That means you can 734Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
455 737
456In the following description, CLASS can be any of C<global>, C<object> 738In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 739C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 740Deliantra).
459 741
460=over 4 742=over 4
461 743
462=item $attachable->attach ($attachment, key => $value...) 744=item $attachable->attach ($attachment, key => $value...)
463 745
… …
507=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
508 790
509Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
511 793
512Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 795that are attached at load/instantiate time, thus the need for a name.
514 796
515These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
516 798
517=over 4 799=over 4
… …
665 _attach $registry, $klass, @attach; 947 _attach $registry, $klass, @attach;
666 } 948 }
667 949
668 $obj->{$name} = \%arg; 950 $obj->{$name} = \%arg;
669 } else { 951 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 952 warn "object uses attachment '$name' which is not available, postponing.\n";
671 } 953 }
672 954
673 $obj->{_attachment}{$name} = undef; 955 $obj->{_attachment}{$name} = undef;
674} 956}
675 957
… …
715 "; 997 ";
716 die if $@; 998 die if $@;
717} 999}
718 1000
719our $override; 1001our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1002our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1003
722sub override { 1004sub override {
723 $override = 1; 1005 $override = 1;
724 @invoke_results = (); 1006 @INVOKE_RESULTS = (@_);
725} 1007}
726 1008
727sub do_invoke { 1009sub do_invoke {
728 my $event = shift; 1010 my $event = shift;
729 my $callbacks = shift; 1011 my $callbacks = shift;
730 1012
731 @invoke_results = (); 1013 @INVOKE_RESULTS = ();
732 1014
733 local $override; 1015 local $override;
734 1016
735 for (@$callbacks) { 1017 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1018 eval { &{$_->[1]} };
… …
745 } 1027 }
746 1028
747 0 1029 0
748} 1030}
749 1031
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1033
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1035
754Generate an object-specific event with the given arguments. 1036Generate an object-specific event with the given arguments.
755 1037
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1038This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1039removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1040results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1041
760=back 1042=back
761 1043
762=cut 1044=cut
763 1045
764############################################################################# 1046#############################################################################
765# object support 1047# object support
1048
1049sub _object_equal($$);
1050sub _object_equal($$) {
1051 my ($a, $b) = @_;
1052
1053 return 0 unless (ref $a) eq (ref $b);
1054
1055 if ("HASH" eq ref $a) {
1056 my @ka = keys %$a;
1057 my @kb = keys %$b;
1058
1059 return 0 if @ka != @kb;
1060
1061 for (0 .. $#ka) {
1062 return 0 unless $ka[$_] eq $kb[$_];
1063 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1064 }
1065
1066 } elsif ("ARRAY" eq ref $a) {
1067
1068 return 0 if @$a != @$b;
1069
1070 for (0 .. $#$a) {
1071 return 0 unless _object_equal $a->[$_], $b->[$_];
1072 }
1073
1074 } elsif ($a ne $b) {
1075 return 0;
1076 }
1077
1078 1
1079}
1080
1081our $SLOW_MERGES;#d#
1082sub _can_merge {
1083 my ($ob1, $ob2) = @_;
1084
1085 ++$SLOW_MERGES;#d#
1086
1087 # we do the slow way here
1088 return _object_equal $ob1, $ob2
1089}
766 1090
767sub reattach { 1091sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1093 my ($obj) = @_;
770 1094
1095 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1096 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1097
773 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
774 1099
775 @$registry = (); 1100 @$registry = ();
776 1101
… …
791cf::attachable->attach ( 1116cf::attachable->attach (
792 prio => -1000000, 1117 prio => -1000000,
793 on_instantiate => sub { 1118 on_instantiate => sub {
794 my ($obj, $data) = @_; 1119 my ($obj, $data) = @_;
795 1120
796 $data = from_json $data; 1121 $data = decode_json $data;
797 1122
798 for (@$data) { 1123 for (@$data) {
799 my ($name, $args) = @$_; 1124 my ($name, $args) = @$_;
800 1125
801 $obj->attach ($name, %{$args || {} }); 1126 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1142sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1143 my ($filename, $rdata, $objs) = @_;
819 1144
820 sync_job { 1145 sync_job {
821 if (length $$rdata) { 1146 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
824 1150
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
829 close $fh; 1155 aio_close $fh;
830 1156
831 if (@$objs) { 1157 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
837 close $fh; 1163 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
839 } 1165 }
840 } else { 1166 } else {
841 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
842 } 1168 }
843 1169
844 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1174 } else {
846 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
847 } 1176 }
848 } else { 1177 } else {
849 aio_unlink $filename; 1178 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
851 } 1180 }
852 } 1181 };
853} 1182}
854 1183
855sub object_freezer_as_string { 1184sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1185 my ($rdata, $objs) = @_;
857 1186
… …
869 or return; 1198 or return;
870 1199
871 unless (aio_stat "$filename.pst") { 1200 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1201 (aio_load "$filename.pst", $av) >= 0
873 or return; 1202 or return;
1203
874 $av = eval { (Storable::thaw $av)->{objs} }; 1204 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs};
875 } 1206 }
876 1207
1208 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1209 warn sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1210 $decname, length $data, scalar @{$av || []};
1211
879 return ($data, $av); 1212 ($data, $av)
880} 1213}
1214
1215=head2 COMMAND CALLBACKS
1216
1217=over 4
1218
1219=cut
881 1220
882############################################################################# 1221#############################################################################
883# command handling &c 1222# command handling &c
884 1223
885=item cf::register_command $name => \&callback($ob,$args); 1224=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1237 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1238}
900 1239
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1240=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1241
903Register a callbackf ro execution when the client sends an extcmd packet. 1242Register a callback for execution when the client sends an (synchronous)
1243extcmd packet. Ext commands will be processed in the order they are
1244received by the server, like other user commands. The first argument is
1245the logged-in player. Ext commands can only be processed after a player
1246has logged in successfully.
904 1247
905If the callback returns something, it is sent back as if reply was being 1248If the callback returns something, it is sent back as if reply was being
906called. 1249called.
907 1250
1251=item cf::register_exticmd $name => \&callback($ns,$packet);
1252
1253Register a callback for execution when the client sends an (asynchronous)
1254exticmd packet. Exti commands are processed by the server as soon as they
1255are received, i.e. out of order w.r.t. other commands. The first argument
1256is a client socket. Exti commands can be received anytime, even before
1257log-in.
1258
1259If the callback returns something, it is sent back as if reply was being
1260called.
1261
908=cut 1262=cut
909 1263
910sub register_extcmd { 1264sub register_extcmd {
911 my ($name, $cb) = @_; 1265 my ($name, $cb) = @_;
912 1266
913 $EXTCMD{$name} = $cb; 1267 $EXTCMD{$name} = $cb;
914} 1268}
1269
1270sub register_exticmd {
1271 my ($name, $cb) = @_;
1272
1273 $EXTICMD{$name} = $cb;
1274}
1275
1276use File::Glob ();
915 1277
916cf::player->attach ( 1278cf::player->attach (
917 on_command => sub { 1279 on_command => sub {
918 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
919 1281
… …
927 cf::override; 1289 cf::override;
928 }, 1290 },
929 on_extcmd => sub { 1291 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1292 my ($pl, $buf) = @_;
931 1293
932 my $msg = eval { from_json $buf }; 1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1295
934 if (ref $msg) { 1296 if (ref $msg) {
1297 my ($type, $reply, @payload) =
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301
1302 my @reply;
1303
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1304 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1305 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1306 }
1307
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
940 } else { 1311 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1313 }
943 1314
944 cf::override; 1315 cf::override;
945 }, 1316 },
946); 1317);
1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
947 1331
948sub load_extensions { 1332sub load_extensions {
949 cf::sync_job { 1333 cf::sync_job {
950 my %todo; 1334 my %todo;
951 1335
… …
971 1355
972 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1358
975 $ext{source} = 1359 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
977 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
978 . $source 1362 . $source
979 . "\n};\n1"; 1363 . "\n};\n1";
980 1364
981 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
… …
997 my $msg = $@ ? "$v->{path}: $@\n" 1381 my $msg = $@ ? "$v->{path}: $@\n"
998 : "$v->{base}: extension inactive.\n"; 1382 : "$v->{base}: extension inactive.\n";
999 1383
1000 if (exists $v->{meta}{mandatory}) { 1384 if (exists $v->{meta}{mandatory}) {
1001 warn $msg; 1385 warn $msg;
1002 warn "mandatory extension failed to load, exiting.\n"; 1386 cf::cleanup "mandatory extension failed to load, exiting.";
1003 exit 1;
1004 } 1387 }
1005 1388
1006 warn $msg; 1389 warn $msg;
1007 } 1390 }
1008 1391
… …
1018 }; 1401 };
1019} 1402}
1020 1403
1021############################################################################# 1404#############################################################################
1022 1405
1406=back
1407
1023=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1024 1409
1025Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1026 1411
1027=cut 1412=cut
1028 1413
1029package cf::player; 1414package cf::player;
1030 1415
1031use Coro::AIO; 1416use Coro::AIO;
1032 1417
1033=head3 cf::player 1418=head3 cf::player
1034 1419
1035=over 4 1420=over 4
1421
1422=item cf::player::num_playing
1423
1424Returns the official number of playing players, as per the Crossfire metaserver rules.
1425
1426=cut
1427
1428sub num_playing {
1429 scalar grep
1430 $_->ob->map
1431 && !$_->hidden
1432 && !$_->ob->flag (cf::FLAG_WIZ),
1433 cf::player::list
1434}
1036 1435
1037=item cf::player::find $login 1436=item cf::player::find $login
1038 1437
1039Returns the given player object, loading it if necessary (might block). 1438Returns the given player object, loading it if necessary (might block).
1040 1439
… …
1059 1458
1060sub exists($) { 1459sub exists($) {
1061 my ($login) = @_; 1460 my ($login) = @_;
1062 1461
1063 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1064 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1065} 1464}
1066 1465
1067sub find($) { 1466sub find($) {
1068 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1069 my $login = $_[0]; 1468 my $login = $_[0];
… …
1076 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1475 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1077 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1476 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1078 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1477 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1079 aio_unlink +(playerdir $login) . "/$login.pl"; 1478 aio_unlink +(playerdir $login) . "/$login.pl";
1080 1479
1081 my $pl = load_pl path $login 1480 my $f = new_from_file cf::object::thawer path $login
1082 or return; 1481 or return;
1482
1483 my $pl = cf::player::load_pl $f
1484 or return;
1485
1486 local $cf::PLAYER_LOADING{$login} = $pl;
1487 $f->resolve_delayed_derefs;
1083 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1084 } 1489 }
1085 } 1490 }
1086} 1491}
1087 1492
… …
1096 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1097 1502
1098 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1099 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1100 1505
1506 cf::get_slot 0.01;
1507
1101 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1102 Coro::cede; 1509 cf::cede_to_tick;
1103} 1510}
1104 1511
1105sub new($) { 1512sub new($) {
1106 my ($login) = @_; 1513 my ($login) = @_;
1107 1514
… …
1113 $cf::PLAYER{$login} = $self; 1520 $cf::PLAYER{$login} = $self;
1114 1521
1115 $self 1522 $self
1116} 1523}
1117 1524
1525=item $player->send_msg ($channel, $msg, $color, [extra...])
1526
1527=cut
1528
1529sub send_msg {
1530 my $ns = shift->ns
1531 or return;
1532 $ns->send_msg (@_);
1533}
1534
1118=item $pl->quit_character 1535=item $pl->quit_character
1119 1536
1120Nukes the player without looking back. If logged in, the connection will 1537Nukes the player without looking back. If logged in, the connection will
1121be destroyed. May block for a long time. 1538be destroyed. May block for a long time.
1122 1539
… …
1126 my ($pl) = @_; 1543 my ($pl) = @_;
1127 1544
1128 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1129 1546
1130 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1131 $pl->password ("*"); # this should lock out the player until we nuked the dir 1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1132 1549
1133 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1134 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1135 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1136 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1137 1556
1138 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1139 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1175 or return []; 1594 or return [];
1176 1595
1177 my @logins; 1596 my @logins;
1178 1597
1179 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1599 my $path = path $login;
1600
1601 # a .pst is a dead give-away for a valid player
1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1180 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1181 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1182 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1607 }
1183 1608
1184 utf8::decode $login; 1609 utf8::decode $login;
1185 push @logins, $login; 1610 push @logins, $login;
1186 } 1611 }
1187 1612
… …
1214 } 1639 }
1215 1640
1216 \@paths 1641 \@paths
1217} 1642}
1218 1643
1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1645
1646Expand deliantra pod fragments into protocol xml.
1647
1219=item $player->ext_reply ($msgid, %msg) 1648=item $player->ext_reply ($msgid, @msg)
1220 1649
1221Sends an ext reply to the player. 1650Sends an ext reply to the player.
1222 1651
1223=cut 1652=cut
1224 1653
1225sub ext_reply($$%) { 1654sub ext_reply($$@) {
1226 my ($self, $id, %msg) = @_; 1655 my ($self, $id, @msg) = @_;
1227 1656
1228 $msg{msgid} = $id; 1657 $self->ns->ext_reply ($id, @msg)
1229
1230 $self->send ("ext " . cf::to_json \%msg);
1231} 1658}
1232 1659
1233=item $player->ext_event ($type, %msg) 1660=item $player->ext_msg ($type, @msg)
1234 1661
1235Sends an ext event to the client. 1662Sends an ext event to the client.
1236 1663
1237=cut 1664=cut
1238 1665
1239sub ext_event($$%) { 1666sub ext_msg($$@) {
1240 my ($self, $type, %msg) = @_; 1667 my ($self, $type, @msg) = @_;
1241 1668
1242 $self->ns->ext_event ($type, %msg); 1669 $self->ns->ext_msg ($type, @msg);
1243} 1670}
1244 1671
1245=head3 cf::region 1672=head3 cf::region
1246 1673
1247=over 4 1674=over 4
… …
1250 1677
1251package cf::region; 1678package cf::region;
1252 1679
1253=item cf::region::find_by_path $path 1680=item cf::region::find_by_path $path
1254 1681
1255Tries to decuce the probable region for a map knowing only its path. 1682Tries to decuce the likely region for a map knowing only its path.
1256 1683
1257=cut 1684=cut
1258 1685
1259sub find_by_path($) { 1686sub find_by_path($) {
1260 my ($path) = @_; 1687 my ($path) = @_;
1261 1688
1262 my ($match, $specificity); 1689 my ($match, $specificity);
1263 1690
1264 for my $region (list) { 1691 for my $region (list) {
1265 if ($region->match && $path =~ $region->match) { 1692 if ($region->{match} && $path =~ $region->{match}) {
1266 ($match, $specificity) = ($region, $region->specificity) 1693 ($match, $specificity) = ($region, $region->specificity)
1267 if $region->specificity > $specificity; 1694 if $region->specificity > $specificity;
1268 } 1695 }
1269 } 1696 }
1270 1697
… …
1291our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1292our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1293 1720
1294sub generate_random_map { 1721sub generate_random_map {
1295 my ($self, $rmp) = @_; 1722 my ($self, $rmp) = @_;
1723
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725
1296 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1297 $self->_create_random_map ( 1727 $self->_create_random_map (
1298 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1299 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1300 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1390 $self->init; # pass $1 etc. 1820 $self->init; # pass $1 etc.
1391 return $self; 1821 return $self;
1392 } 1822 }
1393 } 1823 }
1394 1824
1395 Carp::carp "unable to resolve path '$path' (base '$base')."; 1825 Carp::cluck "unable to resolve path '$path' (base '$base').";
1396 () 1826 ()
1397} 1827}
1398 1828
1399sub init { 1829sub init {
1400 my ($self) = @_; 1830 my ($self) = @_;
… …
1422 1852
1423# the temporary/swap location 1853# the temporary/swap location
1424sub save_path { 1854sub save_path {
1425 my ($self) = @_; 1855 my ($self) = @_;
1426 1856
1427 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1428 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1429} 1859}
1430 1860
1431# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1432sub uniq_path { 1862sub uniq_path {
1433 my ($self) = @_; 1863 my ($self) = @_;
1434 1864
1435 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1436 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1437}
1438
1439# and all this just because we cannot iterate over
1440# all maps in C++...
1441sub change_all_map_light {
1442 my ($change) = @_;
1443
1444 $_->change_map_light ($change)
1445 for grep $_->outdoor, values %cf::MAP;
1446} 1867}
1447 1868
1448sub decay_objects { 1869sub decay_objects {
1449 my ($self) = @_; 1870 my ($self) = @_;
1450 1871
… …
1463 1884
1464sub load_header_from($) { 1885sub load_header_from($) {
1465 my ($self, $path) = @_; 1886 my ($self, $path) = @_;
1466 1887
1467 utf8::encode $path; 1888 utf8::encode $path;
1468 #aio_open $path, O_RDONLY, 0 1889 my $f = new_from_file cf::object::thawer $path
1469 # or return;
1470
1471 $self->_load_header ($path)
1472 or return; 1890 or return;
1891
1892 $self->_load_header ($f)
1893 or return;
1894
1895 local $MAP_LOADING{$self->{path}} = $self;
1896 $f->resolve_delayed_derefs;
1473 1897
1474 $self->{load_path} = $path; 1898 $self->{load_path} = $path;
1475 1899
1476 1 1900 1
1477} 1901}
… …
1531sub find { 1955sub find {
1532 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1533 1957
1534 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1535 1959
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1536 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1537 1962
1538 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1539 my $guard = cf::lock_acquire "map_find:$path";
1540 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
1541 or return; 1965 or return;
1542 1966
1543 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1544 1968
… …
1546 or return; 1970 or return;
1547 1971
1548 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1549 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
1550 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
1976 undef $guard1;
1551 $map->reset; 1977 $map->reset;
1552 undef $guard;
1553 return find $path; 1978 return find $path;
1554 } 1979 }
1555 1980
1556 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
1557 } 1982 }
… …
1566 local $self->{deny_reset} = 1; # loading can take a long time 1991 local $self->{deny_reset} = 1; # loading can take a long time
1567 1992
1568 my $path = $self->{path}; 1993 my $path = $self->{path};
1569 1994
1570 { 1995 {
1571 my $guard = cf::lock_acquire "map_load:$path"; 1996 my $guard = cf::lock_acquire "map_data:$path";
1572 1997
1998 return unless $self->valid;
1573 return if $self->in_memory != cf::MAP_SWAPPED; 1999 return unless $self->in_memory == cf::MAP_SWAPPED;
1574 2000
1575 $self->in_memory (cf::MAP_LOADING); 2001 $self->in_memory (cf::MAP_LOADING);
1576 2002
1577 $self->alloc; 2003 $self->alloc;
1578 2004
1579 $self->pre_load; 2005 $self->pre_load;
1580 Coro::cede; 2006 cf::cede_to_tick;
1581 2007
2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block;
1582 $self->_load_objects ($self->{load_path}, 1) 2010 $self->_load_objects ($f)
1583 or return; 2011 or return;
1584 2012
1585 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
1586 if delete $self->{load_original}; 2014 if delete $self->{load_original};
1587 2015
1588 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
1589 utf8::encode $uniq; 2017 utf8::encode $uniq;
1590 if (aio_open $uniq, O_RDONLY, 0) { 2018 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) {
1591 $self->clear_unique_items; 2020 $self->clear_unique_items;
1592 $self->_load_objects ($uniq, 0); 2021 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs;
2023 }
1593 } 2024 }
1594 } 2025 }
1595 2026
1596 Coro::cede; 2027 $f->resolve_delayed_derefs;
2028
2029 cf::cede_to_tick;
1597 # now do the right thing for maps 2030 # now do the right thing for maps
1598 $self->link_multipart_objects; 2031 $self->link_multipart_objects;
1599 $self->difficulty ($self->estimate_difficulty) 2032 $self->difficulty ($self->estimate_difficulty)
1600 unless $self->difficulty; 2033 unless $self->difficulty;
1601 Coro::cede; 2034 cf::cede_to_tick;
1602 2035
1603 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
1604 $self->decay_objects; 2037 $self->decay_objects;
1605 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
1606 $self->update_buttons; 2039 $self->update_buttons;
1607 Coro::cede; 2040 cf::cede_to_tick;
1608 $self->set_darkness_map;
1609 Coro::cede;
1610 $self->activate; 2041 $self->activate;
1611 } 2042 }
1612 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1613 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1614 } 2048 }
1615 2049
1616 $self->post_load; 2050 $self->post_load;
1617} 2051}
1618 2052
… …
1627 2061
1628 $self 2062 $self
1629} 2063}
1630 2064
1631# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1632sub load_diag { 2066sub load_neighbours {
1633 my ($map) = @_; 2067 my ($map) = @_;
1634 2068
1635 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1636 2070
1637 for (0 .. 3) { 2071 for (0 .. 3) {
1638 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1639 or next; 2073 or next;
1640 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1641 or next; 2075 or next;
1642 $neigh->load; 2076 $neigh->load;
1643 2077
2078 push @neigh,
1644 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1645 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1646 } 2081 }
1647 2082
1648 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1649 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1650 or next; 2086 or next;
1651 $neigh->load; 2087 $neigh->load;
1652 } 2088 }
1653} 2089}
1654 2090
… …
1659} 2095}
1660 2096
1661sub do_load_sync { 2097sub do_load_sync {
1662 my ($map) = @_; 2098 my ($map) = @_;
1663 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1664 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1665} 2104}
1666 2105
1667our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1668our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1669 2108
1670sub find_async { 2109sub find_async {
1671 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1672 2111
1673 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1674 2113
1675 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1676 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1677 } 2116 }
1678 2117
1679 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1680 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1681 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1682 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1683 my $map = find $path 2125 if (my $map = find $k) {
1684 or next;
1685 $map->load; 2126 $map->load if $v;
2127 }
1686 2128
1687 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1688 } 2130 }
1689 } 2131 }
1690 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1691 }; 2133 };
1692 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
1695} 2137}
1696 2138
1697sub save { 2139sub save {
1698 my ($self) = @_; 2140 my ($self) = @_;
1699 2141
1700 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1701 2143
1702 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1703 2145
1704 return unless $self->dirty; 2146 return unless $self->dirty;
1705 2147
… …
1711 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1712 2154
1713 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1714 2156
1715 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1716 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1717 }; 2160 };
2161
2162 cf::get_slot 0.02;
1718 2163
1719 if ($uniq) { 2164 if ($uniq) {
1720 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1721 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1722 } else { 2167 } else {
… …
1728 my ($self) = @_; 2173 my ($self) = @_;
1729 2174
1730 # save first because save cedes 2175 # save first because save cedes
1731 $self->save; 2176 $self->save;
1732 2177
1733 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1734 2179
1735 return if $self->players; 2180 return if $self->players;
1736 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1737 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1738 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1739 $self->clear; 2188 $self->clear;
1740 $self->in_memory (cf::MAP_SWAPPED);
1741} 2189}
1742 2190
1743sub reset_at { 2191sub reset_at {
1744 my ($self) = @_; 2192 my ($self) = @_;
1745 2193
… …
1777 if $uniq; 2225 if $uniq;
1778 } 2226 }
1779 2227
1780 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
1781 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
1782 $self->clear; 2232 $self->clear;
1783
1784 $_->clear_links_to ($self) for values %cf::MAP;
1785 2233
1786 $self->unlink_save; 2234 $self->unlink_save;
1787 $self->destroy; 2235 $self->destroy;
1788} 2236}
1789 2237
1790my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
1791 2239
1792sub nuke { 2240sub nuke {
1793 my ($self) = @_; 2241 my ($self) = @_;
1794 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
1795 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1796 2247
1797 $self->unlink_save; 2248 $self->unlink_save;
1798 2249
1799 bless $self, "cf::map"; 2250 bless $self, "cf::map";
1800 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
1801 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
1802 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
1803 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1804 2255
1805 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
1806 2258
1807 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
1808} 2260}
1809 2261
1810=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
… …
1852 2304
1853sub unique_maps() { 2305sub unique_maps() {
1854 [ 2306 [
1855 map { 2307 map {
1856 utf8::decode $_; 2308 utf8::decode $_;
1857 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
1858 ? normalise $_ 2312 : normalise $_
1859 : ()
1860 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
1861 ] 2314 ]
1862} 2315}
1863 2316
1864package cf;
1865
1866=back 2317=back
1867 2318
1868=head3 cf::object 2319=head3 cf::object
1869 2320
1870=cut 2321=cut
… …
1873 2324
1874=over 4 2325=over 4
1875 2326
1876=item $ob->inv_recursive 2327=item $ob->inv_recursive
1877 2328
1878Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
1879 2331
1880=cut 2332=cut
1881 2333
1882sub inv_recursive_; 2334sub inv_recursive_;
1883sub inv_recursive_ { 2335sub inv_recursive_ {
… …
1886 2338
1887sub inv_recursive { 2339sub inv_recursive {
1888 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
1889} 2341}
1890 2342
2343=item $ref = $ob->ref
2344
2345Creates and returns a persistent reference to an object that can be stored as a string.
2346
2347=item $ob = cf::object::deref ($refstring)
2348
2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2350even if the object actually exists. May block.
2351
2352=cut
2353
2354sub deref {
2355 my ($ref) = @_;
2356
2357 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2358 my ($uuid, $name) = ($1, $2);
2359 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2360 or return;
2361 $pl->ob->uuid eq $uuid
2362 or return;
2363
2364 $pl->ob
2365 } else {
2366 warn "$ref: cannot resolve object reference\n";
2367 undef
2368 }
2369}
2370
1891package cf; 2371package cf;
1892 2372
1893=back 2373=back
1894 2374
1895=head3 cf::object::player 2375=head3 cf::object::player
… …
1901Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2381Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1902can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
1903dialogue with the given NPC character. 2383dialogue with the given NPC character.
1904 2384
1905=cut 2385=cut
2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
1906 2400
1907# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
1908# with dialog boxes. 2402# with dialog boxes.
1909#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
1910sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
… …
1912 2406
1913 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2407 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1914 2408
1915 if ($self->{record_replies}) { 2409 if ($self->{record_replies}) {
1916 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2410 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2411
1917 } else { 2412 } else {
2413 my $pl = $self->contr;
2414
2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2416 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418
2419 } else {
1918 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
1919 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 }
1920 } 2423 }
2424}
2425
2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2427
2428=cut
2429
2430sub cf::object::send_msg {
2431 my $pl = shift->contr
2432 or return;
2433 $pl->send_msg (@_);
1921} 2434}
1922 2435
1923=item $player_object->may ("access") 2436=item $player_object->may ("access")
1924 2437
1925Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
… …
1938 2451
1939=item $player_object->enter_link 2452=item $player_object->enter_link
1940 2453
1941Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
1942 2455
1943The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
1944I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
1945 2460
1946Will never block. 2461Will never block.
1947 2462
1948=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
1949 2464
… …
2004 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2005 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2006 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2007 2522
2008 $map->load; 2523 $map->load;
2009 $map->load_diag; 2524 $map->load_neighbours;
2010 2525
2011 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2012 $self->activate_recursive; 2528 $self->activate_recursive;
2013 2529
2014 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2015 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2016} 2532}
2017 2533
2018=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2019 2535
2020Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2021her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2022that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
2023the new (success) or old (failed) map position. 2539the new (success) or old (failed) map position. In either case, $done will
2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2024 2544
2025=cut 2545=cut
2026 2546
2027our $GOTOGEN; 2547our $GOTOGEN;
2028 2548
2029sub cf::object::player::goto { 2549sub cf::object::player::goto {
2030 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
2031 2551
2032 # do generation counting so two concurrent goto's will be executed in-order 2552 # do generation counting so two concurrent goto's will be executed in-order
2033 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2034 2554
2035 $self->enter_link; 2555 $self->enter_link;
2036 2556
2037 (async { 2557 (async {
2558 $Coro::current->{desc} = "player::goto $path $x $y";
2559
2560 # *tag paths override both path and x|y
2561 if ($path =~ /^\*(.*)$/) {
2562 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2563 my $ob = $obs[rand @obs];
2564
2565 # see if we actually can go there
2566 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2567 $ob = $obs[rand @obs];
2568 } else {
2569 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2570 }
2571 # else put us there anyways for now #d#
2572
2573 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2574 } else {
2575 ($path, $x, $y) = (undef, undef, undef);
2576 }
2577 }
2578
2038 my $map = eval { 2579 my $map = eval {
2039 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2040 2581
2041 if ($map) { 2582 if ($map) {
2042 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2043 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2044 } else { 2585 } else {
2045 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2046 } 2587 }
2047 2588
2048 $map 2589 $map
2049 }; 2590 };
2050 2591
… …
2055 2596
2056 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
2057 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
2058 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
2059 } 2600 }
2601
2602 $done->() if $done;
2060 })->prio (1); 2603 })->prio (1);
2061} 2604}
2062 2605
2063=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
2064 2607
… …
2084} 2627}
2085 2628
2086sub prepare_random_map { 2629sub prepare_random_map {
2087 my ($exit) = @_; 2630 my ($exit) = @_;
2088 2631
2089 my $guard = cf::lock_acquire "exit_prepare:$exit";
2090
2091 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2092 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2093 # that depends on the exit object 2634 # that depends on the exit object
2094 2635
2095 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2097 if ($exit->map) { 2638 if ($exit->map) {
2098 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2099 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2100 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2101 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2102 } 2645 }
2103 2646
2104 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2105 2648
2106 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2107 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2108 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2109 2652
2110 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2111 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2112 undef $fh; 2655 undef $fh;
2113 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2114 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2115 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2116 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2117 } 2664 }
2118} 2665}
2119 2666
2120sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2121 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2122 2669
2123 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2124 2671
2125 if ($exit->slaying eq "/!") {
2126 #TODO: this should de-fi-ni-te-ly not be a sync-job
2127 # the problem is that $exit might not survive long enough
2128 # so it needs to be done right now, right here
2129 cf::sync_job { prepare_random_map $exit };
2130 }
2131
2132 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2133 my $hp = $exit->stats->hp;
2134 my $sp = $exit->stats->sp;
2135
2136 $self->enter_link; 2672 $self->enter_link;
2137 2673
2138 (async { 2674 (async {
2139 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2140 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2141 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2142 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2143 1; 2698 1
2144 }) { 2699 }) {
2145 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2146 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2147 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2148 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2149 2704
2150 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2169 2724
2170 utf8::encode $text; 2725 utf8::encode $text;
2171 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2172} 2727}
2173 2728
2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2730
2731Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress
2734the message unless the client supports the msg packet.
2735
2736=cut
2737
2738# non-persistent channels (usually the info channel)
2739our %CHANNEL = (
2740 "c/identify" => {
2741 id => "infobox",
2742 title => "Identify",
2743 reply => undef,
2744 tooltip => "Items recently identified",
2745 },
2746 "c/examine" => {
2747 id => "infobox",
2748 title => "Examine",
2749 reply => undef,
2750 tooltip => "Signs and other items you examined",
2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2800 "c/uptime" => {
2801 id => "infobox",
2802 title => "Uptime",
2803 reply => undef,
2804 tooltip => "How long the server has been running since last restart",
2805 },
2806 "c/mapinfo" => {
2807 id => "infobox",
2808 title => "Map Info",
2809 reply => undef,
2810 tooltip => "Information related to the maps",
2811 },
2812 "c/party" => {
2813 id => "party",
2814 title => "Party",
2815 reply => "gsay ",
2816 tooltip => "Messages and chat related to your party",
2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2826);
2827
2828sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_;
2830
2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2833
2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2835
2836 # check predefined channels, for the benefit of C
2837 if ($CHANNEL{$channel}) {
2838 $channel = $CHANNEL{$channel};
2839
2840 $self->ext_msg (channel_info => $channel);
2841 $channel = $channel->{id};
2842
2843 } elsif (ref $channel) {
2844 # send meta info to client, if not yet sent
2845 unless (exists $self->{channel}{$channel->{id}}) {
2846 $self->{channel}{$channel->{id}} = $channel;
2847 $self->ext_msg (channel_info => $channel);
2848 }
2849
2850 $channel = $channel->{id};
2851 }
2852
2853 return unless @extra || length $msg;
2854
2855 # default colour, mask it out
2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2857 if $color & cf::NDI_DEF;
2858
2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 );
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2875}
2876
2174=item $client->ext_event ($type, %msg) 2877=item $client->ext_msg ($type, @msg)
2175 2878
2176Sends an exti event to the client. 2879Sends an ext event to the client.
2177 2880
2178=cut 2881=cut
2179 2882
2180sub cf::client::ext_event($$%) { 2883sub cf::client::ext_msg($$@) {
2181 my ($self, $type, %msg) = @_; 2884 my ($self, $type, @msg) = @_;
2182 2885
2886 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove
2183 $msg{msgtype} = "event_$type"; 2889 push @msg, msgtype => "event_$type";
2184 $self->send_packet ("ext " . cf::to_json \%msg); 2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 }
2892}
2893
2894=item $client->ext_reply ($msgid, @msg)
2895
2896Sends an ext reply to the client.
2897
2898=cut
2899
2900sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_;
2902
2903 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 }
2185} 2910}
2186 2911
2187=item $success = $client->query ($flags, "text", \&cb) 2912=item $success = $client->query ($flags, "text", \&cb)
2188 2913
2189Queues a query to the client, calling the given callback with 2914Queues a query to the client, calling the given callback with
2190the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2915the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2191C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2916C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2192 2917
2193Queries can fail, so check the return code. Or don't, as queries will become 2918Queries can fail, so check the return code. Or don't, as queries will
2194reliable at some point in the future. 2919become reliable at some point in the future.
2195 2920
2196=cut 2921=cut
2197 2922
2198sub cf::client::query { 2923sub cf::client::query {
2199 my ($self, $flags, $text, $cb) = @_; 2924 my ($self, $flags, $text, $cb) = @_;
… …
2207 utf8::encode $text; 2932 utf8::encode $text;
2208 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2933 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2209 2934
2210 $self->send_packet ($self->{query_queue}[0][0]) 2935 $self->send_packet ($self->{query_queue}[0][0])
2211 if @{ $self->{query_queue} } == 1; 2936 if @{ $self->{query_queue} } == 1;
2937
2938 1
2212} 2939}
2213 2940
2214cf::client->attach ( 2941cf::client->attach (
2942 on_connect => sub {
2943 my ($ns) = @_;
2944
2945 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2946 },
2215 on_reply => sub { 2947 on_reply => sub {
2216 my ($ns, $msg) = @_; 2948 my ($ns, $msg) = @_;
2217 2949
2218 # this weird shuffling is so that direct followup queries 2950 # this weird shuffling is so that direct followup queries
2219 # get handled first 2951 # get handled first
… …
2231 } else { 2963 } else {
2232 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2964 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2233 } 2965 }
2234 } 2966 }
2235 }, 2967 },
2968 on_exticmd => sub {
2969 my ($ns, $buf) = @_;
2970
2971 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2972
2973 if (ref $msg) {
2974 my ($type, $reply, @payload) =
2975 "ARRAY" eq ref $msg
2976 ? @$msg
2977 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2978
2979 my @reply;
2980
2981 if (my $cb = $EXTICMD{$type}) {
2982 @reply = $cb->($ns, @payload);
2983 }
2984
2985 $ns->ext_reply ($reply, @reply)
2986 if $reply;
2987
2988 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 }
2991
2992 cf::override;
2993 },
2236); 2994);
2237 2995
2238=item $client->async (\&cb) 2996=item $client->async (\&cb)
2239 2997
2240Create a new coroutine, running the specified callback. The coroutine will 2998Create a new coroutine, running the specified callback. The coroutine will
… …
2281our $safe = new Safe "safe"; 3039our $safe = new Safe "safe";
2282our $safe_hole = new Safe::Hole; 3040our $safe_hole = new Safe::Hole;
2283 3041
2284$SIG{FPE} = 'IGNORE'; 3042$SIG{FPE} = 'IGNORE';
2285 3043
2286$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3044$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math
3046 grepstart grepwhile mapstart mapwhile
3047 sort time
3048));
2287 3049
2288# here we export the classes and methods available to script code 3050# here we export the classes and methods available to script code
2289 3051
2290=pod 3052=pod
2291 3053
2292The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
2293 3055
2294 cf::object contr pay_amount pay_player map 3056 cf::object
3057 contr pay_amount pay_player map x y force_find force_add destroy
3058 insert remove name archname title slaying race decrease split
3059 value
3060
2295 cf::object::player player 3061 cf::object::player
2296 cf::player peaceful 3062 player
2297 cf::map trigger 3063
3064 cf::player
3065 peaceful
3066
3067 cf::map
3068 trigger
2298 3069
2299=cut 3070=cut
2300 3071
2301for ( 3072for (
2302 ["cf::object" => qw(contr pay_amount pay_player map)], 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3074 insert remove inv nrof name archname title slaying race
3075 decrease split destroy change_exp value msg lore send_msg)],
2303 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
2304 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
2305 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
2306) { 3079) {
2307 no strict 'refs'; 3080 no strict 'refs';
2308 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
2309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2326 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
2327 3100
2328 my $qcode = $code; 3101 my $qcode = $code;
2329 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2330 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
2331 3106
2332 local $_; 3107 local $_;
2333 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
2334 3109
2335 my $eval = 3110 my $eval =
… …
2378=back 3153=back
2379 3154
2380=cut 3155=cut
2381 3156
2382############################################################################# 3157#############################################################################
2383
2384=head2 EXTENSION DATABASE SUPPORT
2385
2386Crossfire maintains a very simple database for extension use. It can
2387currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2388convert to/from binary).
2389
2390The parameter C<$family> should best start with the name of the extension
2391using it, it should be unique.
2392
2393=over 4
2394
2395=item $value = cf::db_get $family => $key
2396
2397Returns a single value from the database.
2398
2399=item cf::db_put $family => $key => $value
2400
2401Stores the given C<$value> in the family.
2402
2403=cut
2404
2405our $DB;
2406
2407sub db_init {
2408 unless ($DB) {
2409 $DB = BDB::db_create $DB_ENV;
2410
2411 cf::sync_job {
2412 eval {
2413 $DB->set_flags (BDB::CHKSUM);
2414
2415 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2416 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2417 cf::cleanup "db_open(db): $!" if $!;
2418 };
2419 cf::cleanup "db_open(db): $@" if $@;
2420 };
2421 }
2422}
2423
2424sub db_get($$) {
2425 my $key = "$_[0]/$_[1]";
2426
2427 cf::sync_job {
2428 BDB::db_get $DB, undef, $key, my $data;
2429
2430 $! ? ()
2431 : $data
2432 }
2433}
2434
2435sub db_put($$$) {
2436 BDB::dbreq_pri 4;
2437 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2438}
2439
2440=item cf::cache $id => [$paths...], $processversion => $process
2441
2442Generic caching function that returns the value of the resource $id,
2443caching and regenerating as required.
2444
2445This function can block.
2446
2447=cut
2448
2449sub cache {
2450 my ($id, $src, $processversion, $process) = @_;
2451
2452 my $meta =
2453 join "\x00",
2454 $processversion,
2455 map {
2456 aio_stat $_
2457 and Carp::croak "$_: $!";
2458
2459 ($_, (stat _)[7,9])
2460 } @$src;
2461
2462 my $dbmeta = db_get cache => "$id/meta";
2463 if ($dbmeta ne $meta) {
2464 # changed, we may need to process
2465
2466 my @data;
2467 my $md5;
2468
2469 for (0 .. $#$src) {
2470 0 <= aio_load $src->[$_], $data[$_]
2471 or Carp::croak "$src->[$_]: $!";
2472 }
2473
2474 # if processing is expensive, check
2475 # checksum first
2476 if (1) {
2477 $md5 =
2478 join "\x00",
2479 $processversion,
2480 map {
2481 Coro::cede;
2482 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2483 } 0.. $#$src;
2484
2485
2486 my $dbmd5 = db_get cache => "$id/md5";
2487 if ($dbmd5 eq $md5) {
2488 db_put cache => "$id/meta", $meta;
2489
2490 return db_get cache => "$id/data";
2491 }
2492 }
2493
2494 my $t1 = Time::HiRes::time;
2495 my $data = $process->(\@data);
2496 my $t2 = Time::HiRes::time;
2497
2498 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2499
2500 db_put cache => "$id/data", $data;
2501 db_put cache => "$id/md5" , $md5;
2502 db_put cache => "$id/meta", $meta;
2503
2504 return $data;
2505 }
2506
2507 db_get cache => "$id/data"
2508}
2509
2510=item fork_call { }, $args
2511
2512Executes the given code block with the given arguments in a seperate
2513process, returning the results. Everything must be serialisable with
2514Coro::Storable. May, of course, block. Note that the executed sub may
2515never block itself or use any form of Event handling.
2516
2517=cut
2518
2519sub fork_call(&@) {
2520 my ($cb, @args) = @_;
2521
2522# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2523# or die "socketpair: $!";
2524 pipe my $fh1, my $fh2
2525 or die "pipe: $!";
2526
2527 if (my $pid = fork) {
2528 close $fh2;
2529
2530 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2531 $res = Coro::Storable::thaw $res;
2532
2533 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2534
2535 die $$res unless "ARRAY" eq ref $res;
2536
2537 return wantarray ? @$res : $res->[-1];
2538 } else {
2539 reset_signals;
2540 local $SIG{__WARN__};
2541 local $SIG{__DIE__};
2542 eval {
2543 close $fh1;
2544
2545 my @res = eval { $cb->(@args) };
2546 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2547 };
2548
2549 warn $@ if $@;
2550 _exit 0;
2551 }
2552}
2553
2554#############################################################################
2555# the server's init and main functions 3158# the server's init and main functions
2556 3159
2557sub load_facedata($) { 3160sub load_facedata($) {
2558 my ($path) = @_; 3161 my ($path) = @_;
3162
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2559 3168
2560 warn "loading facedata from $path\n"; 3169 warn "loading facedata from $path\n";
2561 3170
2562 my $facedata; 3171 my $facedata;
2563 0 < aio_load $path, $facedata 3172 0 < aio_load $path, $facedata
… …
2566 $facedata = Coro::Storable::thaw $facedata; 3175 $facedata = Coro::Storable::thaw $facedata;
2567 3176
2568 $facedata->{version} == 2 3177 $facedata->{version} == 2
2569 or cf::cleanup "$path: version mismatch, cannot proceed."; 3178 or cf::cleanup "$path: version mismatch, cannot proceed.";
2570 3179
3180 # patch in the exptable
3181 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3184 };
3185 cf::cede_to_tick;
3186
2571 { 3187 {
2572 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
2573 3189
2574 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
2575 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
2576 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap};
2577 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2578 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2579 Coro::cede; 3197
3198 cf::cede_to_tick;
2580 } 3199 }
2581 3200
2582 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2583 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
2584 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
2585 or next; 3205 or next;
3206
2586 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth;
2587 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2588 } else { 3210 } else {
2589 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
2590 } 3212 }
2591 Coro::cede; 3213
3214 cf::cede_to_tick;
2592 } 3215 }
2593 } 3216 }
2594 3217
2595 { 3218 {
2596 my $anims = $facedata->{animinfo}; 3219 my $anims = $facedata->{animinfo};
2597 3220
2598 while (my ($anim, $info) = each %$anims) { 3221 while (my ($anim, $info) = each %$anims) {
2599 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3222 cf::anim::set $anim, $info->{frames}, $info->{facings};
2600 Coro::cede; 3223 cf::cede_to_tick;
2601 } 3224 }
2602 3225
2603 cf::anim::invalidate_all; # d'oh 3226 cf::anim::invalidate_all; # d'oh
2604 } 3227 }
2605 3228
3229 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource};
3233
3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238
3239 if ($info->{type} & 1) {
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type};
3254 } else {
3255 $RESOURCE{$name} = $info;
3256 }
3257
3258 cf::cede_to_tick;
3259 }
3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263
2606 1 3264 1
2607} 3265}
2608 3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286
3287register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_;
3289
3290 while (my ($k, $v) = each %$want) {
3291 $ns->fx_want ($k, $v);
3292 }
3293};
3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3304
2609sub reload_regions { 3305sub reload_regions {
3306 # HACK to clear player env face cache, we need some signal framework
3307 # for this (global event?)
3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3309
2610 load_resource_file "$MAPDIR/regions" 3310 load_resource_file "$MAPDIR/regions"
2611 or die "unable to load regions file\n"; 3311 or die "unable to load regions file\n";
3312
3313 for (cf::region::list) {
3314 $_->{match} = qr/$_->{match}/
3315 if exists $_->{match};
3316 }
2612} 3317}
2613 3318
2614sub reload_facedata { 3319sub reload_facedata {
2615 load_facedata "$DATADIR/facedata" 3320 load_facedata "$DATADIR/facedata"
2616 or die "unable to load facedata\n"; 3321 or die "unable to load facedata\n";
… …
2627} 3332}
2628 3333
2629sub reload_resources { 3334sub reload_resources {
2630 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
2631 3336
3337 reload_facedata;
3338 reload_archetypes;
2632 reload_regions; 3339 reload_regions;
2633 reload_facedata;
2634 #reload_archetypes;#d#
2635 reload_archetypes;
2636 reload_treasures; 3340 reload_treasures;
2637 3341
2638 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
2639} 3343}
2640 3344
2641sub init { 3345sub reload_config {
2642 reload_resources;
2643}
2644
2645sub cfg_load {
2646 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
2647 or return; 3347 or return;
2648 3348
2649 local $/; 3349 local $/;
2650 *CFG = YAML::Syck::Load <$fh>; 3350 *CFG = YAML::Load <$fh>;
2651 3351
2652 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2653 3353
2654 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2655 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2661 }; 3361 };
2662 warn $@ if $@; 3362 warn $@ if $@;
2663 } 3363 }
2664} 3364}
2665 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
2666sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
2667 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
2668 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
2669 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2670 (async { 3403 (async {
2671 Event::one_event; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3405 EV::loop EV::LOOP_ONESHOT;
2672 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
2673 }; 3407 };
2674 3408
2675 cfg_load; 3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3413 reload_config;
2676 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
2677 load_extensions; 3427 load_extensions;
2678 3428
2679 $TICK_WATCHER->start; 3429 utime time, time, $RUNTIMEFILE;
3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3436
2680 Event::loop; 3437 EV::loop;
2681} 3438}
2682 3439
2683############################################################################# 3440#############################################################################
2684# initialisation and cleanup 3441# initialisation and cleanup
2685 3442
2686# install some emergency cleanup handlers 3443# install some emergency cleanup handlers
2687BEGIN { 3444BEGIN {
3445 our %SIGWATCHER = ();
2688 for my $signal (qw(INT HUP TERM)) { 3446 for my $signal (qw(INT HUP TERM)) {
2689 Event->signal ( 3447 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2690 reentrant => 0,
2691 data => WF_AUTOCANCEL,
2692 signal => $signal,
2693 prio => 0,
2694 cb => sub {
2695 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
2696 },
2697 ); 3449 };
3450 }
3451}
3452
3453sub write_runtime_sync {
3454 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time.
3456
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458
3459 my $guard = cf::lock_acquire "write_runtime";
3460
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3462 or return;
3463
3464 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server.
3467
3468 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3469 and return;
3470
3471 # always fsync - this file is important
3472 aio_fsync $fh
3473 and return;
3474
3475 # touch it again to show we are up-to-date
3476 aio_utime $fh, undef, undef;
3477
3478 close $fh
3479 or return;
3480
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return;
3483
3484 warn "runtime file written.\n";
3485
2698 } 3486 1
3487}
3488
3489our $uuid_lock;
3490our $uuid_skip;
3491
3492sub write_uuid_sync($) {
3493 $uuid_skip ||= $_[0];
3494
3495 return if $uuid_lock;
3496 local $uuid_lock = 1;
3497
3498 my $uuid = "$LOCALDIR/uuid";
3499
3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3501 or return;
3502
3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
2699} 3537}
2700 3538
2701sub emergency_save() { 3539sub emergency_save() {
2702 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
2703 3541
2704 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
2705 3543
2706 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
2707 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
2708 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
2709 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
2710 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
2711 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
2712 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
2713 $pl->valid or next; 3556 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2714 $pl->save; 3558 $pl->save;
2715 } 3559 }
2716 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
2717 3561
2718 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
2719 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
2720 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
2721 $map->valid or next; 3565 $map->valid or next;
2722 $map->save; 3566 $map->save;
2723 } 3567 }
2724 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
2725 3569
2726 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
2727 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
2728 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3573
3574 warn "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n";
2729 }; 3577 };
2730 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
2731 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
2732} 3585}
2733 3586
2734sub post_cleanup { 3587sub post_cleanup {
2735 my ($make_core) = @_; 3588 my ($make_core) = @_;
2736 3589
2737 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
2738 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
2739} 3621}
2740 3622
2741sub do_reload_perl() { 3623sub do_reload_perl() {
2742 # can/must only be called in main 3624 # can/must only be called in main
2743 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
2744 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
2745 return; 3627 return;
2746 } 3628 }
2747 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
2748 warn "reloading..."; 3635 warn "reloading...";
2749 3636
2750 warn "entering sync_job"; 3637 warn "entering sync_job";
2751 3638
2752 cf::sync_job { 3639 cf::sync_job {
2753 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
2754 cf::emergency_save; 3641 cf::emergency_save;
2755 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
2756 3643
2757 warn "syncing database to disk"; 3644 warn "syncing database to disk";
2758 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
2759 3646
2760 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
2761 3648
2762 warn "cancelling all WF_AUTOCANCEL watchers";
2763 for (Event::all_watchers) {
2764 $_->cancel if $_->data & WF_AUTOCANCEL;
2765 }
2766
2767 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
2768 for (;;) {
2769 BDB::flush;
2770 IO::AIO::flush;
2771 Coro::cede;
2772 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
2773 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2774 }
2775
2776 ++$RELOAD;
2777
2778 warn "cancelling all extension coros";
2779 $_->cancel for values %EXT_CORO;
2780 %EXT_CORO = ();
2781
2782 warn "removing commands";
2783 %COMMAND = ();
2784
2785 warn "removing ext commands";
2786 %EXTCMD = ();
2787
2788 warn "unloading/nuking all extensions";
2789 for my $pkg (@EXTS) {
2790 warn "... unloading $pkg";
2791
2792 if (my $cb = $pkg->can ("unload")) {
2793 eval {
2794 $cb->($pkg);
2795 1
2796 } or warn "$pkg unloaded, but with errors: $@";
2797 } 3652 }
2798 3653
2799 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
2800 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
2801 } 3656 %EXT_CORO = ();
2802 3657
2803 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
2804 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
2805 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2806 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
2807 warn "... unloading $k"; 3667 warn "... unloading $pkg";
2808 delete $INC{$k};
2809 3668
2810 $k =~ s/\.pm$//;
2811 $k =~ s/\//::/g;
2812
2813 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
2814 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
2815 } 3678 }
2816 3679
2817 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
2818 } 3695 }
2819 3696
2820 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
2821 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
2822 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2823 3700
2824 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
2825 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
2826 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2827 3704
2828 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
2829 # and global variables created in xs 3706 # and global variables created in xs
2830 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
2831 3708
2832 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
2833 3710
2834 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
2835 require cf; 3712 require cf;
2836 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2837 3714
2838 warn "loading config and database again"; 3715 warn "loading config and database again";
2839 cf::cfg_load; 3716 cf::reload_config;
2840 3717
2841 warn "loading extensions"; 3718 warn "loading extensions";
2842 cf::load_extensions; 3719 cf::load_extensions;
2843 3720
3721 if ($REATTACH_ON_RELOAD) {
2844 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
2845 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
2846 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
2847 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
2848 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
2849 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
2850 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
2851 warn "leaving sync_job"; 3733 warn "leaving sync_job";
2852 3734
2853 1 3735 1
2854 } or do { 3736 } or do {
2855 warn $@; 3737 warn $@;
2856 warn "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
2857 exit 1;
2858 }; 3739 };
2859 3740
2860 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
2861}; 3747};
2862 3748
2863our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
2864 3750
2865sub reload_perl() { 3751sub reload_perl() {
2866 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
2867 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
2868 3754
2869 $RELOAD_WATCHER ||= Event->timer ( 3755 $RELOAD_WATCHER ||= cf::async {
2870 reentrant => 0, 3756 Coro::AIO::aio_wait cache_extensions;
2871 after => 0, 3757
2872 data => WF_AUTOCANCEL, 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2873 cb => sub {
2874 do_reload_perl; 3759 do_reload_perl;
2875 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
2876 }, 3761 };
2877 ); 3762 };
2878} 3763}
2879 3764
2880register_command "reload" => sub { 3765register_command "reload" => sub {
2881 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
2882 3767
2883 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
2884 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
2885 async { reload_perl }; 3772 reload_perl;
3773 };
2886 } 3774 }
2887}; 3775};
2888 3776
2889unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
2890 3778
… …
2892 3780
2893our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
2894our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
2895 3783
2896sub wait_for_tick { 3784sub wait_for_tick {
2897 return unless $TICK_WATCHER->is_active;
2898 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
2899 3786
2900 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
2901 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
2902 $signal->wait; 3789 $signal->wait;
2903} 3790}
2904 3791
2905sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
2906 return unless $TICK_WATCHER->is_active;
2907 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
2908 3794
2909 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
2910 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
2911 $signal->wait; 3797 $signal->wait;
2912} 3798}
2913 3799
2914 my $min = 1e6;#d# 3800sub tick {
2915 my $avg = 10;
2916$TICK_WATCHER = Event->timer (
2917 reentrant => 0,
2918 parked => 1,
2919 prio => 0,
2920 at => $NEXT_TICK || $TICK,
2921 data => WF_AUTOCANCEL,
2922 cb => sub {
2923 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
2924 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2925 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
2926 return; 3804 return;
2927 } 3805 }
2928 3806
2929 $NOW = $tick_start = Event::time;
2930
2931 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
2932 3808
2933 0 && sync_job {#d# 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2934 for(1..10) { 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2935 my $t = Event::time; 3811 Coro::async_pool {
2936 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3812 $Coro::current->{desc} = "runtime saver";
2937 or die; 3813 write_runtime_sync
2938 3814 or warn "ERROR: unable to write runtime file: $!";
2939 $map->width (50);
2940 $map->height (50);
2941 $map->alloc;
2942 $map->_load_objects ("/tmp/x.map", 1);
2943 my $t = Event::time - $t;
2944
2945 #next unless $t < 0.0013;#d#
2946 if ($t < $min) {
2947 $min = $t;
2948 }
2949 $avg = $avg * 0.99 + $t * 0.01;
2950 }
2951 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2952 exit 0;
2953 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2954 }; 3815 };
3816 }
2955 3817
2956 $RUNTIME += $TICK;
2957 $NEXT_TICK += $TICK;
2958
2959 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2960 $NEXT_RUNTIME_WRITE = $NOW + 10;
2961 Coro::async_pool {
2962 write_runtime
2963 or warn "ERROR: unable to write runtime file: $!";
2964 };
2965 }
2966
2967# my $AFTER = Event::time;
2968# warn $AFTER - $NOW;#d#
2969
2970 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2971 $sig->send; 3819 $sig->send;
2972 } 3820 }
2973 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
2974 $sig->send; 3822 $sig->send;
2975 } 3823 }
2976 3824
2977 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
2978
2979 # if we are delayed by four ticks or more, skip them all
2980 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2981
2982 $TICK_WATCHER->at ($NEXT_TICK);
2983 $TICK_WATCHER->start;
2984
2985 $LOAD = ($NOW - $tick_start) / $TICK;
2986 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2987 3827
2988 _post_tick; 3828 if (0) {
2989 3829 if ($NEXT_TICK) {
2990 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
2991 }, 3834 }
2992); 3835}
2993 3836
2994{ 3837{
2995 BDB::max_poll_time $TICK * 0.1; 3838 # configure BDB
2996 $BDB_POLL_WATCHER = Event->io ( 3839
2997 reentrant => 0,
2998 fd => BDB::poll_fileno,
2999 poll => 'r',
3000 prio => 0,
3001 data => WF_AUTOCANCEL,
3002 cb => \&BDB::poll_cb,
3003 );
3004 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3005 3841 BDB::max_poll_reqs $TICK * 0.1;
3006 BDB::set_sync_prepare { 3842 $AnyEvent::BDB::WATCHER->priority (1);
3007 my $status;
3008 my $current = $Coro::current;
3009 (
3010 sub {
3011 $status = $!;
3012 $current->ready; undef $current;
3013 },
3014 sub {
3015 Coro::schedule while defined $current;
3016 $! = $status;
3017 },
3018 )
3019 };
3020 3843
3021 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3022 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3023 3851
3024 cf::sync_job { 3852 cf::sync_job {
3025 eval { 3853 eval {
3026 BDB::db_env_open 3854 BDB::db_env_open
3027 $DB_ENV, 3855 $DB_ENV,
… …
3029 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3857 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3030 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3858 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3031 0666; 3859 0666;
3032 3860
3033 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3861 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3034
3035 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3036 $DB_ENV->set_lk_detect;
3037 }; 3862 };
3038 3863
3039 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3040 }; 3865 };
3041 } 3866 }
3867
3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3870 };
3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 };
3042} 3877}
3043 3878
3044{ 3879{
3880 # configure IO::AIO
3881
3045 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3046
3047 undef $Coro::AIO::WATCHER;
3048 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3049 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3050 reentrant => 0,
3051 data => WF_AUTOCANCEL,
3052 fd => IO::AIO::poll_fileno,
3053 poll => 'r',
3054 prio => 6,
3055 cb => \&IO::AIO::poll_cb,
3056 );
3057} 3885}
3058 3886
3059my $_log_backtrace; 3887my $_log_backtrace;
3060 3888
3061sub _log_backtrace { 3889sub _log_backtrace {
… …
3064 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3065 3893
3066 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3067 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3068 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3069 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3070 my @bt = fork_call { 3901 my @bt = fork_call {
3071 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3072 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3073 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3074 or die "addr2line: $!"; 3905 or die "addr2line: $!";
… …
3082 } 3913 }
3083 3914
3084 @funcs 3915 @funcs
3085 }; 3916 };
3086 3917
3087 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3088 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3089 --$_log_backtrace; 3921 --$_log_backtrace;
3090 }; 3922 };
3091 } else { 3923 } else {
3092 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3093 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3094 } 3926 }
3095} 3927}
3096 3928
3097# load additional modules 3929# load additional modules
3098use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3099 3931
3100END { cf::emergency_save } 3932END { cf::emergency_save }
3101 3933
31021 39341
3103 3935

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines