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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.546 by root, Thu May 6 22:57:49 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines