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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines