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.255 by root, Thu Apr 19 16:23:47 2007 UTC vs.
Revision 1.537 by root, Sun May 2 19:16:16 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.61 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
53use Coro::Util ();
24 54
55use JSON::XS 2.01 ();
25use BDB (); 56use BDB ();
26use Data::Dumper; 57use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 58use Fcntl;
29use YAML::Syck (); 59use YAML::XS ();
30use IO::AIO 2.32 (); 60use IO::AIO ();
31use Time::HiRes; 61use Time::HiRes;
32use Compress::LZF; 62use Compress::LZF;
63use Digest::MD5 ();
64
65AnyEvent::detect;
33 66
34# configure various modules to our taste 67# configure various modules to our taste
35# 68#
36$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 77
40$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
41 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 80
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
71 118
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 121our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript);
82 130
83our %CFG; 131our %CFG;
84 132
85our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 134our $RUNTIME;
135our $NOW;
87 136
88our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
91 140
92# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 143
144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
95binmode STDOUT; 154binmode STDOUT;
96binmode STDERR; 155binmode STDERR;
97 156
98# read virtual server time, if available 157# read virtual server time, if available
99unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
100 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
101 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
102 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
103} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
104 165
105mkdir $_ 166mkdir $_
106 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
107 168
108our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
109 170
110sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
111 187
112############################################################################# 188#############################################################################
113 189
114=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
115 191
139 215
140=item $cf::TICK 216=item $cf::TICK
141 217
142The interval between server ticks, in seconds. 218The interval between server ticks, in seconds.
143 219
220=item $cf::LOADAVG
221
222The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5.
225
226=item $cf::LOAD
227
228The raw value load value from the last tick.
229
144=item %cf::CFG 230=item %cf::CFG
145 231
146Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
147from wherever your confdir points to. 233from wherever your confdir points to.
148 234
149=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
150 236
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
154 240
241=item @cf::INVOKE_RESULTS
242
243This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
245that call.
246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
155=back 253=back
156 254
157=cut 255=cut
158 256
159BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
160 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
161 my $msg = join "", @_; 264 my $msg = join "", @_;
162 265
163 $msg .= "\n" 266 $msg .= "\n"
164 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
165 268
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 270
168 utf8::encode $msg;
169 LOG llevError, $msg; 271 LOG llevWarn, $msg;
170 }; 272};
171} 273
274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
285 Coro::terminate
286};
172 287
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 292@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
293@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 294@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 295
180# we bless all objects into (empty) derived classes to force a method lookup 296# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 297# within the Safe compartment.
182for my $pkg (qw( 298for my $pkg (qw(
183 cf::global cf::attachable 299 cf::global cf::attachable
184 cf::object cf::object::player 300 cf::object cf::object::player
185 cf::client cf::player 301 cf::client cf::player
186 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
187 cf::map cf::party cf::region 304 cf::party cf::region
188)) { 305)) {
189 no strict 'refs';
190 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
191} 307}
192 308
193$Event::DIED = sub { 309$EV::DIED = sub {
194 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
195}; 311};
312
313#############################################################################
196 314
197=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
198 316
199=over 4 317=over 4
200 318
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 338 $d
221 } || "[unable to dump $_[0]: '$@']"; 339 } || "[unable to dump $_[0]: '$@']";
222} 340}
223 341
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 342=item $ref = cf::decode_json $json
227 343
228Converts a JSON string into the corresponding perl data structure. 344Converts a JSON string into the corresponding perl data structure.
229 345
230=item $json = cf::to_json $ref 346=item $json = cf::encode_json $ref
231 347
232Converts a perl data structure into its JSON representation. 348Converts a perl data structure into its JSON representation.
233 349
350=cut
351
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353
354sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) }
356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
234=item cf::lock_wait $string 371=item cf::lock_wait $string
235 372
236Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
237 374
238=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
239 376
240Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
243returned. 380returned.
244 381
382Locks are *not* recursive, locking from the same coro twice results in a
383deadlocked coro.
384
245Lock names should begin with a unique identifier (for example, cf::map::find 385Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 386uses map_find and cf::map::load uses map_load).
247 387
248=item $locked = cf::lock_active $string 388=item $locked = cf::lock_active $string
249 389
250Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
251 391
252=cut 392=cut
253 393
254our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
255 395
256sub lock_wait($) { 396sub lock_wait($) {
257 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
258
259 # wait for lock, if any
260 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule;
263 }
264} 398}
265 399
266sub lock_acquire($) { 400sub lock_acquire($) {
267 my ($key) = @_; 401 $LOCKS->guard ($_[0])
268
269 # wait, to be sure we are not locked
270 lock_wait $key;
271
272 $LOCK{$key} = [];
273
274 Coro::guard {
275 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} };
277 }
278} 402}
279 403
280sub lock_active($) { 404sub lock_active($) {
281 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
282
283 ! ! $LOCK{$key}
284} 406}
285 407
286sub freeze_mainloop { 408sub freeze_mainloop {
287 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
288 410
289 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
290 $TICK_WATCHER->start; 412}
413
414=item cf::periodic $interval, $cb
415
416Like EV::periodic, but randomly selects a starting point so that the actions
417get spread over time.
418
419=cut
420
421sub periodic($$) {
422 my ($interval, $cb) = @_;
423
424 my $start = rand List::Util::min 180, $interval;
425
426 EV::periodic $start, $interval, 0, $cb
427}
428
429=item cf::get_slot $time[, $priority[, $name]]
430
431Allocate $time seconds of blocking CPU time at priority C<$priority>:
432This call blocks and returns only when you have at least C<$time> seconds
433of cpu time till the next tick. The slot is only valid till the next cede.
434
435The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class.
437
438Useful for short background jobs.
439
440=cut
441
442our @SLOT_QUEUE;
443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
445
446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
447$SLOT_QUEUE = Coro::async {
448 $Coro::current->desc ("timeslot manager");
449
450 my $signal = new Coro::Signal;
451 my $busy;
452
453 while () {
454 next_job:
455
456 my $avail = cf::till_tick;
457
458 for (0 .. $#SLOT_QUEUE) {
459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
461 my $job = splice @SLOT_QUEUE, $_, 1, ();
462 $job->[2]->send;
463 Coro::cede;
464 goto next_job;
465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467 }
468 }
469
470 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal;
473 $signal->wait;
474 } else {
475 $busy = 0;
476 Coro::schedule;
477 }
291 }; 478 }
292 $TICK_WATCHER->stop; 479};
293 $guard 480
481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
484 my ($time, $pri, $name) = @_;
485
486 $time = clamp $time, 0.01, $TICK * .6;
487
488 my $sig = new Coro::Signal;
489
490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
492 $SLOT_QUEUE->ready;
493 $sig->wait;
294} 494}
295 495
296=item cf::async { BLOCK } 496=item cf::async { BLOCK }
297 497
298Currently the same as Coro::async_pool, meaning you cannot use 498Currently the same as Coro::async_pool, meaning you cannot use
303 503
304BEGIN { *async = \&Coro::async_pool } 504BEGIN { *async = \&Coro::async_pool }
305 505
306=item cf::sync_job { BLOCK } 506=item cf::sync_job { BLOCK }
307 507
308The design of crossfire+ requires that the main coro ($Coro::main) is 508The design of Deliantra requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 509is always able to handle events or runnable, as Deliantra is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 510partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
511acceptable.
311 512
312If it must be done, put the blocking parts into C<sync_job>. This will run 513If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 514the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 515server will be frozen during this time, so the block should either finish
315fast or be very important. 516fast or be very important.
317=cut 518=cut
318 519
319sub sync_job(&) { 520sub sync_job(&) {
320 my ($job) = @_; 521 my ($job) = @_;
321 522
322 if ($Coro::current == $Coro::main) { 523 if (in_main) {
524 my $time = AE::time;
525
323 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
325 528
326 # TODO: use suspend/resume instead 529 #LOG llevError, Carp::longmess "sync job";#d#
327 # (but this is cancel-safe) 530
328 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
329 532
330 my $busy = 1; 533 my $busy = 1;
331 my @res; 534 my @res;
332 535
333 (async { 536 (async {
537 $Coro::current->desc ("sync job coro");
334 @res = eval { $job->() }; 538 @res = eval { $job->() };
335 warn $@ if $@; 539 error $@ if $@;
336 undef $busy; 540 undef $busy;
337 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
338 542
339 while ($busy) { 543 while ($busy) {
340 Coro::cede or Event::one_event; 544 if (Coro::nready) {
545 Coro::cede_notself;
546 } else {
547 EV::loop EV::LOOP_ONESHOT;
341 } 548 }
549 }
550
551 my $time = AE::time - $time;
552
553 $TICK_START += $time; # do not account sync jobs to server load
342 554
343 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
344 } else { 556 } else {
345 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
346 558
366 $EXT_CORO{$coro+0} = $coro; 578 $EXT_CORO{$coro+0} = $coro;
367 579
368 $coro 580 $coro
369} 581}
370 582
371sub write_runtime { 583=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 584
374 my $runtime = "$LOCALDIR/runtime"; 585Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling.
375 589
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 590=cut
377 or return;
378 591
379 my $value = $cf::RUNTIME + 90 + 10; 592sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 593 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 594
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 595 # we seemingly have to make a local copy of the whole thing,
384 and return; 596 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious)
385 598
386 # always fsync - this file is important 599 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 600 reset_signals;
388 and return; 601 &$cb
602 }, @args;
389 603
390 close $fh 604 wantarray ? @res : $res[-1]
391 or return; 605}
392 606
393 aio_rename "$runtime~", $runtime 607sub objinfo {
394 and return;
395
396 1 608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
645=item $value = cf::db_get $family => $key
646
647Returns a single value from the environment database.
648
649=item cf::db_put $family => $key => $value
650
651Stores the given C<$value> in the family. It can currently store binary
652data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
653
654=item $db = cf::db_table "name"
655
656Create and/or open a new database table. The string must not be "db" and must be unique
657within each server.
658
659=cut
660
661sub db_table($) {
662 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 $!;
675 };
676 cf::cleanup "db_open(db): $@" if $@;
677
678 $db
679}
680
681our $DB;
682
683sub db_init {
684 $DB ||= db_table "db";
685}
686
687sub db_get($$) {
688 my $key = "$_[0]/$_[1]";
689
690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
693 BDB::db_get $DB, undef, $key, my $data;
694
695 $! ? ()
696 : $data
697}
698
699sub db_put($$$) {
700 BDB::dbreq_pri 4;
701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
702}
703
704=item cf::cache $id => [$paths...], $processversion => $process
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;
769 }
770
771 db_get cache => "$id/data"
397} 772}
398 773
399=item cf::datalog type => key => value, ... 774=item cf::datalog type => key => value, ...
400 775
401Log 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.
402 777
403=cut 778=cut
404 779
405sub datalog($@) { 780sub datalog($@) {
406 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
407 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
408} 783}
409 784
410=back 785=back
411 786
412=cut 787=cut
413 788
414############################################################################# 789#############################################################################
415 790
416=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
417 792
418Many 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
419attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
421 796
422In 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>
423C<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
424crossfire+). 799Deliantra).
425 800
426=over 4 801=over 4
427 802
428=item $attachable->attach ($attachment, key => $value...) 803=item $attachable->attach ($attachment, key => $value...)
429 804
473=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
474 849
475Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
476given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
477 852
478Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
479that 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.
480 855
481These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
482 857
483=over 4 858=over 4
592 $registry = $CB_TYPE[$object_type] ||= []; 967 $registry = $CB_TYPE[$object_type] ||= [];
593 968
594 } elsif ($type eq "subtype") { 969 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 970 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 971 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 972 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 973
599 } elsif ($type eq "package") { 974 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 975 my $pkg = shift @arg;
601 976
602 while (my ($name, $id) = each %cb_id) { 977 while (my ($name, $id) = each %cb_id) {
607 982
608 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
609 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
610 985
611 } elsif (ref $type) { 986 } elsif (ref $type) {
612 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
613 988
614 } else { 989 } else {
615 shift @arg; 990 shift @arg;
616 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
617 } 992 }
618 } 993 }
619} 994}
620 995
621sub _object_attach { 996sub _object_attach {
631 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
632 } 1007 }
633 1008
634 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
635 } else { 1010 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
637 } 1012 }
638 1013
639 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
640} 1015}
641 1016
643 if (ref $_[0]) { 1018 if (ref $_[0]) {
644 _object_attach @_; 1019 _object_attach @_;
645 } else { 1020 } else {
646 _attach shift->_attach_registry, @_; 1021 _attach shift->_attach_registry, @_;
647 } 1022 }
1023 _recalc_want;
648}; 1024};
649 1025
650# all those should be optimised 1026# all those should be optimised
651sub cf::attachable::detach { 1027sub cf::attachable::detach {
652 my ($obj, $name) = @_; 1028 my ($obj, $name) = @_;
655 delete $obj->{_attachment}{$name}; 1031 delete $obj->{_attachment}{$name};
656 reattach ($obj); 1032 reattach ($obj);
657 } else { 1033 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 1034 Carp::croak "cannot, currently, detach class attachments";
659 } 1035 }
1036 _recalc_want;
660}; 1037};
661 1038
662sub cf::attachable::attached { 1039sub cf::attachable::attached {
663 my ($obj, $name) = @_; 1040 my ($obj, $name) = @_;
664 1041
679 "; 1056 ";
680 die if $@; 1057 die if $@;
681} 1058}
682 1059
683our $override; 1060our $override;
684our @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?
685 1062
686sub override { 1063sub override {
687 $override = 1; 1064 $override = 1;
688 @invoke_results = (); 1065 @INVOKE_RESULTS = (@_);
689} 1066}
690 1067
691sub do_invoke { 1068sub do_invoke {
692 my $event = shift; 1069 my $event = shift;
693 my $callbacks = shift; 1070 my $callbacks = shift;
694 1071
695 @invoke_results = (); 1072 @INVOKE_RESULTS = ();
696 1073
697 local $override; 1074 local $override;
698 1075
699 for (@$callbacks) { 1076 for (@$callbacks) {
700 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
701 1078
702 if ($@) { 1079 if ($@) {
703 warn "$@";
704 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
705 override; 1081 override;
706 } 1082 }
707 1083
708 return 1 if $override; 1084 return 1 if $override;
709 } 1085 }
710 1086
711 0 1087 0
712} 1088}
713 1089
714=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1090=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
715 1091
716=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1092=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
717 1093
718Generate an object-specific event with the given arguments. 1094Generate an object-specific event with the given arguments.
719 1095
720This 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
721removed 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
722results (if you must, access C<@cf::invoke_results> directly). 1098results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 1099
724=back 1100=back
725 1101
726=cut 1102=cut
727 1103
728############################################################################# 1104#############################################################################
729# 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}
730 1148
731sub reattach { 1149sub reattach {
732 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 1151 my ($obj) = @_;
734 1152
1153 # no longer needed after getting rid of delete_package?
735 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
736 1155
737 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
738 1157
739 @$registry = (); 1158 @$registry = ();
740 1159
745 for (@$attach) { 1164 for (@$attach) {
746 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
747 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
748 } 1167 }
749 } else { 1168 } else {
750 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
751 } 1170 }
752 } 1171 }
753} 1172}
754 1173
755cf::attachable->attach ( 1174cf::attachable->attach (
756 prio => -1000000, 1175 prio => -1000000,
757 on_instantiate => sub { 1176 on_instantiate => sub {
758 my ($obj, $data) = @_; 1177 my ($obj, $data) = @_;
759 1178
760 $data = from_json $data; 1179 $data = decode_json $data;
761 1180
762 for (@$data) { 1181 for (@$data) {
763 my ($name, $args) = @$_; 1182 my ($name, $args) = @$_;
764 1183
765 $obj->attach ($name, %{$args || {} }); 1184 $obj->attach ($name, %{$args || {} });
781sub object_freezer_save { 1200sub object_freezer_save {
782 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
783 1202
784 sync_job { 1203 sync_job {
785 if (length $$rdata) { 1204 if (length $$rdata) {
1205 utf8::decode (my $decname = $filename);
786 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
787 $filename, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
788 1209
789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
790 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
791 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
792 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 }
793 close $fh; 1217 aio_close $fh;
794 1218
795 if (@$objs) { 1219 if (@$objs) {
796 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) {
797 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
798 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
799 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
800 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 }
801 close $fh; 1228 aio_close $fh;
802 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
803 } 1230 }
804 } else { 1231 } else {
805 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
806 } 1233 }
807 1234
808 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
809 } else { 1239 } else {
810 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
811 } 1241 }
812 } else { 1242 } else {
813 aio_unlink $filename; 1243 aio_unlink $filename;
814 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
815 } 1245 }
816 } 1246 };
817} 1247}
818 1248
819sub object_freezer_as_string { 1249sub object_freezer_as_string {
820 my ($rdata, $objs) = @_; 1250 my ($rdata, $objs) = @_;
821 1251
833 or return; 1263 or return;
834 1264
835 unless (aio_stat "$filename.pst") { 1265 unless (aio_stat "$filename.pst") {
836 (aio_load "$filename.pst", $av) >= 0 1266 (aio_load "$filename.pst", $av) >= 0
837 or return; 1267 or return;
1268
838 $av = eval { (Storable::thaw $av)->{objs} }; 1269 my $st = eval { Coro::Storable::thaw $av };
1270 $av = $st->{objs};
839 } 1271 }
840 1272
1273 utf8::decode (my $decname = $filename);
841 warn sprintf "loading %s (%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1277
843 return ($data, $av); 1278 ($data, $av)
844} 1279}
1280
1281=head2 COMMAND CALLBACKS
1282
1283=over 4
1284
1285=cut
845 1286
846############################################################################# 1287#############################################################################
847# command handling &c 1288# command handling &c
848 1289
849=item cf::register_command $name => \&callback($ob,$args); 1290=item cf::register_command $name => \&callback($ob,$args);
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1303 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1304}
864 1305
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1306=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1307
867Register 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.
868 1313
869If 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
870called. 1315called.
871 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
872=cut 1328=cut
873 1329
874sub register_extcmd { 1330sub register_extcmd {
875 my ($name, $cb) = @_; 1331 my ($name, $cb) = @_;
876 1332
877 $EXTCMD{$name} = $cb; 1333 $EXTCMD{$name} = $cb;
878} 1334}
879 1335
1336sub register_exticmd {
1337 my ($name, $cb) = @_;
1338
1339 $EXTICMD{$name} = $cb;
1340}
1341
1342use File::Glob ();
1343
880cf::player->attach ( 1344cf::player->attach (
881 on_command => sub { 1345 on_unknown_command => sub {
882 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
883 1347
884 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
885 or return; 1349 or return;
886 1350
891 cf::override; 1355 cf::override;
892 }, 1356 },
893 on_extcmd => sub { 1357 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1358 my ($pl, $buf) = @_;
895 1359
896 my $msg = eval { from_json $buf }; 1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1361
898 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
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1370 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1371 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1372 }
1373
1374 $pl->ext_reply ($reply, @reply)
1375 if $reply;
1376
904 } else { 1377 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1379 }
907 1380
908 cf::override; 1381 cf::override;
909 }, 1382 },
910); 1383);
911 1384
1385# "readahead" all extensions
912sub load_extension { 1386sub cache_extensions {
913 my ($path) = @_; 1387 my $grp = IO::AIO::aio_group;
914 1388
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
916 my $base = $1; 1390 for (grep /\.ext$/, @{$_[0]}) {
917 my $pkg = $1; 1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 } 1392 }
940 die $@;
941 } 1393 };
942 1394
943 push @EXTS, $pkg; 1395 $grp
944} 1396}
945 1397
946sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1401 cf::sync_job {
1402 my %todo;
1403
947 for my $ext (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1405 next unless -r $path;
949 eval { 1406
950 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 }
951 1 1470 }
952 } 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 }
953 } 1481 };
954} 1482}
955 1483
956############################################################################# 1484#############################################################################
957 1485
1486=back
1487
958=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
959 1489
960Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
961 1491
962=cut 1492=cut
963 1493
964package cf::player; 1494package cf::player;
965 1495
966use Coro::AIO; 1496use Coro::AIO;
967 1497
968=head3 cf::player 1498=head3 cf::player
969 1499
970=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}
971 1515
972=item cf::player::find $login 1516=item cf::player::find $login
973 1517
974Returns the given player object, loading it if necessary (might block). 1518Returns the given player object, loading it if necessary (might block).
975 1519
994 1538
995sub exists($) { 1539sub exists($) {
996 my ($login) = @_; 1540 my ($login) = @_;
997 1541
998 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
999 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1000} 1544}
1001 1545
1002sub find($) { 1546sub find($) {
1003 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1004 my $login = $_[0]; 1548 my $login = $_[0];
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1555 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1556 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1557 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl"; 1558 aio_unlink +(playerdir $login) . "/$login.pl";
1015 1559
1016 my $pl = load_pl path $login 1560 my $f = new_from_file cf::object::thawer path $login
1017 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;
1018 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1019 } 1569 }
1020 } 1570 }
1021} 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);
1022 1585
1023sub save($) { 1586sub save($) {
1024 my ($pl) = @_; 1587 my ($pl) = @_;
1025 1588
1026 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1031 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1032 1595
1033 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1035 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
1036 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1037 Coro::cede; 1605 cf::cede_to_tick;
1038} 1606}
1039 1607
1040sub new($) { 1608sub new($) {
1041 my ($login) = @_; 1609 my ($login) = @_;
1042 1610
1048 $cf::PLAYER{$login} = $self; 1616 $cf::PLAYER{$login} = $self;
1049 1617
1050 $self 1618 $self
1051} 1619}
1052 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
1053=item $pl->quit_character 1631=item $pl->quit_character
1054 1632
1055Nukes the player without looking back. If logged in, the connection will 1633Nukes the player without looking back. If logged in, the connection will
1056be destroyed. May block for a long time. 1634be destroyed. May block for a long time.
1057 1635
1061 my ($pl) = @_; 1639 my ($pl) = @_;
1062 1640
1063 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1064 1642
1065 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1066 $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
1067 1645
1068 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1069 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1070 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1071 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1072 1651
1073 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1074 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1110 or return []; 1689 or return [];
1111 1690
1112 my @logins; 1691 my @logins;
1113 1692
1114 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") {
1115 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1116 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1117 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1702 }
1118 1703
1119 utf8::decode $login; 1704 utf8::decode $login;
1120 push @logins, $login; 1705 push @logins, $login;
1121 } 1706 }
1122 1707
1123 \@logins 1708 \@logins
1124} 1709}
1125 1710
1126=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1127 1714
1128Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1129player. May block. 1716player. May block.
1130 1717
1131=cut 1718=cut
1149 } 1736 }
1150 1737
1151 \@paths 1738 \@paths
1152} 1739}
1153 1740
1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742
1743Expand deliantra pod fragments into protocol xml.
1744
1154=item $player->ext_reply ($msgid, %msg) 1745=item $player->ext_reply ($msgid, @msg)
1155 1746
1156Sends an ext reply to the player. 1747Sends an ext reply to the player.
1157 1748
1158=cut 1749=cut
1159 1750
1160sub ext_reply($$%) { 1751sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1752 my ($self, $id, @msg) = @_;
1162 1753
1163 $msg{msgid} = $id; 1754 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1755}
1167 1756
1168=item $player->ext_event ($type, %msg) 1757=item $player->ext_msg ($type, @msg)
1169 1758
1170Sends an ext event to the client. 1759Sends an ext event to the client.
1171 1760
1172=cut 1761=cut
1173 1762
1174sub ext_event($$%) { 1763sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1764 my ($self, $type, @msg) = @_;
1176 1765
1177 $self->ns->ext_event ($type, %msg); 1766 $self->ns->ext_msg ($type, @msg);
1178} 1767}
1179 1768
1180=head3 cf::region 1769=head3 cf::region
1181 1770
1182=over 4 1771=over 4
1185 1774
1186package cf::region; 1775package cf::region;
1187 1776
1188=item cf::region::find_by_path $path 1777=item cf::region::find_by_path $path
1189 1778
1190Tries 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.
1191 1780
1192=cut 1781=cut
1193 1782
1194sub find_by_path($) { 1783sub find_by_path($) {
1195 my ($path) = @_; 1784 my ($path) = @_;
1196 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1197 my ($match, $specificity); 1788 my ($match, $specificity);
1198 1789
1199 for my $region (list) { 1790 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1793 if $region->specificity > $specificity;
1203 } 1794 }
1204 } 1795 }
1205 1796
1226our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1227our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1228 1819
1229sub generate_random_map { 1820sub generate_random_map {
1230 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
1231 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1232 $self->_create_random_map ( 1826 $self->_create_random_map (
1233 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1234 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1235 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1236 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1237 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1238 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1239 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1261 1855
1262 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1263} 1857}
1264 1858
1265# also paths starting with '/' 1859# also paths starting with '/'
1266$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1267 1861
1268sub thawer_merge { 1862sub thawer_merge {
1269 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1270 1864
1271 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
1272 local $self->{path}; 1866 local $self->{path};
1273 local $self->{load_path}; 1867 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1868
1277 $self->SUPER::thawer_merge ($merge); 1869 $self->SUPER::thawer_merge ($merge);
1278} 1870}
1279 1871
1280sub normalise { 1872sub normalise {
1327 $self->init; # pass $1 etc. 1919 $self->init; # pass $1 etc.
1328 return $self; 1920 return $self;
1329 } 1921 }
1330 } 1922 }
1331 1923
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1924 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1925 ()
1334} 1926}
1335 1927
1336sub init { 1928sub init {
1337 my ($self) = @_; 1929 my ($self) = @_;
1359 1951
1360# the temporary/swap location 1952# the temporary/swap location
1361sub save_path { 1953sub save_path {
1362 my ($self) = @_; 1954 my ($self) = @_;
1363 1955
1364 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1365 "$TMPDIR/$path.map" 1957 "$TMPDIR/$path.map"
1366} 1958}
1367 1959
1368# the unique path, undef == no special unique path 1960# the unique path, undef == no special unique path
1369sub uniq_path { 1961sub uniq_path {
1370 my ($self) = @_; 1962 my ($self) = @_;
1371 1963
1372 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1964 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1373 "$UNIQUEDIR/$path" 1965 "$UNIQUEDIR/$path"
1374} 1966}
1375 1967
1376# and all this just because we cannot iterate over 1968sub decay_objects {
1377# all maps in C++...
1378sub change_all_map_light {
1379 my ($change) = @_; 1969 my ($self) = @_;
1380 1970
1381 $_->change_map_light ($change) 1971 return if $self->{deny_reset};
1382 for grep $_->outdoor, values %cf::MAP; 1972
1973 $self->do_decay_objects;
1383} 1974}
1384 1975
1385sub unlink_save { 1976sub unlink_save {
1386 my ($self) = @_; 1977 my ($self) = @_;
1387 1978
1392 1983
1393sub load_header_from($) { 1984sub load_header_from($) {
1394 my ($self, $path) = @_; 1985 my ($self, $path) = @_;
1395 1986
1396 utf8::encode $path; 1987 utf8::encode $path;
1397 #aio_open $path, O_RDONLY, 0 1988 my $f = new_from_file cf::object::thawer $path
1398 # or return;
1399
1400 $self->_load_header ($path)
1401 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;
1402 1996
1403 $self->{load_path} = $path; 1997 $self->{load_path} = $path;
1404 1998
1405 1 1999 1
1406} 2000}
1445 $self->load_header_orig 2039 $self->load_header_orig
1446 or return; 2040 or return;
1447 $self->prepare_orig; 2041 $self->prepare_orig;
1448 } 2042 }
1449 2043
2044 $self->{deny_reset} = 1
2045 if $self->no_reset;
2046
1450 $self->default_region (cf::region::find_by_path $self->{path}) 2047 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 2048 unless $self->default_region;
1452 2049
1453 1 2050 1
1454} 2051}
1457sub find { 2054sub find {
1458 my ($path, $origin) = @_; 2055 my ($path, $origin) = @_;
1459 2056
1460 $path = normalise $path, $origin && $origin->path; 2057 $path = normalise $path, $origin && $origin->path;
1461 2058
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1462 cf::lock_wait "map_find:$path"; 2060 my $guard2 = cf::lock_acquire "map_find:$path";
1463 2061
1464 $cf::MAP{$path} || do { 2062 $cf::MAP{$path} || do {
1465 my $guard = cf::lock_acquire "map_find:$path";
1466 my $map = new_from_path cf::map $path 2063 my $map = new_from_path cf::map $path
1467 or return; 2064 or return;
1468 2065
1469 $map->{last_save} = $cf::RUNTIME; 2066 $map->{last_save} = $cf::RUNTIME;
1470 2067
1471 $map->load_header 2068 $map->load_header
1472 or return; 2069 or return;
1473 2070
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2071 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 2072 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 2073 #$cf::WAIT_FOR_TICK->wait;
2074 undef $guard2;
2075 undef $guard1;
1477 $map->reset; 2076 $map->reset;
1478 undef $guard;
1479 return find $path; 2077 return find $path;
1480 } 2078 }
1481 2079
1482 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
1483 } 2081 }
1484} 2082}
1485 2083
1486sub pre_load { } 2084sub pre_load { }
1487sub post_load { } 2085#sub post_load { } # XS
1488 2086
1489sub load { 2087sub load {
1490 my ($self) = @_; 2088 my ($self) = @_;
1491 2089
1492 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
1493 2091
1494 my $path = $self->{path}; 2092 my $path = $self->{path};
2093
2094 {
1495 my $guard = cf::lock_acquire "map_load:$path"; 2095 my $guard = cf::lock_acquire "map_data:$path";
1496 2096
2097 return unless $self->valid;
1497 return if $self->in_memory != cf::MAP_SWAPPED; 2098 return unless $self->in_memory == cf::MAP_SWAPPED;
1498 2099
1499 $self->in_memory (cf::MAP_LOADING); 2100 $self->in_memory (cf::MAP_LOADING);
1500 2101
1501 $self->alloc; 2102 $self->alloc;
1502 2103
1503 $self->pre_load; 2104 $self->pre_load;
1504 Coro::cede; 2105 cf::cede_to_tick;
1505 2106
1506 $self->_load_objects ($self->{load_path}, 1) 2107 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block;
2109 $self->_load_objects ($f)
1507 or return; 2110 or return;
1508 2111
1509 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2112 $self->post_load_original
1510 if delete $self->{load_original}; 2113 if delete $self->{load_original};
1511 2114
1512 if (my $uniq = $self->uniq_path) { 2115 if (my $uniq = $self->uniq_path) {
1513 utf8::encode $uniq; 2116 utf8::encode $uniq;
1514 if (aio_open $uniq, O_RDONLY, 0) { 2117 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) {
1515 $self->clear_unique_items; 2119 $self->clear_unique_items;
1516 $self->_load_objects ($uniq, 0); 2120 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs;
2122 }
1517 } 2123 }
1518 } 2124 }
1519 2125
1520 Coro::cede; 2126 $f->resolve_delayed_derefs;
2127
2128 cf::cede_to_tick;
1521 # now do the right thing for maps 2129 # now do the right thing for maps
1522 $self->link_multipart_objects; 2130 $self->link_multipart_objects;
1523 Coro::cede;
1524
1525 unless ($self->{deny_activate}) {
1526 $self->decay_objects;
1527 $self->fix_auto_apply;
1528 $self->update_buttons;
1529 Coro::cede;
1530 $self->set_darkness_map;
1531 $self->difficulty ($self->estimate_difficulty) 2131 $self->difficulty ($self->estimate_difficulty)
1532 unless $self->difficulty; 2132 unless $self->difficulty;
1533 Coro::cede; 2133 cf::cede_to_tick;
2134
2135 unless ($self->{deny_activate}) {
2136 $self->decay_objects;
2137 $self->fix_auto_apply;
2138 $self->update_buttons;
2139 cf::cede_to_tick;
1534 $self->activate; 2140 $self->activate;
1535 Coro::cede; 2141 }
2142
2143 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
1536 } 2147 }
1537 2148
1538 $self->post_load; 2149 $self->post_load;
1539 Coro::cede;
1540
1541 $self->in_memory (cf::MAP_IN_MEMORY);
1542} 2150}
1543 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
1544sub customise_for { 2155sub customise_for {
1545 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
1546 2157
1547 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
1548 if $self->per_player; 2159 if $self->per_player;
1549 2160
2161# return find "?party/" . $ob->name . "/" . $self->{path}
2162# if $self->per_party;
2163
1550 $self 2164 $self
1551} 2165}
1552 2166
1553# 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
1554sub load_diag { 2168sub load_neighbours {
1555 my ($map) = @_; 2169 my ($map) = @_;
1556 2170
1557 my @diag; # diagonal neighbours 2171 my @neigh; # diagonal neighbours
1558 2172
1559 for (0 .. 3) { 2173 for (0 .. 3) {
1560 my $neigh = $map->tile_path ($_) 2174 my $neigh = $map->tile_path ($_)
1561 or next; 2175 or next;
1562 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
1563 or next; 2177 or next;
1564 $neigh->load; 2178 $neigh->load;
1565 2179
2180 # now find the diagonal neighbours
2181 push @neigh,
1566 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1567 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1568 } 2184 }
1569 2185
1570 for (@diag) { 2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
1571 my $neigh = find @$_ 2188 my $neigh = find $path, $origin
1572 or next; 2189 or next;
1573 $neigh->load; 2190 $neigh->load;
1574 } 2191 }
1575} 2192}
1576 2193
1577sub find_sync { 2194sub find_sync {
1578 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
1579 2196
1580 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
1581} 2201}
1582 2202
1583sub do_load_sync { 2203sub do_load_sync {
1584 my ($map) = @_; 2204 my ($map) = @_;
1585 2205
1586 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;
1587} 2210}
1588 2211
1589our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
1590our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
1591 2214
1592sub find_async { 2215sub find_async {
1593 my ($path, $origin) = @_; 2216 my ($path, $origin, $load) = @_;
1594 2217
1595 $path = normalise $path, $origin && $origin->{path}; 2218 $path = normalise $path, $origin && $origin->{path};
1596 2219
1597 if (my $map = $cf::MAP{$path}) { 2220 if (my $map = $cf::MAP{$path}) {
1598 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1599 } 2222 }
1600 2223
1601 undef $MAP_PREFETCH{$path}; 2224 $MAP_PREFETCH{$path} |= $load;
2225
1602 $MAP_PREFETCHER ||= cf::async { 2226 $MAP_PREFETCHER ||= cf::async {
2227 $Coro::current->{desc} = "map prefetcher";
2228
1603 while (%MAP_PREFETCH) { 2229 while (%MAP_PREFETCH) {
1604 for my $path (keys %MAP_PREFETCH) { 2230 while (my ($k, $v) = each %MAP_PREFETCH) {
1605 my $map = find $path 2231 if (my $map = find $k) {
1606 or next;
1607 $map->load; 2232 $map->load if $v;
2233 }
1608 2234
1609 delete $MAP_PREFETCH{$path}; 2235 delete $MAP_PREFETCH{$k};
1610 } 2236 }
1611 } 2237 }
1612 undef $MAP_PREFETCHER; 2238 undef $MAP_PREFETCHER;
1613 }; 2239 };
1614 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
1615 2241
1616 () 2242 ()
1617} 2243}
1618 2244
2245# common code, used by both ->save and ->swapout
1619sub save { 2246sub _save {
1620 my ($self) = @_; 2247 my ($self) = @_;
1621
1622 my $lock = cf::lock_acquire "map_data:" . $self->path;
1623 2248
1624 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
1625 2250
1626 return unless $self->dirty; 2251 return unless $self->dirty;
1627 2252
1633 return if $self->{deny_save}; 2258 return if $self->{deny_save};
1634 2259
1635 local $self->{last_access} = $self->last_access;#d# 2260 local $self->{last_access} = $self->last_access;#d#
1636 2261
1637 cf::async { 2262 cf::async {
2263 $Coro::current->{desc} = "map player save";
1638 $_->contr->save for $self->players; 2264 $_->contr->save for $self->players;
1639 }; 2265 };
2266
2267 cf::get_slot 0.02;
1640 2268
1641 if ($uniq) { 2269 if ($uniq) {
1642 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2270 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1643 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2271 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1644 } else { 2272 } else {
1645 $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);
1646 } 2274 }
1647} 2275}
1648 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
1649sub swap_out { 2285sub swap_out {
1650 my ($self) = @_; 2286 my ($self) = @_;
1651 2287
1652 # save first because save cedes
1653 $self->save;
1654
1655 my $lock = cf::lock_acquire "map_data:" . $self->path; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
1656 2289
2290 return if $self->in_memory != cf::MAP_ACTIVE;
2291 return if $self->{deny_save};
1657 return if $self->players; 2292 return if $self->players;
1658 return if $self->in_memory != cf::MAP_IN_MEMORY;
1659 return if $self->{deny_save};
1660 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
1661 $self->clear; 2303 $self->clear;
1662 $self->in_memory (cf::MAP_SWAPPED);
1663} 2304}
1664 2305
1665sub reset_at { 2306sub reset_at {
1666 my ($self) = @_; 2307 my ($self) = @_;
1667 2308
1668 # TODO: safety, remove and allow resettable per-player maps 2309 # TODO: safety, remove and allow resettable per-player maps
1669 return 1e99 if $self->isa ("ext::map_per_player");#d#
1670 return 1e99 if $self->{deny_reset}; 2310 return 1e99 if $self->{deny_reset};
1671 2311
1672 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1673 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;
1674 2314
1685 my ($self) = @_; 2325 my ($self) = @_;
1686 2326
1687 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
1688 2328
1689 return if $self->players; 2329 return if $self->players;
1690 return if $self->isa ("ext::map_per_player");#d#
1691 2330
1692 warn "resetting map ", $self->path;#d# 2331 cf::trace "resetting map ", $self->path, "\n";
1693 2332
1694 $self->in_memory (cf::MAP_SWAPPED); 2333 $self->in_memory (cf::MAP_SWAPPED);
1695 2334
1696 # need to save uniques path 2335 # need to save uniques path
1697 unless ($self->{deny_save}) { 2336 unless ($self->{deny_save}) {
1701 if $uniq; 2340 if $uniq;
1702 } 2341 }
1703 2342
1704 delete $cf::MAP{$self->path}; 2343 delete $cf::MAP{$self->path};
1705 2344
2345 $self->deactivate;
2346 $_->clear_links_to ($self) for values %cf::MAP;
1706 $self->clear; 2347 $self->clear;
1707
1708 $_->clear_links_to ($self) for values %cf::MAP;
1709 2348
1710 $self->unlink_save; 2349 $self->unlink_save;
1711 $self->destroy; 2350 $self->destroy;
1712} 2351}
1713 2352
1714my $nuke_counter = "aaaa"; 2353my $nuke_counter = "aaaa";
1715 2354
1716sub nuke { 2355sub nuke {
1717 my ($self) = @_; 2356 my ($self) = @_;
1718 2357
2358 {
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
1719 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
1720 2362
1721 $self->unlink_save; 2363 $self->unlink_save;
1722 2364
1723 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
1724 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
1725 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
1726 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
1727 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1728 2370
1729 $cf::MAP{$self->path} = $self; 2371 $cf::MAP{$self->path} = $self;
2372 }
1730 2373
1731 $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 ]
1732} 2411}
1733 2412
1734=item cf::map::unique_maps 2413=item cf::map::unique_maps
1735 2414
1736Returns an arrayref of paths of all shared maps that have 2415Returns an arrayref of paths of all shared maps that have
1737instantiated unique items. May block. 2416instantiated unique items. May block.
1738 2417
1739=cut 2418=cut
1740 2419
1741sub unique_maps() { 2420sub unique_maps() {
1742 my $files = aio_readdir $UNIQUEDIR 2421 [
1743 or return; 2422 map {
1744
1745 my @paths;
1746
1747 for (@$files) {
1748 utf8::decode $_; 2423 utf8::decode $_;
1749 next if /\.pst$/; 2424 s/\.map$//; # TODO future compatibility hack
1750 next unless /^$PATH_SEP/o; 2425 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1751 2426 ? ()
1752 push @paths, cf::map::normalise $_; 2427 : normalise $_
2428 } @{ aio_readdir $UNIQUEDIR or [] }
1753 } 2429 ]
1754
1755 \@paths
1756} 2430}
1757 2431
1758package 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}
1759 2463
1760=back 2464=back
1761 2465
1762=head3 cf::object 2466=head3 cf::object
1763 2467
1767 2471
1768=over 4 2472=over 4
1769 2473
1770=item $ob->inv_recursive 2474=item $ob->inv_recursive
1771 2475
1772Returns 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.
1773 2478
1774=cut 2479=cut
1775 2480
1776sub inv_recursive_; 2481sub inv_recursive_;
1777sub inv_recursive_ { 2482sub inv_recursive_ {
1780 2485
1781sub inv_recursive { 2486sub inv_recursive {
1782 inv_recursive_ inv $_[0] 2487 inv_recursive_ inv $_[0]
1783} 2488}
1784 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
1785package cf; 2518package cf;
1786 2519
1787=back 2520=back
1788 2521
1789=head3 cf::object::player 2522=head3 cf::object::player
1795Sends 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>
1796can 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
1797dialogue with the given NPC character. 2530dialogue with the given NPC character.
1798 2531
1799=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};
1800 2547
1801# rough implementation of a future "reply" method that works 2548# rough implementation of a future "reply" method that works
1802# with dialog boxes. 2549# with dialog boxes.
1803#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
1804sub cf::object::player::reply($$$;$) { 2551sub cf::object::player::reply($$$;$) {
1806 2553
1807 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2554 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1808 2555
1809 if ($self->{record_replies}) { 2556 if ($self->{record_replies}) {
1810 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2557 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2558
1811 } 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 {
1812 $msg = $npc->name . " says: $msg" if $npc; 2567 $msg = $npc->name . " says: $msg" if $npc;
1813 $self->message ($msg, $flags); 2568 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2569 }
1814 } 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 (@_);
1815} 2581}
1816 2582
1817=item $player_object->may ("access") 2583=item $player_object->may ("access")
1818 2584
1819Returns wether the given player is authorized to access resource "access" 2585Returns wether the given player is authorized to access resource "access"
1832 2598
1833=item $player_object->enter_link 2599=item $player_object->enter_link
1834 2600
1835Freezes 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}>).
1836 2602
1837The 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.
1838I<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.
1839 2607
1840Will never block. 2608Will never block.
1841 2609
1842=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
1843 2611
1863sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
1864 my ($self) = @_; 2632 my ($self) = @_;
1865 2633
1866 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
1867 2635
2636 ++$self->{_link_recursion};
2637
1868 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
1869 2639
1870 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1871 if $self->map; 2641 if $self->map && $self->map->{path} ne "{link}";
1872 2642
1873 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1874} 2644}
1875 2645
1876sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
1877 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2648
2649 return unless $self->contr->active;
1878 2650
1879 my $link_pos = delete $self->{_link_pos}; 2651 my $link_pos = delete $self->{_link_pos};
1880 2652
1881 unless ($map) { 2653 unless ($map) {
1882 # restore original map position 2654 # restore original map position
1893 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
1894 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
1895 2667
1896 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
1897 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
1898 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
1899 2671
1900 $map->load; 2672 $map->load;
1901 $map->load_diag; 2673 $map->load_neighbours;
1902 2674
1903 return unless $self->contr->active; 2675 return unless $self->contr->active;
1904 $self->activate_recursive;
1905 2676
1906 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1907 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
1908} 2679 # entering was successful
1909 2680 delete $self->{_link_recursion};
1910cf::player->attach ( 2681 # only activate afterwards, to support waiting in hooks
1911 on_logout => sub { 2682 $self->activate_recursive;
1912 my ($pl) = @_;
1913
1914 # abort map switching before logout
1915 if ($pl->ob->{_link_pos}) {
1916 cf::sync_job {
1917 $pl->ob->leave_link
1918 };
1919 }
1920 }, 2683 }
1921 on_login => sub {
1922 my ($pl) = @_;
1923 2684
1924 # try to abort aborted map switching on player login :) 2685}
1925 # should happen only on crashes
1926 if ($pl->ob->{_link_pos}) {
1927 $pl->ob->enter_link;
1928 (async {
1929 $pl->ob->reply (undef,
1930 "There was an internal problem at your last logout, "
1931 . "the server will try to bring you to your intended destination in a second.",
1932 cf::NDI_RED);
1933 # we need this sleep as the login has a concurrent enter_exit running
1934 # and this sleep increases chances of the player not ending up in scorn
1935 Coro::Timer::sleep 1;
1936 $pl->ob->leave_link;
1937 })->prio (2);
1938 }
1939 },
1940);
1941 2686
1942=item $player_object->goto ($path, $x, $y) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1943 2688
2689Moves the player to the given map-path and coordinates by first freezing
2690her, loading and preparing them map, calling the provided $check callback
2691that has to return the map if sucecssful, and then unfreezes the player on
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 >>.
2697
1944=cut 2698=cut
2699
2700our $GOTOGEN;
1945 2701
1946sub cf::object::player::goto { 2702sub cf::object::player::goto {
1947 my ($self, $path, $x, $y) = @_; 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 }
2710
2711 # do generation counting so two concurrent goto's will be executed in-order
2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1948 2713
1949 $self->enter_link; 2714 $self->enter_link;
1950 2715
1951 (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
1952 my $map = eval { 2738 my $map = eval {
1953 my $map = cf::map::find $path; 2739 my $map = defined $path ? cf::map::find $path : undef;
2740
2741 if ($map) {
1954 $map = $map->customise_for ($self) if $map; 2742 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else {
2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2746 }
2747
1955 $map 2748 $map
2749 };
2750
2751 if ($@) {
2752 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2753 LOG llevError | logBacktrace, Carp::longmess $@;
1956 } or 2754 }
1957 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1958 2755
2756 if ($gen == $self->{_goto_generation}) {
2757 delete $self->{_goto_generation};
1959 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2759 }
2760
2761 $done->($self) if $done;
1960 })->prio (1); 2762 })->prio (1);
1961} 2763}
1962 2764
1963=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
1964 2766
1984} 2786}
1985 2787
1986sub prepare_random_map { 2788sub prepare_random_map {
1987 my ($exit) = @_; 2789 my ($exit) = @_;
1988 2790
1989 my $guard = cf::lock_acquire "exit_prepare:$exit";
1990
1991 # all this does is basically replace the /! path by 2791 # all this does is basically replace the /! path by
1992 # a new random map path (?random/...) with a seed 2792 # a new random map path (?random/...) with a seed
1993 # that depends on the exit object 2793 # that depends on the exit object
1994 2794
1995 my $rmp = parse_random_map_params $exit->msg; 2795 my $rmp = parse_random_map_params $exit->msg;
1997 if ($exit->map) { 2797 if ($exit->map) {
1998 $rmp->{region} = $exit->region->name; 2798 $rmp->{region} = $exit->region->name;
1999 $rmp->{origin_map} = $exit->map->path; 2799 $rmp->{origin_map} = $exit->map->path;
2000 $rmp->{origin_x} = $exit->x; 2800 $rmp->{origin_x} = $exit->x;
2001 $rmp->{origin_y} = $exit->y; 2801 $rmp->{origin_y} = $exit->y;
2802
2803 $exit->map->touch;
2002 } 2804 }
2003 2805
2004 $rmp->{random_seed} ||= $exit->random_seed; 2806 $rmp->{random_seed} ||= $exit->random_seed;
2005 2807
2006 my $data = cf::to_json $rmp; 2808 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2007 my $md5 = Digest::MD5::md5_hex $data; 2809 my $md5 = Digest::MD5::md5_hex $data;
2008 my $meta = "$RANDOMDIR/$md5.meta"; 2810 my $meta = "$RANDOMDIR/$md5.meta";
2009 2811
2010 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2812 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2011 aio_write $fh, 0, (length $data), $data, 0; 2813 aio_write $fh, 0, (length $data), $data, 0;
2012 undef $fh; 2814 undef $fh;
2013 aio_rename "$meta~", $meta; 2815 aio_rename "$meta~", $meta;
2014 2816
2817 my $slaying = "?random/$md5";
2818
2819 if ($exit->valid) {
2015 $exit->slaying ("?random/$md5"); 2820 $exit->slaying ("?random/$md5");
2016 $exit->msg (undef); 2821 $exit->msg (undef);
2822 }
2017 } 2823 }
2018} 2824}
2019 2825
2020sub cf::object::player::enter_exit { 2826sub cf::object::player::enter_exit {
2021 my ($self, $exit) = @_; 2827 my ($self, $exit) = @_;
2022 2828
2023 return unless $self->type == cf::PLAYER; 2829 return unless $self->type == cf::PLAYER;
2024 2830
2025 if ($exit->slaying eq "/!") {
2026 #TODO: this should de-fi-ni-te-ly not be a sync-job
2027 # the problem is that $exit might not survive long enough
2028 # so it needs to be done right now, right here
2029 cf::sync_job { prepare_random_map $exit };
2030 }
2031
2032 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2033 my $hp = $exit->stats->hp;
2034 my $sp = $exit->stats->sp;
2035
2036 $self->enter_link; 2831 $self->enter_link;
2037 2832
2038 (async { 2833 (async {
2039 $self->deactivate_recursive; # just to be sure 2834 $Coro::current->{desc} = "enter_exit";
2835
2040 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
2041 $self->goto ($slaying, $hp, $sp); 2851 $self->goto ($map, $x, $y);
2042 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
2043 1; 2857 1
2044 }) { 2858 }) {
2045 $self->message ("Something went wrong deep within the crossfire server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2046 . "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. "
2047 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2048 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2049 2863
2050 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2051 $self->leave_link; 2865 $self->leave_link;
2052 } 2866 }
2053 })->prio (1); 2867 })->prio (1);
2054} 2868}
2055 2869
2069 2883
2070 utf8::encode $text; 2884 utf8::encode $text;
2071 $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);
2072} 2886}
2073 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
2074=item $client->ext_event ($type, %msg) 3075=item $client->ext_msg ($type, @msg)
2075 3076
2076Sends an exti event to the client. 3077Sends an ext event to the client.
2077 3078
2078=cut 3079=cut
2079 3080
2080sub cf::client::ext_event($$%) { 3081sub cf::client::ext_msg($$@) {
2081 my ($self, $type, %msg) = @_; 3082 my ($self, $type, @msg) = @_;
2082 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
2083 $msg{msgtype} = "event_$type"; 3087 push @msg, msgtype => "event_$type";
2084 $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 }
2085} 3108}
2086 3109
2087=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2088 3111
2089Queues a query to the client, calling the given callback with 3112Queues a query to the client, calling the given callback with
2090the 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>,
2091C<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>.
2092 3115
2093Queries 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
2094reliable at some point in the future. 3117become reliable at some point in the future.
2095 3118
2096=cut 3119=cut
2097 3120
2098sub cf::client::query { 3121sub cf::client::query {
2099 my ($self, $flags, $text, $cb) = @_; 3122 my ($self, $flags, $text, $cb) = @_;
2107 utf8::encode $text; 3130 utf8::encode $text;
2108 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3131 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2109 3132
2110 $self->send_packet ($self->{query_queue}[0][0]) 3133 $self->send_packet ($self->{query_queue}[0][0])
2111 if @{ $self->{query_queue} } == 1; 3134 if @{ $self->{query_queue} } == 1;
3135
3136 1
2112} 3137}
2113 3138
2114cf::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 },
2115 on_reply => sub { 3145 on_reply => sub {
2116 my ($ns, $msg) = @_; 3146 my ($ns, $msg) = @_;
2117 3147
2118 # this weird shuffling is so that direct followup queries 3148 # this weird shuffling is so that direct followup queries
2119 # get handled first 3149 # get handled first
2131 } else { 3161 } else {
2132 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3162 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2133 } 3163 }
2134 } 3164 }
2135 }, 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 },
2136); 3192);
2137 3193
2138=item $client->async (\&cb) 3194=item $client->async (\&cb)
2139 3195
2140Create a new coroutine, running the specified callback. The coroutine will 3196Create a new coroutine, running the specified callback. The coroutine will
2156 3212
2157 $coro 3213 $coro
2158} 3214}
2159 3215
2160cf::client->attach ( 3216cf::client->attach (
2161 on_destroy => sub { 3217 on_client_destroy => sub {
2162 my ($ns) = @_; 3218 my ($ns) = @_;
2163 3219
2164 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2165 }, 3221 },
2166); 3222);
2181our $safe = new Safe "safe"; 3237our $safe = new Safe "safe";
2182our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
2183 3239
2184$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
2185 3241
2186$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));
2187 3247
2188# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
2189 3249
2190=pod 3250=pod
2191 3251
2192The following functions and methods are available within a safe environment: 3252The following functions and methods are available within a safe environment:
2193 3253
2194 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
2195 cf::object::player player 3259 cf::object::player
2196 cf::player peaceful 3260 player
2197 cf::map trigger 3261
3262 cf::player
3263 peaceful
3264
3265 cf::map
3266 trigger
2198 3267
2199=cut 3268=cut
2200 3269
2201for ( 3270for (
2202 ["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)],
2203 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
2204 ["cf::player" => qw(peaceful)], 3275 ["cf::player" => qw(peaceful send_msg)],
2205 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
2206) { 3277) {
2207 no strict 'refs'; 3278 no strict 'refs';
2208 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
2209 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2227 3298
2228 my $qcode = $code; 3299 my $qcode = $code;
2229 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2230 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
2231 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
2232 local $_; 3306 local $_;
2233 local @safe::cf::_safe_eval_args = values %vars;
2234 3307
2235 my $eval = 3308 my $eval =
2236 "do {\n" 3309 "do {\n"
2237 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2238 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
2239 . $code 3312 . $code
2240 . "\n}" 3313 . "\n}"
2241 ; 3314 ;
2242 3315
3316 if ($CFG{safe_eval}) {
2243 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
2244 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2245 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 }
2246 3325
2247 if ($@) { 3326 if ($@) {
2248 warn "$@"; 3327 warn "$@",
2249 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
2250 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
2251 } 3330 }
2252 3331
2253 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
2254} 3333}
2255 3334
2269=cut 3348=cut
2270 3349
2271sub register_script_function { 3350sub register_script_function {
2272 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
2273 3352
2274 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
2275 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
2276} 3355}
2277 3356
2278=back 3357=back
2279 3358
2280=cut 3359=cut
2281
2282#############################################################################
2283
2284=head2 EXTENSION DATABASE SUPPORT
2285
2286Crossfire maintains a very simple database for extension use. It can
2287currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2288convert to/from binary).
2289
2290The parameter C<$family> should best start with the name of the extension
2291using it, it should be unique.
2292
2293=over 4
2294
2295=item $value = cf::db_get $family => $key
2296
2297Returns a single value from the database.
2298
2299=item cf::db_put $family => $key => $value
2300
2301Stores the given C<$value> in the family.
2302
2303=cut
2304
2305our $DB;
2306
2307sub db_init {
2308 unless ($DB) {
2309 $DB = BDB::db_create $DB_ENV;
2310
2311 cf::sync_job {
2312 eval {
2313 $DB->set_flags (BDB::CHKSUM);
2314
2315 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2316 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2317 cf::cleanup "db_open(db): $!" if $!;
2318 };
2319 cf::cleanup "db_open(db): $@" if $@;
2320 };
2321 }
2322}
2323
2324sub db_get($$) {
2325 my $key = "$_[0]/$_[1]";
2326
2327 cf::sync_job {
2328 BDB::db_get $DB, undef, $key, my $data;
2329
2330 $! ? ()
2331 : $data
2332 }
2333}
2334
2335sub db_put($$$) {
2336 BDB::dbreq_pri 4;
2337 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2338}
2339
2340=item cf::cache $id => [$paths...], $processversion => $process
2341
2342Generic caching function that returns the value of the resource $id,
2343caching and regenerating as required.
2344
2345This function can block.
2346
2347=cut
2348
2349sub cache {
2350 my ($id, $src, $processversion, $process) = @_;
2351
2352 my $meta =
2353 join "\x00",
2354 $processversion,
2355 map {
2356 aio_stat $_
2357 and Carp::croak "$_: $!";
2358
2359 ($_, (stat _)[7,9])
2360 } @$src;
2361
2362 my $dbmeta = db_get cache => "$id/meta";
2363 if ($dbmeta ne $meta) {
2364 # changed, we may need to process
2365
2366 my @data;
2367 my $md5;
2368
2369 for (0 .. $#$src) {
2370 0 <= aio_load $src->[$_], $data[$_]
2371 or Carp::croak "$src->[$_]: $!";
2372 }
2373
2374 # if processing is expensive, check
2375 # checksum first
2376 if (1) {
2377 $md5 =
2378 join "\x00",
2379 $processversion,
2380 map {
2381 Coro::cede;
2382 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2383 } 0.. $#$src;
2384
2385
2386 my $dbmd5 = db_get cache => "$id/md5";
2387 if ($dbmd5 eq $md5) {
2388 db_put cache => "$id/meta", $meta;
2389
2390 return db_get cache => "$id/data";
2391 }
2392 }
2393
2394 my $t1 = Time::HiRes::time;
2395 my $data = $process->(\@data);
2396 my $t2 = Time::HiRes::time;
2397
2398 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2399
2400 db_put cache => "$id/data", $data;
2401 db_put cache => "$id/md5" , $md5;
2402 db_put cache => "$id/meta", $meta;
2403
2404 return $data;
2405 }
2406
2407 db_get cache => "$id/data"
2408}
2409
2410=item fork_call { }, $args
2411
2412Executes the given code block with the given arguments in a seperate
2413process, returning the results. Everything must be serialisable with
2414Coro::Storable. May, of course, block. Note that the executed sub may
2415never block itself or use any form of Event handling.
2416
2417=cut
2418
2419sub fork_call(&@) {
2420 my ($cb, @args) = @_;
2421
2422# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2423# or die "socketpair: $!";
2424 pipe my $fh1, my $fh2
2425 or die "pipe: $!";
2426
2427 if (my $pid = fork) {
2428 close $fh2;
2429
2430 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2431 $res = Coro::Storable::thaw $res;
2432
2433 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2434
2435 die $$res unless "ARRAY" eq ref $res;
2436
2437 return wantarray ? @$res : $res->[-1];
2438 } else {
2439 local $SIG{__WARN__};
2440 eval {
2441 local $SIG{__DIE__};
2442 close $fh1;
2443
2444 my @res = eval { $cb->(@args) };
2445 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2446 };
2447
2448 warn $@ if $@;
2449 _exit 0;
2450 }
2451}
2452
2453
2454 3360
2455############################################################################# 3361#############################################################################
2456# the server's init and main functions 3362# the server's init and main functions
2457 3363
2458sub load_facedata($) { 3364sub load_facedata($) {
2459 my ($path) = @_; 3365 my ($path) = @_;
2460 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
2461 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
2462 3374
2463 my $facedata; 3375 my $facedata;
2464 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
2465 or die "$path: $!"; 3377 or die "$path: $!";
2466 3378
2467 $facedata = Coro::Storable::thaw $facedata; 3379 $facedata = Coro::Storable::thaw $facedata;
2468 3380
2469 $facedata->{version} == 2 3381 $facedata->{version} == 2
2470 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
2471 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
2472 { 3393 {
2473 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
2474 3395
2475 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
2476 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398
2477 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap};
2478 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2479 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2480 Coro::cede; 3403
3404 cf::cede_to_tick;
2481 } 3405 }
2482 3406
2483 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2484 next unless $info->{smooth}; 3408 next unless $info->{smooth};
3409
2485 my $idx = cf::face::find $face 3410 my $idx = cf::face::find $face
2486 or next; 3411 or next;
3412
2487 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3414 cf::face::set_smooth $idx, $smooth;
2488 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2489 } else { 3416 } else {
2490 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
2491 } 3418 }
2492 Coro::cede; 3419
3420 cf::cede_to_tick;
2493 } 3421 }
2494 } 3422 }
2495 3423
2496 { 3424 {
2497 my $anims = $facedata->{animinfo}; 3425 my $anims = $facedata->{animinfo};
2498 3426
2499 while (my ($anim, $info) = each %$anims) { 3427 while (my ($anim, $info) = each %$anims) {
2500 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3428 cf::anim::set $anim, $info->{frames}, $info->{facings};
2501 Coro::cede; 3429 cf::cede_to_tick;
2502 } 3430 }
2503 3431
2504 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
2505 } 3433 }
2506 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
2507 1 3454 1
2508} 3455}
2509 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
2510sub 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
2511 load_resource_file "$MAPDIR/regions" 3480 load_resource_file "$MAPDIR/regions"
2512 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 }
2513} 3487}
2514 3488
2515sub reload_facedata { 3489sub reload_facedata {
2516 load_facedata "$DATADIR/facedata" 3490 load_facedata "$DATADIR/facedata"
2517 or die "unable to load facedata\n"; 3491 or die "unable to load facedata\n";
2525sub reload_treasures { 3499sub reload_treasures {
2526 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
2527 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
2528} 3502}
2529 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
2530sub reload_resources { 3527sub reload_resources {
2531 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
2532 3529
3530 reload_facedata;
3531 reload_sound;
3532 reload_archetypes;
2533 reload_regions; 3533 reload_regions;
2534 reload_facedata;
2535 reload_archetypes;
2536 reload_treasures; 3534 reload_treasures;
2537 3535
2538 warn "finished reloading resource files\n"; 3536 trace "finished reloading resource files\n";
2539} 3537}
2540 3538
2541sub init { 3539sub reload_config {
2542 reload_resources; 3540 trace "reloading config file...\n";
2543}
2544 3541
2545sub cfg_load {
2546 open my $fh, "<:utf8", "$CONFDIR/config" 3542 open my $fh, "<:utf8", "$CONFDIR/config"
2547 or return; 3543 or return;
2548 3544
2549 local $/; 3545 local $/;
2550 *CFG = YAML::Syck::Load <$fh>; 3546 *CFG = YAML::XS::Load scalar <$fh>;
2551 3547
2552 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2553 3549
2554 $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};
2555 $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};
2556 3552
2557 if (exists $CFG{mlockall}) { 3553 if (exists $CFG{mlockall}) {
2559 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2560 and die "WARNING: m(un)lockall failed: $!\n"; 3556 and die "WARNING: m(un)lockall failed: $!\n";
2561 }; 3557 };
2562 warn $@ if $@; 3558 warn $@ if $@;
2563 } 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;
2564} 3590}
2565 3591
2566sub 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
2567 # we must not ever block the main coroutine 3602 # we must not ever block the main coroutine
2568 local $Coro::idle = sub { 3603 local $Coro::idle = sub {
2569 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#
2570 (async { 3605 (async {
2571 Event::one_event; 3606 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT;
2572 })->prio (Coro::PRIO_MAX); 3608 })->prio (Coro::PRIO_MAX);
2573 }; 3609 };
2574 3610
2575 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;
2576 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
2577 load_extensions; 3634 load_extensions;
2578 3635
2579 $TICK_WATCHER->start; 3636 utime time, time, $RUNTIMEFILE;
2580 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;
2581} 3649}
2582 3650
2583############################################################################# 3651#############################################################################
2584# initialisation and cleanup 3652# initialisation and cleanup
2585 3653
2586# install some emergency cleanup handlers 3654# install some emergency cleanup handlers
2587BEGIN { 3655BEGIN {
3656 our %SIGWATCHER = ();
2588 for my $signal (qw(INT HUP TERM)) { 3657 for my $signal (qw(INT HUP TERM)) {
2589 Event->signal ( 3658 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2590 reentrant => 0,
2591 data => WF_AUTOCANCEL,
2592 signal => $signal,
2593 prio => 0,
2594 cb => sub {
2595 cf::cleanup "SIG$signal"; 3659 cf::cleanup "SIG$signal";
2596 },
2597 ); 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
2598 } 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 };
2599} 3750}
2600 3751
2601sub emergency_save() { 3752sub emergency_save() {
2602 my $freeze_guard = cf::freeze_mainloop; 3753 my $freeze_guard = cf::freeze_mainloop;
2603 3754
2604 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;
2605 3761
2606 cf::sync_job { 3762 cf::sync_job {
3763 cf::write_runtime_sync; # external watchdog should not bark
3764
2607 # use a peculiar iteration method to avoid tripping on perl 3765 # use a peculiar iteration method to avoid tripping on perl
2608 # refcount bugs in for. also avoids problems with players 3766 # refcount bugs in for. also avoids problems with players
2609 # and maps saved/destroyed asynchronously. 3767 # and maps saved/destroyed asynchronously.
2610 warn "begin emergency player save\n"; 3768 info "emergency_perl_save: begin player save\n";
2611 for my $login (keys %cf::PLAYER) { 3769 for my $login (keys %cf::PLAYER) {
2612 my $pl = $cf::PLAYER{$login} or next; 3770 my $pl = $cf::PLAYER{$login} or next;
2613 $pl->valid or next; 3771 $pl->valid or next;
3772 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2614 $pl->save; 3773 $pl->save;
2615 } 3774 }
2616 warn "end emergency player save\n"; 3775 info "emergency_perl_save: end player save\n";
2617 3776
2618 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";
2619 for my $path (keys %cf::MAP) { 3780 for my $path (keys %cf::MAP) {
2620 my $map = $cf::MAP{$path} or next; 3781 my $map = $cf::MAP{$path} or next;
2621 $map->valid or next; 3782 $map->valid or next;
2622 $map->save; 3783 $map->save;
2623 } 3784 }
2624 warn "end emergency map save\n"; 3785 info "emergency_perl_save: end map save\n";
2625 3786
2626 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";
2627 BDB::db_env_txn_checkpoint $DB_ENV; 3790 BDB::db_env_txn_checkpoint $DB_ENV;
2628 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
2629 }; 3815 };
2630 3816
2631 warn "leave emergency perl save\n"; 3817 info "emergency_perl_save: leave\n";
2632} 3818}
2633 3819
2634sub post_cleanup { 3820sub post_cleanup {
2635 my ($make_core) = @_; 3821 my ($make_core) = @_;
2636 3822
3823 IO::AIO::flush;
3824
2637 warn Carp::longmess "post_cleanup backtrace" 3825 error Carp::longmess "post_cleanup backtrace"
2638 if $make_core; 3826 if $make_core;
3827
3828 my $fh = pidfile;
3829 unlink $PIDFILE if <$fh> == $$;
3830}
3831
3832# a safer delete_package, copied from Symbol
3833sub clear_package($) {
3834 my $pkg = shift;
3835
3836 # expand to full symbol table name if needed
3837 unless ($pkg =~ /^main::.*::$/) {
3838 $pkg = "main$pkg" if $pkg =~ /^::/;
3839 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3840 $pkg .= '::' unless $pkg =~ /::$/;
3841 }
3842
3843 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3844 my $stem_symtab = *{$stem}{HASH};
3845
3846 defined $stem_symtab and exists $stem_symtab->{$leaf}
3847 or return;
3848
3849 # clear all symbols
3850 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3851 for my $name (keys %$leaf_symtab) {
3852 _gv_clear *{"$pkg$name"};
3853# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3854 }
2639} 3855}
2640 3856
2641sub do_reload_perl() { 3857sub do_reload_perl() {
2642 # can/must only be called in main 3858 # can/must only be called in main
2643 if ($Coro::current != $Coro::main) { 3859 if (in_main) {
2644 warn "can only reload from main coroutine"; 3860 error "can only reload from main coroutine";
2645 return; 3861 return;
2646 } 3862 }
2647 3863
3864 return if $RELOAD++;
3865
3866 my $t1 = AE::time;
3867
3868 while ($RELOAD) {
2648 warn "reloading..."; 3869 info "reloading...";
2649 3870
2650 warn "entering sync_job"; 3871 trace "entering sync_job";
2651 3872
2652 cf::sync_job { 3873 cf::sync_job {
2653 cf::write_runtime; # external watchdog should not bark
2654 cf::emergency_save; 3874 cf::emergency_save;
2655 cf::write_runtime; # external watchdog should not bark
2656 3875
2657 warn "syncing database to disk";
2658 BDB::db_env_txn_checkpoint $DB_ENV;
2659
2660 # if anything goes wrong in here, we should simply crash as we already saved
2661
2662 warn "cancelling all WF_AUTOCANCEL watchers";
2663 for (Event::all_watchers) {
2664 $_->cancel if $_->data & WF_AUTOCANCEL;
2665 }
2666
2667 warn "flushing outstanding aio requests";
2668 for (;;) {
2669 BDB::flush;
2670 IO::AIO::flush;
2671 Coro::cede;
2672 last unless IO::AIO::nreqs || BDB::nreqs;
2673 warn "iterate...";
2674 }
2675
2676 ++$RELOAD;
2677
2678 warn "cancelling all extension coros"; 3876 trace "cancelling all extension coros";
2679 $_->cancel for values %EXT_CORO; 3877 $_->cancel for values %EXT_CORO;
2680 %EXT_CORO = (); 3878 %EXT_CORO = ();
2681 3879
2682 warn "removing commands"; 3880 trace "removing commands";
2683 %COMMAND = (); 3881 %COMMAND = ();
2684 3882
2685 warn "removing ext commands"; 3883 trace "removing ext/exti commands";
2686 %EXTCMD = (); 3884 %EXTCMD = ();
3885 %EXTICMD = ();
2687 3886
2688 warn "unloading/nuking all extensions"; 3887 trace "unloading/nuking all extensions";
2689 for my $pkg (@EXTS) { 3888 for my $pkg (@EXTS) {
2690 warn "... unloading $pkg"; 3889 trace "... unloading $pkg";
2691 3890
2692 if (my $cb = $pkg->can ("unload")) { 3891 if (my $cb = $pkg->can ("unload")) {
2693 eval { 3892 eval {
2694 $cb->($pkg); 3893 $cb->($pkg);
2695 1 3894 1
2696 } or warn "$pkg unloaded, but with errors: $@"; 3895 } or error "$pkg unloaded, but with errors: $@";
3896 }
3897
3898 trace "... clearing $pkg";
3899 clear_package $pkg;
2697 } 3900 }
2698 3901
2699 warn "... nuking $pkg";
2700 Symbol::delete_package $pkg;
2701 }
2702
2703 warn "unloading all perl modules loaded from $LIBDIR"; 3902 trace "unloading all perl modules loaded from $LIBDIR";
2704 while (my ($k, $v) = each %INC) { 3903 while (my ($k, $v) = each %INC) {
2705 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2706 3905
2707 warn "... unloading $k"; 3906 trace "... unloading $k";
2708 delete $INC{$k}; 3907 delete $INC{$k};
2709 3908
2710 $k =~ s/\.pm$//; 3909 $k =~ s/\.pm$//;
2711 $k =~ s/\//::/g; 3910 $k =~ s/\//::/g;
2712 3911
2713 if (my $cb = $k->can ("unload_module")) { 3912 if (my $cb = $k->can ("unload_module")) {
2714 $cb->(); 3913 $cb->();
3914 }
3915
3916 clear_package $k;
2715 } 3917 }
2716 3918
2717 Symbol::delete_package $k;
2718 }
2719
2720 warn "getting rid of safe::, as good as possible"; 3919 trace "getting rid of safe::, as good as possible";
2721 Symbol::delete_package "safe::$_" 3920 clear_package "safe::$_"
2722 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3921 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2723 3922
2724 warn "unloading cf.pm \"a bit\""; 3923 trace "unloading cf.pm \"a bit\"";
2725 delete $INC{"cf.pm"}; 3924 delete $INC{"cf.pm"};
2726 delete $INC{"cf/pod.pm"}; 3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2727 3926
2728 # don't, removes xs symbols, too, 3927 # don't, removes xs symbols, too,
2729 # and global variables created in xs 3928 # and global variables created in xs
2730 #Symbol::delete_package __PACKAGE__; 3929 #clear_package __PACKAGE__;
2731 3930
2732 warn "unload completed, starting to reload now"; 3931 info "unload completed, starting to reload now";
2733 3932
2734 warn "reloading cf.pm"; 3933 trace "reloading cf.pm";
2735 require cf; 3934 require cf;
2736 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3935 cf::_connect_to_perl_1;
2737 3936
2738 warn "loading config and database again"; 3937 trace "loading config and database again";
2739 cf::cfg_load; 3938 cf::reload_config;
2740 3939
2741 warn "loading extensions"; 3940 trace "loading extensions";
2742 cf::load_extensions; 3941 cf::load_extensions;
2743 3942
3943 if ($REATTACH_ON_RELOAD) {
2744 warn "reattaching attachments to objects/players"; 3944 trace "reattaching attachments to objects/players";
2745 _global_reattach; # objects, sockets 3945 _global_reattach; # objects, sockets
2746 warn "reattaching attachments to maps"; 3946 trace "reattaching attachments to maps";
2747 reattach $_ for values %MAP; 3947 reattach $_ for values %MAP;
2748 warn "reattaching attachments to players"; 3948 trace "reattaching attachments to players";
2749 reattach $_ for values %PLAYER; 3949 reattach $_ for values %PLAYER;
3950 }
2750 3951
3952 trace "running post_init jobs";
3953 (pop @POST_INIT)->(1) while @POST_INIT;
3954
2751 warn "leaving sync_job"; 3955 trace "leaving sync_job";
2752 3956
2753 1 3957 1
2754 } or do { 3958 } or do {
2755 warn $@; 3959 error $@;
2756 warn "error while reloading, exiting."; 3960 cf::cleanup "error while reloading, exiting.";
2757 exit 1; 3961 };
3962
3963 info "reloaded";
3964 --$RELOAD;
2758 }; 3965 }
2759 3966
2760 warn "reloaded"; 3967 $t1 = AE::time - $t1;
3968 info "reload completed in ${t1}s\n";
2761}; 3969};
2762 3970
2763our $RELOAD_WATCHER; # used only during reload 3971our $RELOAD_WATCHER; # used only during reload
2764 3972
2765sub reload_perl() { 3973sub reload_perl() {
2766 # doing reload synchronously and two reloads happen back-to-back, 3974 # doing reload synchronously and two reloads happen back-to-back,
2767 # coro crashes during coro_state_free->destroy here. 3975 # coro crashes during coro_state_free->destroy here.
2768 3976
2769 $RELOAD_WATCHER ||= Event->timer ( 3977 $RELOAD_WATCHER ||= cf::async {
2770 reentrant => 0, 3978 Coro::AIO::aio_wait cache_extensions;
2771 after => 0, 3979
2772 data => WF_AUTOCANCEL, 3980 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2773 cb => sub {
2774 do_reload_perl; 3981 do_reload_perl;
2775 undef $RELOAD_WATCHER; 3982 undef $RELOAD_WATCHER;
2776 }, 3983 };
2777 ); 3984 };
2778} 3985}
2779 3986
2780register_command "reload" => sub { 3987register_command "reload" => sub {
2781 my ($who, $arg) = @_; 3988 my ($who, $arg) = @_;
2782 3989
2783 if ($who->flag (FLAG_WIZ)) { 3990 if ($who->flag (FLAG_WIZ)) {
2784 $who->message ("reloading server."); 3991 $who->message ("reloading server.");
3992 async {
3993 $Coro::current->{desc} = "perl_reload";
2785 async { reload_perl }; 3994 reload_perl;
3995 };
2786 } 3996 }
2787}; 3997};
2788 3998
2789unshift @INC, $LIBDIR; 3999unshift @INC, $LIBDIR;
2790 4000
2792 4002
2793our @WAIT_FOR_TICK; 4003our @WAIT_FOR_TICK;
2794our @WAIT_FOR_TICK_BEGIN; 4004our @WAIT_FOR_TICK_BEGIN;
2795 4005
2796sub wait_for_tick { 4006sub wait_for_tick {
2797 return unless $TICK_WATCHER->is_active;
2798 return if $Coro::current == $Coro::main; 4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2799 4008
2800 my $signal = new Coro::Signal; 4009 my $signal = new Coro::Signal;
2801 push @WAIT_FOR_TICK, $signal; 4010 push @WAIT_FOR_TICK, $signal;
2802 $signal->wait; 4011 $signal->wait;
2803} 4012}
2804 4013
2805sub wait_for_tick_begin { 4014sub wait_for_tick_begin {
2806 return unless $TICK_WATCHER->is_active;
2807 return if $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2808 4016
2809 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
2810 push @WAIT_FOR_TICK_BEGIN, $signal; 4018 push @WAIT_FOR_TICK_BEGIN, $signal;
2811 $signal->wait; 4019 $signal->wait;
2812} 4020}
2813 4021
2814$TICK_WATCHER = Event->timer ( 4022sub tick {
2815 reentrant => 0,
2816 parked => 1,
2817 prio => 0,
2818 at => $NEXT_TICK || $TICK,
2819 data => WF_AUTOCANCEL,
2820 cb => sub {
2821 if ($Coro::current != $Coro::main) { 4023 if ($Coro::current != $Coro::main) {
2822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4024 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2823 unless ++$bug_warning > 10; 4025 unless ++$bug_warning > 10;
2824 return; 4026 return;
2825 } 4027 }
2826 4028
2827 $NOW = Event::time;
2828
2829 cf::server_tick; # one server iteration 4029 cf::server_tick; # one server iteration
2830 4030
2831 $RUNTIME += $TICK; 4031 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2832 $NEXT_TICK += $TICK;
2833 4032
2834 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4033 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2835 $NEXT_RUNTIME_WRITE = $NOW + 10; 4034 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2836 Coro::async_pool { 4035 Coro::async_pool {
4036 $Coro::current->{desc} = "runtime saver";
2837 write_runtime 4037 write_runtime_sync
2838 or warn "ERROR: unable to write runtime file: $!"; 4038 or error "ERROR: unable to write runtime file: $!";
2839 };
2840 } 4039 };
4040 }
2841 4041
2842# my $AFTER = Event::time;
2843# warn $AFTER - $NOW;#d#
2844
2845 # if we are delayed by four ticks or more, skip them all
2846 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2847
2848 $TICK_WATCHER->at ($NEXT_TICK);
2849 $TICK_WATCHER->start;
2850
2851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4042 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2852 $sig->send; 4043 $sig->send;
2853 } 4044 }
2854 while (my $sig = shift @WAIT_FOR_TICK) { 4045 while (my $sig = shift @WAIT_FOR_TICK) {
2855 $sig->send; 4046 $sig->send;
2856 }
2857
2858 _post_tick;
2859 }, 4047 }
2860); 4048
4049 $LOAD = ($NOW - $TICK_START) / $TICK;
4050 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4051
4052 if (0) {
4053 if ($NEXT_TICK) {
4054 my $jitter = $TICK_START - $NEXT_TICK;
4055 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4056 debug "jitter $JITTER\n";#d#
4057 }
4058 }
4059}
2861 4060
2862{ 4061{
2863 BDB::max_poll_time $TICK * 0.1; 4062 # configure BDB
2864 $BDB_POLL_WATCHER = Event->io ( 4063
2865 reentrant => 0,
2866 fd => BDB::poll_fileno,
2867 poll => 'r',
2868 prio => 0,
2869 data => WF_AUTOCANCEL,
2870 cb => \&BDB::poll_cb,
2871 );
2872 BDB::min_parallel 8; 4064 BDB::min_parallel 16;
2873 4065 BDB::max_poll_reqs $TICK * 0.1;
2874 BDB::set_sync_prepare { 4066 $AnyEvent::BDB::WATCHER->priority (1);
2875 my $status;
2876 my $current = $Coro::current;
2877 (
2878 sub {
2879 $status = $!;
2880 $current->ready; undef $current;
2881 },
2882 sub {
2883 Coro::schedule while defined $current;
2884 $! = $status;
2885 },
2886 )
2887 };
2888 4067
2889 unless ($DB_ENV) { 4068 unless ($DB_ENV) {
2890 $DB_ENV = BDB::db_env_create; 4069 $DB_ENV = BDB::db_env_create;
4070 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4071 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4072 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4073 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4074 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2891 4075
2892 cf::sync_job { 4076 cf::sync_job {
2893 eval { 4077 eval {
2894 BDB::db_env_open 4078 BDB::db_env_open
2895 $DB_ENV, 4079 $DB_ENV,
2897 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4081 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2898 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4082 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2899 0666; 4083 0666;
2900 4084
2901 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4085 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2902
2903 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2904 $DB_ENV->set_lk_detect;
2905 }; 4086 };
2906 4087
2907 cf::cleanup "db_env_open(db): $@" if $@; 4088 cf::cleanup "db_env_open(db): $@" if $@;
2908 }; 4089 };
2909 } 4090 }
4091
4092 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4093 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4094 };
4095 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4096 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4097 };
4098 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4099 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4100 };
2910} 4101}
2911 4102
2912{ 4103{
4104 # configure IO::AIO
4105
2913 IO::AIO::min_parallel 8; 4106 IO::AIO::min_parallel 8;
2914
2915 undef $Coro::AIO::WATCHER;
2916 IO::AIO::max_poll_time $TICK * 0.1; 4107 IO::AIO::max_poll_time $TICK * 0.1;
2917 $AIO_POLL_WATCHER = Event->io ( 4108 undef $AnyEvent::AIO::WATCHER;
2918 reentrant => 0, 4109}
2919 data => WF_AUTOCANCEL, 4110
2920 fd => IO::AIO::poll_fileno, 4111my $_log_backtrace;
2921 poll => 'r', 4112
2922 prio => 6, 4113sub _log_backtrace {
2923 cb => \&IO::AIO::poll_cb, 4114 my ($msg, @addr) = @_;
2924 ); 4115
4116 $msg =~ s/\n//;
4117
4118 # limit the # of concurrent backtraces
4119 if ($_log_backtrace < 2) {
4120 ++$_log_backtrace;
4121 my $perl_bt = Carp::longmess $msg;
4122 async {
4123 $Coro::current->{desc} = "abt $msg";
4124
4125 my @bt = fork_call {
4126 @addr = map { sprintf "%x", $_ } @addr;
4127 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
4128 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
4129 or die "addr2line: $!";
4130
4131 my @funcs;
4132 my @res = <$fh>;
4133 chomp for @res;
4134 while (@res) {
4135 my ($func, $line) = splice @res, 0, 2, ();
4136 push @funcs, "[$func] $line";
4137 }
4138
4139 @funcs
4140 };
4141
4142 LOG llevInfo, "[ABT] $perl_bt\n";
4143 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
4144 LOG llevInfo, "[ABT] $_\n" for @bt;
4145 --$_log_backtrace;
4146 };
4147 } else {
4148 LOG llevInfo, "[ABT] $msg\n";
4149 LOG llevInfo, "[ABT] [suppressed]\n";
4150 }
2925} 4151}
2926 4152
2927# load additional modules 4153# load additional modules
2928use cf::pod; 4154require "cf/$_.pm" for @EXTRA_MODULES;
4155cf::_connect_to_perl_2;
2929 4156
2930END { cf::emergency_save } 4157END { cf::emergency_save }
2931 4158
29321 41591
2933 4160

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines