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.271 by root, Fri Jun 1 06:04:08 2007 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines