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

Diff Legend

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