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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.500 by root, Sat Jan 16 00:08:33 2010 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 it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.61 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
53use Coro::Util ();
24 54
25use JSON::XS 1.4 (); 55use JSON::XS 2.01 ();
26use BDB (); 56use BDB ();
27use Data::Dumper; 57use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
34use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
35 66
36# configure various modules to our taste 67# configure various modules to our taste
37# 68#
38$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 77
42$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
43 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
85 124
86our %CFG; 125our %CFG;
87 126
88our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 128our $RUNTIME;
129our $NOW;
90 130
91our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
94 134
95# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 137
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
101 147
102binmode STDOUT; 148binmode STDOUT;
103binmode STDERR; 149binmode STDERR;
104 150
105# read virtual server time, if available 151# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
110} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
111 159
112mkdir $_ 160mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 162
115our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
116 164
117sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 177
119############################################################################# 178#############################################################################
120 179
121=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
122 181
158 217
159The raw value load value from the last tick. 218The raw value load value from the last tick.
160 219
161=item %cf::CFG 220=item %cf::CFG
162 221
163Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 223from wherever your confdir points to.
165 224
166=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
167 226
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 230
172=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
173 232
174This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 235that call.
177 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
178=back 243=back
179 244
180=cut 245=cut
181 246
182BEGIN { 247$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 248 my $msg = join "", @_;
185 249
186 $msg .= "\n" 250 $msg .= "\n"
187 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
188 252
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 254
191 utf8::encode $msg;
192 LOG llevError, $msg; 255 LOG llevError, $msg;
193 }; 256};
194} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
195 271
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 282for my $pkg (qw(
207 cf::global cf::attachable 283 cf::global cf::attachable
208 cf::object cf::object::player 284 cf::object cf::object::player
209 cf::client cf::player 285 cf::client cf::player
210 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
211 cf::map cf::party cf::region 288 cf::party cf::region
212)) { 289)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 291}
216 292
217$Event::DIED = sub { 293$EV::DIED = sub {
218 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
219}; 295};
220 296
221############################################################################# 297#############################################################################
222 298
223=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 322 $d
247 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
248} 324}
249 325
250=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
251 327
252Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
253 329
254=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
255 331
256Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
257 333
258=cut 334=cut
259 335
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 337
262sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
264 354
265=item cf::lock_wait $string 355=item cf::lock_wait $string
266 356
267Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
268 358
269=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
270 360
271Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
274returned. 364returned.
275 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
276Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
278 371
279=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
280 373
281Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
282 375
283=cut 376=cut
284 377
285our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
286 379
287sub lock_wait($) { 380sub lock_wait($) {
288 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 382}
296 383
297sub lock_acquire($) { 384sub lock_acquire($) {
298 my ($key) = @_; 385 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 386}
310 387
311sub lock_active($) { 388sub lock_active($) {
312 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 396}
322 }; 397
323 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
324 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
325} 411}
326 412
327=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
328 414
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 426our @SLOT_QUEUE;
341our $SLOT_QUEUE; 427our $SLOT_QUEUE;
342 428
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
345 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
346 434
347 while () { 435 while () {
348 next_job: 436 next_job:
349 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
357 } 445 }
358 } 446 }
359 } 447 }
360 448
361 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 452 $signal->wait;
365 } else { 453 } else {
366 Coro::schedule; 454 Coro::schedule;
367 } 455 }
368 } 456 }
369}; 457};
370 458
371sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
372 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
373 463
374 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
376 466
390 480
391BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
392 482
393=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
394 484
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 488acceptable.
399 489
400If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
406 496
407sub sync_job(&) { 497sub sync_job(&) {
408 my ($job) = @_; 498 my ($job) = @_;
409 499
410 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 501 my $time = EV::time;
412 502
413 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
415 505
416 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 507
418 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
419 509
420 my $busy = 1; 510 my $busy = 1;
421 my @res; 511 my @res;
422 512
423 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 515 @res = eval { $job->() };
425 warn $@ if $@; 516 warn $@ if $@;
426 undef $busy; 517 undef $busy;
427 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
428 519
429 while ($busy) { 520 while ($busy) {
430 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
431 } 525 }
526 }
432 527
433 $time = Event::time - $time; 528 my $time = EV::time - $time;
434 529
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
439 531
440 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
441 } else { 533 } else {
442 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
443 535
468=item fork_call { }, $args 560=item fork_call { }, $args
469 561
470Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
474 566
475=cut 567=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 568
486sub fork_call(&@) { 569sub fork_call(&@) {
487 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
488 571
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 575
494 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 577 reset_signals;
508 local $SIG{__WARN__}; 578 &$cb
509 local $SIG{__DIE__}; 579 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 580
516 eval { 581 wantarray ? @res : $res[-1]
517 close $fh1; 582}
518 583
519 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
520 585
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
522 close $fh2;
523 };
524 587
525 warn $@ if $@; 588our %coin_alias = (
526 _exit 0; 589 "silver" => "silvercoin",
527 } 590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
528} 609}
529 610
530=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
531 612
532Returns a single value from the environment database. 613Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
535 616
536Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
539=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
540 643
541our $DB; 644our $DB;
542 645
543sub db_init { 646sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 647 cf::sync_job {
548 eval { 648 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 649 };
558} 650}
559 651
560sub db_get($$) { 652sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
562 654
612 if (1) { 704 if (1) {
613 $md5 = 705 $md5 =
614 join "\x00", 706 join "\x00",
615 $processversion, 707 $processversion,
616 map { 708 map {
617 Coro::cede; 709 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 711 } 0.. $#$src;
620 712
621 713
622 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
660 752
661############################################################################# 753#############################################################################
662 754
663=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
664 756
665Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
668 760
669In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 763Deliantra).
672 764
673=over 4 765=over 4
674 766
675=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
676 768
720=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
721 813
722Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
724 816
725Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
727 819
728These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
729 821
730=over 4 822=over 4
958 } 1050 }
959 1051
960 0 1052 0
961} 1053}
962 1054
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1056
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1058
967Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
968 1060
974 1066
975=cut 1067=cut
976 1068
977############################################################################# 1069#############################################################################
978# object support 1070# object support
979#
980 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
981sub _can_merge { 1105sub _can_merge {
982 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
983 1107
984 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1109
988 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
989} 1112}
990 1113
991sub reattach { 1114sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1116 my ($obj) = @_;
994 1117
1118 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1120
997 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
998 1122
999 @$registry = (); 1123 @$registry = ();
1000 1124
1015cf::attachable->attach ( 1139cf::attachable->attach (
1016 prio => -1000000, 1140 prio => -1000000,
1017 on_instantiate => sub { 1141 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1019 1143
1020 $data = from_json $data; 1144 $data = decode_json $data;
1021 1145
1022 for (@$data) { 1146 for (@$data) {
1023 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1024 1148
1025 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1165sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1043 1167
1044 sync_job { 1168 sync_job {
1045 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1048 1173
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1179 aio_fsync $fh;
1180 }
1053 close $fh; 1181 aio_close $fh;
1054 1182
1055 if (@$objs) { 1183 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1190 aio_fsync $fh;
1191 }
1061 close $fh; 1192 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1194 }
1064 } else { 1195 } else {
1065 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1066 } 1197 }
1067 1198
1068 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1203 } else {
1070 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1071 } 1205 }
1072 } else { 1206 } else {
1073 aio_unlink $filename; 1207 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1075 } 1209 }
1076 } 1210 };
1077} 1211}
1078 1212
1079sub object_freezer_as_string { 1213sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1081 1215
1093 or return; 1227 or return;
1094 1228
1095 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1231 or return;
1232
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1099 } 1235 }
1100 1236
1237 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1103 return ($data, $av); 1241 ($data, $av)
1104} 1242}
1105 1243
1106=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1107 1245
1108=over 4 1246=over 4
1162 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1163 1301
1164 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1165} 1303}
1166 1304
1305use File::Glob ();
1306
1167cf::player->attach ( 1307cf::player->attach (
1168 on_command => sub { 1308 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1170 1310
1171 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1181 my ($pl, $buf) = @_; 1321 my ($pl, $buf) = @_;
1182 1322
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1324
1185 if (ref $msg) { 1325 if (ref $msg) {
1326 my ($type, $reply, @payload) =
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330
1331 my @reply;
1332
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1333 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1334 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1191 } else { 1340 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1342 }
1194 1343
1195 cf::override; 1344 cf::override;
1196 }, 1345 },
1197); 1346);
1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1198 1360
1199sub load_extensions { 1361sub load_extensions {
1200 cf::sync_job { 1362 cf::sync_job {
1201 my %todo; 1363 my %todo;
1202 1364
1222 1384
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1387
1226 $ext{source} = 1388 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1229 . $source 1391 . $source
1230 . "\n};\n1"; 1392 . "\n};\n1";
1231 1393
1232 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1250 1412
1251 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1414 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1416 }
1256 1417
1257 warn $msg; 1418 warn $msg;
1258 } 1419 }
1259 1420
1273 1434
1274=back 1435=back
1275 1436
1276=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1277 1438
1278Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1279 1440
1280=cut 1441=cut
1281 1442
1282package cf::player; 1443package cf::player;
1283 1444
1284use Coro::AIO; 1445use Coro::AIO;
1285 1446
1286=head3 cf::player 1447=head3 cf::player
1287 1448
1288=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1289 1464
1290=item cf::player::find $login 1465=item cf::player::find $login
1291 1466
1292Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1293 1468
1312 1487
1313sub exists($) { 1488sub exists($) {
1314 my ($login) = @_; 1489 my ($login) = @_;
1315 1490
1316 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1317 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1318} 1493}
1319 1494
1320sub find($) { 1495sub find($) {
1321 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1322 my $login = $_[0]; 1497 my $login = $_[0];
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1508
1334 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1337 } 1518 }
1338 } 1519 }
1339} 1520}
1340 1521
1349 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1350 1531
1351 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1353 1534
1535 cf::get_slot 0.01;
1536
1354 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1355 Coro::cede; 1538 cf::cede_to_tick;
1356} 1539}
1357 1540
1358sub new($) { 1541sub new($) {
1359 my ($login) = @_; 1542 my ($login) = @_;
1360 1543
1366 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1367 1550
1368 $self 1551 $self
1369} 1552}
1370 1553
1554=item $player->send_msg ($channel, $msg, $color, [extra...])
1555
1556=cut
1557
1558sub send_msg {
1559 my $ns = shift->ns
1560 or return;
1561 $ns->send_msg (@_);
1562}
1563
1371=item $pl->quit_character 1564=item $pl->quit_character
1372 1565
1373Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1374be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1375 1568
1379 my ($pl) = @_; 1572 my ($pl) = @_;
1380 1573
1381 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1382 1575
1383 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1385 1578
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1390 1585
1391 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1428 or return []; 1623 or return [];
1429 1624
1430 my @logins; 1625 my @logins;
1431 1626
1432 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1436 1637
1437 utf8::decode $login; 1638 utf8::decode $login;
1438 push @logins, $login; 1639 push @logins, $login;
1439 } 1640 }
1440 1641
1467 } 1668 }
1468 1669
1469 \@paths 1670 \@paths
1470} 1671}
1471 1672
1472=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1473 1674
1474Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1475 1676
1476=cut
1477
1478sub expand_cfpod {
1479 ((my $self), (local $_)) = @_;
1480
1481 # escape & and <
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484
1485 # this is buggy, it needs to properly take care of nested <'s
1486
1487 1 while
1488 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/
1492 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1
1495 }ge
1496 # replace H<hint text>
1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1504
1505 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g;
1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1520}
1521
1522=item $player->ext_reply ($msgid, %msg) 1677=item $player->ext_reply ($msgid, @msg)
1523 1678
1524Sends an ext reply to the player. 1679Sends an ext reply to the player.
1525 1680
1526=cut 1681=cut
1527 1682
1528sub ext_reply($$%) { 1683sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1684 my ($self, $id, @msg) = @_;
1530 1685
1531 $msg{msgid} = $id; 1686 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1687}
1534 1688
1535=item $player->ext_event ($type, %msg) 1689=item $player->ext_msg ($type, @msg)
1536 1690
1537Sends an ext event to the client. 1691Sends an ext event to the client.
1538 1692
1539=cut 1693=cut
1540 1694
1541sub ext_event($$%) { 1695sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1696 my ($self, $type, @msg) = @_;
1543 1697
1544 $self->ns->ext_event ($type, %msg); 1698 $self->ns->ext_msg ($type, @msg);
1545} 1699}
1546 1700
1547=head3 cf::region 1701=head3 cf::region
1548 1702
1549=over 4 1703=over 4
1593our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1594our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1595 1749
1596sub generate_random_map { 1750sub generate_random_map {
1597 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1598 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1599 $self->_create_random_map ( 1756 $self->_create_random_map (
1600 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1601 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1602 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1724 1881
1725# the temporary/swap location 1882# the temporary/swap location
1726sub save_path { 1883sub save_path {
1727 my ($self) = @_; 1884 my ($self) = @_;
1728 1885
1729 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1730 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1731} 1888}
1732 1889
1733# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1734sub uniq_path { 1891sub uniq_path {
1735 my ($self) = @_; 1892 my ($self) = @_;
1736 1893
1737 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1738 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1739}
1740
1741# and all this just because we cannot iterate over
1742# all maps in C++...
1743sub change_all_map_light {
1744 my ($change) = @_;
1745
1746 $_->change_map_light ($change)
1747 for grep $_->outdoor, values %cf::MAP;
1748} 1896}
1749 1897
1750sub decay_objects { 1898sub decay_objects {
1751 my ($self) = @_; 1899 my ($self) = @_;
1752 1900
1765 1913
1766sub load_header_from($) { 1914sub load_header_from($) {
1767 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1768 1916
1769 utf8::encode $path; 1917 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1775 1926
1776 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1777 1928
1778 1 1929 1
1779} 1930}
1833sub find { 1984sub find {
1834 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1835 1986
1836 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1837 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1839 1991
1840 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path";
1842 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1843 or return; 1994 or return;
1844 1995
1845 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1846 1997
1848 or return; 1999 or return;
1849 2000
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1853 $map->reset; 2006 $map->reset;
1854 undef $guard;
1855 return find $path; 2007 return find $path;
1856 } 2008 }
1857 2009
1858 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1859 } 2011 }
1860} 2012}
1861 2013
1862sub pre_load { } 2014sub pre_load { }
1863sub post_load { } 2015#sub post_load { } # XS
1864 2016
1865sub load { 2017sub load {
1866 my ($self) = @_; 2018 my ($self) = @_;
1867 2019
1868 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1869 2021
1870 my $path = $self->{path}; 2022 my $path = $self->{path};
1871 2023
1872 { 2024 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1874 2026
2027 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2029
1877 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1878 2031
1879 $self->alloc; 2032 $self->alloc;
1880 2033
1881 $self->pre_load; 2034 $self->pre_load;
1882 Coro::cede; 2035 cf::cede_to_tick;
1883 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1885 or return; 2040 or return;
1886 2041
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1888 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1889 2044
1890 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2046 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2049 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1895 } 2053 }
1896 } 2054 }
1897 2055
1898 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1899 # now do the right thing for maps 2059 # now do the right thing for maps
1900 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2062 unless $self->difficulty;
1903 Coro::cede; 2063 cf::cede_to_tick;
1904 2064
1905 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2066 $self->decay_objects;
1907 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1908 $self->update_buttons; 2068 $self->update_buttons;
1909 Coro::cede; 2069 cf::cede_to_tick;
1910 $self->set_darkness_map;
1911 Coro::cede;
1912 $self->activate; 2070 $self->activate;
1913 } 2071 }
1914 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1916 } 2077 }
1917 2078
1918 $self->post_load; 2079 $self->post_load;
1919} 2080}
1920 2081
1929 2090
1930 $self 2091 $self
1931} 2092}
1932 2093
1933# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2095sub load_neighbours {
1935 my ($map) = @_; 2096 my ($map) = @_;
1936 2097
1937 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1938 2099
1939 for (0 .. 3) { 2100 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1941 or next; 2102 or next;
1942 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1943 or next; 2104 or next;
1944 $neigh->load; 2105 $neigh->load;
1945 2106
2107 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2110 }
1949 2111
1950 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1952 or next; 2115 or next;
1953 $neigh->load; 2116 $neigh->load;
1954 } 2117 }
1955} 2118}
1956 2119
1961} 2124}
1962 2125
1963sub do_load_sync { 2126sub do_load_sync {
1964 my ($map) = @_; 2127 my ($map) = @_;
1965 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1966 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1967} 2133}
1968 2134
1969our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1971 2137
1972sub find_async { 2138sub find_async {
1973 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1974 2140
1975 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1976 2142
1977 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1979 } 2145 }
1980 2146
1981 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1982 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1983 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2154 if (my $map = find $k) {
1986 $map->load; 2155 $map->load if $v;
1987 } 2156 }
1988 2157
1989 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1990 } 2159 }
1991 } 2160 }
1992 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1993 }; 2162 };
1994 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1997} 2166}
1998 2167
1999sub save { 2168sub save {
2000 my ($self) = @_; 2169 my ($self) = @_;
2001 2170
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2172
2004 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
2005 2174
2006 return unless $self->dirty; 2175 return unless $self->dirty;
2007 2176
2013 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2014 2183
2015 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2016 2185
2017 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2019 }; 2189 };
2190
2191 cf::get_slot 0.02;
2020 2192
2021 if ($uniq) { 2193 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2196 } else {
2030 my ($self) = @_; 2202 my ($self) = @_;
2031 2203
2032 # save first because save cedes 2204 # save first because save cedes
2033 $self->save; 2205 $self->save;
2034 2206
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2208
2037 return if $self->players; 2209 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2039 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2040 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2217 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2218}
2044 2219
2045sub reset_at { 2220sub reset_at {
2046 my ($self) = @_; 2221 my ($self) = @_;
2047 2222
2065 2240
2066 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2067 2242
2068 return if $self->players; 2243 return if $self->players;
2069 2244
2070 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2071 2246
2072 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2073 2248
2074 # need to save uniques path 2249 # need to save uniques path
2075 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2079 if $uniq; 2254 if $uniq;
2080 } 2255 }
2081 2256
2082 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2083 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2261 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2262
2088 $self->unlink_save; 2263 $self->unlink_save;
2089 $self->destroy; 2264 $self->destroy;
2090} 2265}
2091 2266
2092my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2093 2268
2094sub nuke { 2269sub nuke {
2095 my ($self) = @_; 2270 my ($self) = @_;
2096 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2097 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2098 2276
2099 $self->unlink_save; 2277 $self->unlink_save;
2100 2278
2101 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2284
2107 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2108 2287
2109 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2110} 2289}
2111 2290
2112=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
2154 2333
2155sub unique_maps() { 2334sub unique_maps() {
2156 [ 2335 [
2157 map { 2336 map {
2158 utf8::decode $_; 2337 utf8::decode $_;
2159 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2160 ? normalise $_ 2341 : normalise $_
2161 : ()
2162 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2163 ] 2343 ]
2164} 2344}
2165 2345
2166package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2167 2377
2168=back 2378=back
2169 2379
2170=head3 cf::object 2380=head3 cf::object
2171 2381
2175 2385
2176=over 4 2386=over 4
2177 2387
2178=item $ob->inv_recursive 2388=item $ob->inv_recursive
2179 2389
2180Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2181 2392
2182=cut 2393=cut
2183 2394
2184sub inv_recursive_; 2395sub inv_recursive_;
2185sub inv_recursive_ { 2396sub inv_recursive_ {
2188 2399
2189sub inv_recursive { 2400sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2191} 2402}
2192 2403
2404=item $ref = $ob->ref
2405
2406Creates and returns a persistent reference to an object that can be stored as a string.
2407
2408=item $ob = cf::object::deref ($refstring)
2409
2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2411even if the object actually exists. May block.
2412
2413=cut
2414
2415sub deref {
2416 my ($ref) = @_;
2417
2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2419 my ($uuid, $name) = ($1, $2);
2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2421 or return;
2422 $pl->ob->uuid eq $uuid
2423 or return;
2424
2425 $pl->ob
2426 } else {
2427 warn "$ref: cannot resolve object reference\n";
2428 undef
2429 }
2430}
2431
2193package cf; 2432package cf;
2194 2433
2195=back 2434=back
2196 2435
2197=head3 cf::object::player 2436=head3 cf::object::player
2203Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2442Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2204can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2205dialogue with the given NPC character. 2444dialogue with the given NPC character.
2206 2445
2207=cut 2446=cut
2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2208 2461
2209# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2210# with dialog boxes. 2463# with dialog boxes.
2211#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2212sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2219 2472
2220 } else { 2473 } else {
2221 my $pl = $self->contr; 2474 my $pl = $self->contr;
2222 2475
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2479
2232 } else { 2480 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2235 } 2483 }
2236 } 2484 }
2485}
2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2237} 2495}
2238 2496
2239=item $player_object->may ("access") 2497=item $player_object->may ("access")
2240 2498
2241Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2254 2512
2255=item $player_object->enter_link 2513=item $player_object->enter_link
2256 2514
2257Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2258 2516
2259The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2260I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2261 2521
2262Will never block. 2522Will never block.
2263 2523
2264=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2265 2525
2317 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2318 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2319 2579
2320 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2323 2583
2324 $map->load; 2584 $map->load;
2325 $map->load_diag; 2585 $map->load_neighbours;
2326 2586
2327 return unless $self->contr->active; 2587 return unless $self->contr->active;
2328 $self->activate_recursive;
2329 2588
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2331 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2332} 2594}
2333 2595
2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2335 2597
2336Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2337her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2338that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2339the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process. 2602be called at the end of this process.
2341 2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2606
2342=cut 2607=cut
2343 2608
2344our $GOTOGEN; 2609our $GOTOGEN;
2345 2610
2346sub cf::object::player::goto { 2611sub cf::object::player::goto {
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2616
2352 $self->enter_link; 2617 $self->enter_link;
2353 2618
2354 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2622 # *tag paths override both path and x|y
2623 if ($path =~ /^\*(.*)$/) {
2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2625 my $ob = $obs[rand @obs];
2626
2627 # see if we actually can go there
2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2632 }
2633 # else put us there anyways for now #d#
2634
2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2638 }
2639 }
2640
2355 my $map = eval { 2641 my $map = eval {
2356 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2357 2643
2358 if ($map) { 2644 if ($map) {
2359 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2361 } else { 2647 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2649 }
2364 2650
2365 $map 2651 $map
2366 }; 2652 };
2367 2653
2403} 2689}
2404 2690
2405sub prepare_random_map { 2691sub prepare_random_map {
2406 my ($exit) = @_; 2692 my ($exit) = @_;
2407 2693
2408 my $guard = cf::lock_acquire "exit_prepare:$exit";
2409
2410 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2411 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2412 # that depends on the exit object 2696 # that depends on the exit object
2413 2697
2414 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2416 if ($exit->map) { 2700 if ($exit->map) {
2417 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2418 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2419 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2420 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2421 } 2707 }
2422 2708
2423 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2424 2710
2425 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2426 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2428 2714
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2431 undef $fh; 2717 undef $fh;
2432 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2433 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2434 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2435 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2436 } 2726 }
2437} 2727}
2438 2728
2439sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2440 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2441 2731
2442 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2443 2733
2444 if ($exit->slaying eq "/!") {
2445 #TODO: this should de-fi-ni-te-ly not be a sync-job
2446 # the problem is that $exit might not survive long enough
2447 # so it needs to be done right now, right here
2448 cf::sync_job { prepare_random_map $exit };
2449 }
2450
2451 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2452 my $hp = $exit->stats->hp;
2453 my $sp = $exit->stats->sp;
2454
2455 $self->enter_link; 2734 $self->enter_link;
2456 2735
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2461 (async { 2736 (async {
2462 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2463 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2464 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2465 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2466 1; 2760 1
2467 }) { 2761 }) {
2468 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2469 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2470 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2471 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2472 2766
2473 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2490sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2491 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2492 2786
2493 utf8::encode $text; 2787 utf8::encode $text;
2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2495} 2814}
2496 2815
2497=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2498 2817
2499Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2503 2822
2504=cut 2823=cut
2505 2824
2825# non-persistent channels (usually the info channel)
2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2833 "c/identify" => {
2834 id => "infobox",
2835 title => "Identify",
2836 reply => undef,
2837 tooltip => "Items recently identified",
2838 },
2839 "c/examine" => {
2840 id => "infobox",
2841 title => "Examine",
2842 reply => undef,
2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2850 },
2851 "c/book" => {
2852 id => "infobox",
2853 title => "Book",
2854 reply => undef,
2855 tooltip => "The contents of a note or book",
2856 },
2857 "c/lookat" => {
2858 id => "infobox",
2859 title => "Look",
2860 reply => undef,
2861 tooltip => "What you saw there",
2862 },
2863 "c/who" => {
2864 id => "infobox",
2865 title => "Players",
2866 reply => undef,
2867 tooltip => "Shows players who are currently online",
2868 },
2869 "c/body" => {
2870 id => "infobox",
2871 title => "Body Parts",
2872 reply => undef,
2873 tooltip => "Shows which body parts you posess and are available",
2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2911 "c/uptime" => {
2912 id => "infobox",
2913 title => "Uptime",
2914 reply => undef,
2915 tooltip => "How long the server has been running since last restart",
2916 },
2917 "c/mapinfo" => {
2918 id => "infobox",
2919 title => "Map Info",
2920 reply => undef,
2921 tooltip => "Information related to the maps",
2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2937);
2938
2506sub cf::client::send_msg { 2939sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2941
2509 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2510 2944
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2946
2947 # check predefined channels, for the benefit of C
2948 if ($CHANNEL{$channel}) {
2949 $channel = $CHANNEL{$channel};
2950
2951 $self->ext_msg (channel_info => $channel);
2952 $channel = $channel->{id};
2953
2513 if (ref $channel) { 2954 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2958 $self->ext_msg (channel_info => $channel);
2518 } 2959 }
2519 2960
2520 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2521 } 2962 }
2522 2963
2523 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2524 2965
2525 if ($self->can_msg) { 2966 # default colour, mask it out
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 } else { 2968 if $color & cf::NDI_DEF;
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537 2969
2538 if ($color >= 0) { 2970 my $pkt = "msg "
2539 if (0 && $msg =~ /\[/) { 2971 . $self->{json_coder}->encode (
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 2973 );
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg")
2544 }
2545 }
2546 }
2547}
2548 2974
2975 $self->send_big_packet ($pkt);
2976}
2977
2549=item $client->ext_event ($type, %msg) 2978=item $client->ext_msg ($type, @msg)
2550 2979
2551Sends an ext event to the client. 2980Sends an ext event to the client.
2552 2981
2553=cut 2982=cut
2554 2983
2555sub cf::client::ext_event($$%) { 2984sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2985 my ($self, $type, @msg) = @_;
2557 2986
2558 return unless $self->extcmd; 2987 if ($self->extcmd == 2) {
2559 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2989 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2990 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992 }
2993}
2994
2995=item $client->ext_reply ($msgid, @msg)
2996
2997Sends an ext reply to the client.
2998
2999=cut
3000
3001sub cf::client::ext_reply($$@) {
3002 my ($self, $id, @msg) = @_;
3003
3004 if ($self->extcmd == 2) {
3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006 } elsif ($self->extcmd == 1) {
3007 #TODO: version 1, remove
3008 unshift @msg, msgtype => "reply", msgid => $id;
3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3010 }
2562} 3011}
2563 3012
2564=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2565 3014
2566Queues a query to the client, calling the given callback with 3015Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 3070 my ($ns, $buf) = @_;
2622 3071
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3072 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 3073
2625 if (ref $msg) { 3074 if (ref $msg) {
3075 my ($type, $reply, @payload) =
3076 "ARRAY" eq ref $msg
3077 ? @$msg
3078 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3079
3080 my @reply;
3081
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3082 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 3083 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 3084 }
3085
3086 $ns->ext_reply ($reply, @reply)
3087 if $reply;
3088
2632 } else { 3089 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 3091 }
2635 3092
2636 cf::override; 3093 cf::override;
2683our $safe = new Safe "safe"; 3140our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
2685 3142
2686$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
2687 3144
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3145$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile
3148 sort time
3149));
2689 3150
2690# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
2691 3152
2692=pod 3153=pod
2693 3154
2694The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2695 3156
2696 cf::object 3157 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3158 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3159 insert remove name archname title slaying race decrease split
3160 value
2699 3161
2700 cf::object::player 3162 cf::object::player
2701 player 3163 player
2702 3164
2703 cf::player 3165 cf::player
2708 3170
2709=cut 3171=cut
2710 3172
2711for ( 3173for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 3175 insert remove inv nrof name archname title slaying race
3176 decrease split destroy change_exp value msg lore send_msg)],
2714 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2716 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2717) { 3180) {
2718 no strict 'refs'; 3181 no strict 'refs';
2719 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2720 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2738 3201
2739 my $qcode = $code; 3202 my $qcode = $code;
2740 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2741 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
2742 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
2743 local $_; 3209 local $_;
2744 local @safe::cf::_safe_eval_args = values %vars;
2745 3210
2746 my $eval = 3211 my $eval =
2747 "do {\n" 3212 "do {\n"
2748 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2749 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
2750 . $code 3215 . $code
2751 . "\n}" 3216 . "\n}"
2752 ; 3217 ;
2753 3218
3219 if ($CFG{safe_eval}) {
2754 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
2755 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2756 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
2757 3228
2758 if ($@) { 3229 if ($@) {
2759 warn "$@"; 3230 warn "$@";
2760 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
2761 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
2794# the server's init and main functions 3265# the server's init and main functions
2795 3266
2796sub load_facedata($) { 3267sub load_facedata($) {
2797 my ($path) = @_; 3268 my ($path) = @_;
2798 3269
3270 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = ();
3273
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275
2799 warn "loading facedata from $path\n"; 3276 warn "loading facedata from $path\n";
2800 3277
2801 my $facedata; 3278 my $facedata;
2802 0 < aio_load $path, $facedata 3279 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3280 or die "$path: $!";
2805 $facedata = Coro::Storable::thaw $facedata; 3282 $facedata = Coro::Storable::thaw $facedata;
2806 3283
2807 $facedata->{version} == 2 3284 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3286
3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3289 $facedata->{resource}{"res/exp_table"} = {
3290 type => FT_RSRC,
3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3293 };
3294 cf::cede_to_tick;
3295
2810 { 3296 {
2811 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
2812 3298
2813 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3301
2815 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2819 3306
2820 cf::cede_to_tick; 3307 cf::cede_to_tick;
2821 } 3308 }
2822 3309
2823 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3311 next unless $info->{smooth};
3312
2825 my $idx = cf::face::find $face 3313 my $idx = cf::face::find $face
2826 or next; 3314 or next;
3315
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3316 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3317 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3319 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3320 warn "smooth face '$info->{smooth}' not found for face '$face'";
2845 3334
2846 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
2847 } 3336 }
2848 3337
2849 { 3338 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3340
2855 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3342 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863 3344
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3346 cf::face::set_type $idx, $info->{type};
2867 } else { 3347 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3348 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3349 }
2874 3350
2875 cf::cede_to_tick; 3351 cf::cede_to_tick;
2876 } 3352 }
2877 } 3353 }
2878 3354
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356
2879 1 3357 1
2880} 3358}
2881 3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379
3380register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_;
3382
3383 while (my ($k, $v) = each %$want) {
3384 $ns->fx_want ($k, $v);
3385 }
3386};
3387
3388sub load_resource_file($) {
3389 my $guard = lock_acquire "load_resource_file";
3390
3391 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100;
3393 cf::arch::commit_load;
3394
3395 $status
3396}
3397
2882sub reload_regions { 3398sub reload_regions {
3399 # HACK to clear player env face cache, we need some signal framework
3400 # for this (global event?)
3401 %ext::player_env::MUSIC_FACE_CACHE = ();
3402
2883 load_resource_file "$MAPDIR/regions" 3403 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3404 or die "unable to load regions file\n";
2885 3405
2886 for (cf::region::list) { 3406 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3407 $_->{match} = qr/$_->{match}/
2895} 3415}
2896 3416
2897sub reload_archetypes { 3417sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes" 3418 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n"; 3419 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2903 load_resource_file "$DATADIR/archetypes"
2904 or die "unable to load archetypes\n";
2905} 3420}
2906 3421
2907sub reload_treasures { 3422sub reload_treasures {
2908 load_resource_file "$DATADIR/treasures" 3423 load_resource_file "$DATADIR/treasures"
2909 or die "unable to load treasurelists\n"; 3424 or die "unable to load treasurelists\n";
2910} 3425}
2911 3426
2912sub reload_resources { 3427sub reload_resources {
2913 warn "reloading resource files...\n"; 3428 warn "reloading resource files...\n";
2914 3429
3430 reload_facedata;
3431 reload_archetypes;
2915 reload_regions; 3432 reload_regions;
2916 reload_facedata;
2917 #reload_archetypes;#d#
2918 reload_archetypes;
2919 reload_treasures; 3433 reload_treasures;
2920 3434
2921 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
2922} 3436}
2923 3437
2924sub init { 3438sub reload_config {
2925 reload_resources; 3439 warn "reloading config file...\n";
2926}
2927 3440
2928sub cfg_load {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3442 or return;
2931 3443
2932 local $/; 3444 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
2934 3446
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3448
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2942 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2943 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
2944 }; 3456 };
2945 warn $@ if $@; 3457 warn $@ if $@;
2946 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3461}
3462
3463sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!";
3466 flock $fh, &Fcntl::LOCK_EX
3467 or die "$PIDFILE: flock: $!";
3468 $fh
3469}
3470
3471# make sure only one server instance is running at any one time
3472sub atomic {
3473 my $fh = pidfile;
3474
3475 my $pid = <$fh>;
3476 kill 9, $pid if $pid > 0;
3477
3478 seek $fh, 0, 0;
3479 print $fh $$;
3480}
3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
2947} 3489}
2948 3490
2949sub main { 3491sub main {
3492 cf::init_globals; # initialise logging
3493
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505
2950 # we must not ever block the main coroutine 3506 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3507 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3509 (async {
2954 Event::one_event; 3510 $Coro::current->{desc} = "IDLE BUG HANDLER";
3511 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3512 })->prio (Coro::PRIO_MAX);
2956 }; 3513 };
2957 3514
2958 cfg_load; 3515 evthread_start IO::AIO::poll_fileno;
3516
3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3521 reload_resources;
3522 reload_config;
2959 db_init; 3523 db_init;
3524
3525 cf::init_uuid;
3526 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills;
3529
3530 cf::init_beforeplay;
3531
3532 atomic;
3533
2960 load_extensions; 3534 load_extensions;
2961 3535
2962 $TICK_WATCHER->start; 3536 utime time, time, $RUNTIMEFILE;
2963 Event::loop; 3537
3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541
3542 (pop @POST_INIT)->(0) while @POST_INIT;
3543 };
3544
3545 main_loop;
2964} 3546}
2965 3547
2966############################################################################# 3548#############################################################################
2967# initialisation and cleanup 3549# initialisation and cleanup
2968 3550
2969# install some emergency cleanup handlers 3551# install some emergency cleanup handlers
2970BEGIN { 3552BEGIN {
3553 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3554 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3555 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3556 cf::cleanup "SIG$signal";
2979 },
2980 ); 3557 };
2981 } 3558 }
2982} 3559}
2983 3560
2984sub write_runtime { 3561sub write_runtime_sync {
2985 my $runtime = "$LOCALDIR/runtime";
2986
2987 # first touch the runtime file to show we are still running: 3562 # first touch the runtime file to show we are still running:
2988 # the fsync below can take a very very long time. 3563 # the fsync below can take a very very long time.
2989 3564
2990 IO::AIO::aio_utime $runtime, undef, undef; 3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2991 3566
2992 my $guard = cf::lock_acquire "write_runtime"; 3567 my $guard = cf::lock_acquire "write_runtime";
2993 3568
2994 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2995 or return; 3570 or return;
2996 3571
2997 my $value = $cf::RUNTIME + 90 + 10; 3572 my $value = $cf::RUNTIME + 90 + 10;
2998 # 10 is the runtime save interval, for a monotonic clock 3573 # 10 is the runtime save interval, for a monotonic clock
2999 # 60 allows for the watchdog to kill the server. 3574 # 60 allows for the watchdog to kill the server.
3009 aio_utime $fh, undef, undef; 3584 aio_utime $fh, undef, undef;
3010 3585
3011 close $fh 3586 close $fh
3012 or return; 3587 or return;
3013 3588
3014 aio_rename "$runtime~", $runtime 3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3015 and return; 3590 and return;
3016 3591
3017 warn "runtime file written.\n"; 3592 warn "runtime file written.\n";
3018 3593
3019 1 3594 1
3595}
3596
3597our $uuid_lock;
3598our $uuid_skip;
3599
3600sub write_uuid_sync($) {
3601 $uuid_skip ||= $_[0];
3602
3603 return if $uuid_lock;
3604 local $uuid_lock = 1;
3605
3606 my $uuid = "$LOCALDIR/uuid";
3607
3608 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3609 or return;
3610
3611 my $value = uuid_seq uuid_cur;
3612
3613 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n";
3615 return;
3616 }
3617
3618 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0;
3620
3621 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3622 and return;
3623
3624 # always fsync - this file is important
3625 aio_fsync $fh
3626 and return;
3627
3628 close $fh
3629 or return;
3630
3631 aio_rename "$uuid~", $uuid
3632 and return;
3633
3634 warn "uuid file written ($value).\n";
3635
3636 1
3637
3638}
3639
3640sub write_uuid($$) {
3641 my ($skip, $sync) = @_;
3642
3643 $sync ? write_uuid_sync $skip
3644 : async { write_uuid_sync $skip };
3020} 3645}
3021 3646
3022sub emergency_save() { 3647sub emergency_save() {
3023 my $freeze_guard = cf::freeze_mainloop; 3648 my $freeze_guard = cf::freeze_mainloop;
3024 3649
3025 warn "enter emergency perl save\n"; 3650 warn "emergency_perl_save: enter\n";
3026 3651
3027 cf::sync_job { 3652 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657
3028 # use a peculiar iteration method to avoid tripping on perl 3658 # use a peculiar iteration method to avoid tripping on perl
3029 # refcount bugs in for. also avoids problems with players 3659 # refcount bugs in for. also avoids problems with players
3030 # and maps saved/destroyed asynchronously. 3660 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3661 warn "emergency_perl_save: begin player save\n";
3032 for my $login (keys %cf::PLAYER) { 3662 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3663 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3664 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3666 $pl->save;
3036 } 3667 }
3037 warn "end emergency player save\n"; 3668 warn "emergency_perl_save: end player save\n";
3038 3669
3039 warn "begin emergency map save\n"; 3670 warn "emergency_perl_save: begin map save\n";
3040 for my $path (keys %cf::MAP) { 3671 for my $path (keys %cf::MAP) {
3041 my $map = $cf::MAP{$path} or next; 3672 my $map = $cf::MAP{$path} or next;
3042 $map->valid or next; 3673 $map->valid or next;
3043 $map->save; 3674 $map->save;
3044 } 3675 }
3045 warn "end emergency map save\n"; 3676 warn "emergency_perl_save: end map save\n";
3046 3677
3047 warn "begin emergency database checkpoint\n"; 3678 warn "emergency_perl_save: begin database checkpoint\n";
3048 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3049 warn "end emergency database checkpoint\n"; 3680 warn "emergency_perl_save: end database checkpoint\n";
3681
3682 warn "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n";
3050 }; 3685 };
3051 3686
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3052 warn "leave emergency perl save\n"; 3692 warn "emergency_perl_save: leave\n";
3053} 3693}
3054 3694
3055sub post_cleanup { 3695sub post_cleanup {
3056 my ($make_core) = @_; 3696 my ($make_core) = @_;
3057 3697
3058 warn Carp::longmess "post_cleanup backtrace" 3698 warn Carp::longmess "post_cleanup backtrace"
3059 if $make_core; 3699 if $make_core;
3700
3701 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$;
3703}
3704
3705# a safer delete_package, copied from Symbol
3706sub clear_package($) {
3707 my $pkg = shift;
3708
3709 # expand to full symbol table name if needed
3710 unless ($pkg =~ /^main::.*::$/) {
3711 $pkg = "main$pkg" if $pkg =~ /^::/;
3712 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3713 $pkg .= '::' unless $pkg =~ /::$/;
3714 }
3715
3716 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3717 my $stem_symtab = *{$stem}{HASH};
3718
3719 defined $stem_symtab and exists $stem_symtab->{$leaf}
3720 or return;
3721
3722 # clear all symbols
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 }
3728 warn "cleared package $pkg\n";#d#
3060} 3729}
3061 3730
3062sub do_reload_perl() { 3731sub do_reload_perl() {
3063 # can/must only be called in main 3732 # can/must only be called in main
3064 if ($Coro::current != $Coro::main) { 3733 if ($Coro::current != $Coro::main) {
3065 warn "can only reload from main coroutine"; 3734 warn "can only reload from main coroutine";
3066 return; 3735 return;
3067 } 3736 }
3068 3737
3738 return if $RELOAD++;
3739
3740 my $t1 = EV::time;
3741
3742 while ($RELOAD) {
3069 warn "reloading..."; 3743 warn "reloading...";
3070 3744
3071 warn "entering sync_job"; 3745 warn "entering sync_job";
3072 3746
3073 cf::sync_job { 3747 cf::sync_job {
3074 cf::write_runtime; # external watchdog should not bark 3748 cf::write_runtime_sync; # external watchdog should not bark
3075 cf::emergency_save; 3749 cf::emergency_save;
3076 cf::write_runtime; # external watchdog should not bark 3750 cf::write_runtime_sync; # external watchdog should not bark
3077 3751
3078 warn "syncing database to disk"; 3752 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3754
3081 # if anything goes wrong in here, we should simply crash as we already saved 3755 # if anything goes wrong in here, we should simply crash as we already saved
3082 3756
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3757 warn "flushing outstanding aio requests";
3089 for (;;) {
3090 BDB::flush;
3091 IO::AIO::flush;
3092 Coro::cede;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3758 while (IO::AIO::nreqs || BDB::nreqs) {
3094 warn "iterate..."; 3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3095 }
3096
3097 ++$RELOAD;
3098
3099 warn "cancelling all extension coros";
3100 $_->cancel for values %EXT_CORO;
3101 %EXT_CORO = ();
3102
3103 warn "removing commands";
3104 %COMMAND = ();
3105
3106 warn "removing ext/exti commands";
3107 %EXTCMD = ();
3108 %EXTICMD = ();
3109
3110 warn "unloading/nuking all extensions";
3111 for my $pkg (@EXTS) {
3112 warn "... unloading $pkg";
3113
3114 if (my $cb = $pkg->can ("unload")) {
3115 eval {
3116 $cb->($pkg);
3117 1
3118 } or warn "$pkg unloaded, but with errors: $@";
3119 } 3760 }
3120 3761
3121 warn "... nuking $pkg"; 3762 warn "cancelling all extension coros";
3122 Symbol::delete_package $pkg; 3763 $_->cancel for values %EXT_CORO;
3123 } 3764 %EXT_CORO = ();
3124 3765
3125 warn "unloading all perl modules loaded from $LIBDIR"; 3766 warn "removing commands";
3126 while (my ($k, $v) = each %INC) { 3767 %COMMAND = ();
3127 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3128 3768
3769 warn "removing ext/exti commands";
3770 %EXTCMD = ();
3771 %EXTICMD = ();
3772
3773 warn "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) {
3129 warn "... unloading $k"; 3775 warn "... unloading $pkg";
3130 delete $INC{$k};
3131 3776
3132 $k =~ s/\.pm$//;
3133 $k =~ s/\//::/g;
3134
3135 if (my $cb = $k->can ("unload_module")) { 3777 if (my $cb = $pkg->can ("unload")) {
3778 eval {
3136 $cb->(); 3779 $cb->($pkg);
3780 1
3781 } or warn "$pkg unloaded, but with errors: $@";
3782 }
3783
3784 warn "... clearing $pkg";
3785 clear_package $pkg;
3137 } 3786 }
3138 3787
3139 Symbol::delete_package $k; 3788 warn "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791
3792 warn "... unloading $k";
3793 delete $INC{$k};
3794
3795 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g;
3797
3798 if (my $cb = $k->can ("unload_module")) {
3799 $cb->();
3800 }
3801
3802 clear_package $k;
3140 } 3803 }
3141 3804
3142 warn "getting rid of safe::, as good as possible"; 3805 warn "getting rid of safe::, as good as possible";
3143 Symbol::delete_package "safe::$_" 3806 clear_package "safe::$_"
3144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3145 3808
3146 warn "unloading cf.pm \"a bit\""; 3809 warn "unloading cf.pm \"a bit\"";
3147 delete $INC{"cf.pm"}; 3810 delete $INC{"cf.pm"};
3148 delete $INC{"cf/pod.pm"}; 3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3149 3812
3150 # don't, removes xs symbols, too, 3813 # don't, removes xs symbols, too,
3151 # and global variables created in xs 3814 # and global variables created in xs
3152 #Symbol::delete_package __PACKAGE__; 3815 #clear_package __PACKAGE__;
3153 3816
3154 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3155 3818
3156 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3157 require cf; 3820 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3159 3822
3160 warn "loading config and database again"; 3823 warn "loading config and database again";
3161 cf::cfg_load; 3824 cf::reload_config;
3162 3825
3163 warn "loading extensions"; 3826 warn "loading extensions";
3164 cf::load_extensions; 3827 cf::load_extensions;
3165 3828
3829 if ($REATTACH_ON_RELOAD) {
3166 warn "reattaching attachments to objects/players"; 3830 warn "reattaching attachments to objects/players";
3167 _global_reattach; # objects, sockets 3831 _global_reattach; # objects, sockets
3168 warn "reattaching attachments to maps"; 3832 warn "reattaching attachments to maps";
3169 reattach $_ for values %MAP; 3833 reattach $_ for values %MAP;
3170 warn "reattaching attachments to players"; 3834 warn "reattaching attachments to players";
3171 reattach $_ for values %PLAYER; 3835 reattach $_ for values %PLAYER;
3836 }
3172 3837
3838 warn "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840
3173 warn "leaving sync_job"; 3841 warn "leaving sync_job";
3174 3842
3175 1 3843 1
3176 } or do { 3844 } or do {
3177 warn $@; 3845 warn $@;
3178 warn "error while reloading, exiting."; 3846 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3847 };
3181 3848
3182 warn "reloaded"; 3849 warn "reloaded";
3850 --$RELOAD;
3851 }
3852
3853 $t1 = EV::time - $t1;
3854 warn "reload completed in ${t1}s\n";
3183}; 3855};
3184 3856
3185our $RELOAD_WATCHER; # used only during reload 3857our $RELOAD_WATCHER; # used only during reload
3186 3858
3187sub reload_perl() { 3859sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3860 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3861 # coro crashes during coro_state_free->destroy here.
3190 3862
3191 $RELOAD_WATCHER ||= Event->timer ( 3863 $RELOAD_WATCHER ||= cf::async {
3192 reentrant => 0, 3864 Coro::AIO::aio_wait cache_extensions;
3193 after => 0, 3865
3194 data => WF_AUTOCANCEL, 3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3195 cb => sub {
3196 do_reload_perl; 3867 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3868 undef $RELOAD_WATCHER;
3198 }, 3869 };
3199 ); 3870 };
3200} 3871}
3201 3872
3202register_command "reload" => sub { 3873register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3874 my ($who, $arg) = @_;
3204 3875
3205 if ($who->flag (FLAG_WIZ)) { 3876 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3877 $who->message ("reloading server.");
3878 async {
3879 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3880 reload_perl;
3881 };
3208 } 3882 }
3209}; 3883};
3210 3884
3211unshift @INC, $LIBDIR; 3885unshift @INC, $LIBDIR;
3212 3886
3214 3888
3215our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3217 3891
3218sub wait_for_tick { 3892sub wait_for_tick {
3219 return unless $TICK_WATCHER->is_active;
3220 return if $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3221 3894
3222 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 3897 $signal->wait;
3225} 3898}
3226 3899
3227sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3228 return unless $TICK_WATCHER->is_active;
3229 return if $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3230 3902
3231 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3905 $signal->wait;
3234} 3906}
3235 3907
3236 my $min = 1e6;#d# 3908sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3909 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3910 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3911 unless ++$bug_warning > 10;
3248 return; 3912 return;
3249 } 3913 }
3250 3914
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 3915 cf::server_tick; # one server iteration
3254 3916
3255 0 && sync_job {#d# 3917 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 for(1..10) { 3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 my $t = Event::time; 3919 Coro::async_pool {
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3920 $Coro::current->{desc} = "runtime saver";
3259 or die; 3921 write_runtime_sync
3260 3922 or warn "ERROR: unable to write runtime file: $!";
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3923 };
3924 }
3277 3925
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3927 $sig->send;
3294 } 3928 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3929 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3930 $sig->send;
3297 } 3931 }
3298 3932
3299 $NOW = Event::time; 3933 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3935
3310 _post_tick; 3936 if (0) {
3311 3937 if ($NEXT_TICK) {
3312 3938 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d#
3941 }
3313 }, 3942 }
3314); 3943}
3315 3944
3316{ 3945{
3317 BDB::max_poll_time $TICK * 0.1; 3946 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3947
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3948 BDB::min_parallel 8;
3327 3949 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3950 $AnyEvent::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3951
3343 unless ($DB_ENV) { 3952 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3953 $DB_ENV = BDB::db_env_create;
3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3955 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3956 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3957 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3958 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3959
3346 cf::sync_job { 3960 cf::sync_job {
3347 eval { 3961 eval {
3348 BDB::db_env_open 3962 BDB::db_env_open
3349 $DB_ENV, 3963 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3965 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3966 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3967 0666;
3354 3968
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3969 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3970 };
3360 3971
3361 cf::cleanup "db_env_open(db): $@" if $@; 3972 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3973 };
3363 } 3974 }
3975
3976 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3977 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3978 };
3979 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3980 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3981 };
3982 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3983 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3984 };
3364} 3985}
3365 3986
3366{ 3987{
3988 # configure IO::AIO
3989
3367 IO::AIO::min_parallel 8; 3990 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3991 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3992 undef $AnyEvent::AIO::WATCHER;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3993}
3380 3994
3381my $_log_backtrace; 3995my $_log_backtrace;
3382 3996
3383sub _log_backtrace { 3997sub _log_backtrace {
3386 $msg =~ s/\n//; 4000 $msg =~ s/\n//;
3387 4001
3388 # limit the # of concurrent backtraces 4002 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 4003 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 4004 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg;
3391 async { 4006 async {
4007 $Coro::current->{desc} = "abt $msg";
4008
3392 my @bt = fork_call { 4009 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 4010 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4011 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4012 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 4013 or die "addr2line: $!";
3404 } 4021 }
3405 4022
3406 @funcs 4023 @funcs
3407 }; 4024 };
3408 4025
3409 LOG llevInfo, "[ABT] $msg\n"; 4026 LOG llevInfo, "[ABT] $perl_bt\n";
4027 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3410 LOG llevInfo, "[ABT] $_\n" for @bt; 4028 LOG llevInfo, "[ABT] $_\n" for @bt;
3411 --$_log_backtrace; 4029 --$_log_backtrace;
3412 }; 4030 };
3413 } else { 4031 } else {
3414 LOG llevInfo, "[ABT] $msg\n"; 4032 LOG llevInfo, "[ABT] $msg\n";
3415 LOG llevInfo, "[ABT] [suppressed]\n"; 4033 LOG llevInfo, "[ABT] [suppressed]\n";
3416 } 4034 }
3417} 4035}
3418 4036
3419# load additional modules 4037# load additional modules
3420use cf::pod; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3421 4040
3422END { cf::emergency_save } 4041END { cf::emergency_save }
3423 4042
34241 40431
3425 4044

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines