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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.545 by root, Thu May 6 22:35:41 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 EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 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
71our %RESOURCE; 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;
72 118
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 121our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 127our $DB_ENV;
85 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
86our %CFG; 131our %CFG;
87 132
88our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 134our $RUNTIME;
90our $NOW; 135our $NOW;
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 143
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
101our $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 :)
102 153
103binmode STDOUT; 154binmode STDOUT;
104binmode STDERR; 155binmode STDERR;
105 156
106# read virtual server time, if available 157# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
111} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
112 165
113mkdir $_ 166mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 168
116our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
117 170
118sub 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::"} };
119 187
120############################################################################# 188#############################################################################
121 189
122=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
123 191
170returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
171per 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.
172 240
173=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
174 242
175This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call. 245that call.
178 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
179=back 253=back
180 254
181=cut 255=cut
182 256
183BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
184 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
185 my $msg = join "", @_; 264 my $msg = join "", @_;
186 265
187 $msg .= "\n" 266 $msg .= "\n"
188 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
189 268
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 270
192 LOG llevError, $msg; 271 LOG llevWarn, $msg;
193 }; 272};
194}
195 273
196$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
275 return unless $^S eq 0; # "eq", not "=="
276
197 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
280 error "DIEHOOK called in main context, Coro bug?\n";#d#
281 return;#d#
282 }#d#
283
284 # kill coroutine otherwise
198 Coro::terminate; 285 Coro::terminate
199}; 286};
200 287
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 298for my $pkg (qw(
212 cf::global cf::attachable 299 cf::global cf::attachable
213 cf::object cf::object::player 300 cf::object cf::object::player
214 cf::client cf::player 301 cf::client cf::player
215 cf::arch cf::living 302 cf::arch cf::living
303 cf::map cf::mapspace
216 cf::map cf::party cf::region 304 cf::party cf::region
217)) { 305)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 307}
221 308
222$EV::DIED = sub { 309$EV::DIED = sub {
223 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
224}; 311};
225 312
226############################################################################# 313#############################################################################
227 314
228=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
266 353
267sub encode_json($) { $json_coder->encode ($_[0]) } 354sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 355sub decode_json($) { $json_coder->decode ($_[0]) }
269 356
357=item cf::post_init { BLOCK }
358
359Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again.
361
362The cdoeblock will have a single boolean argument to indicate whether this
363is a reload or not.
364
365=cut
366
367sub post_init(&) {
368 push @POST_INIT, shift;
369}
370
270=item cf::lock_wait $string 371=item cf::lock_wait $string
271 372
272Wait until the given lock is available. See cf::lock_acquire. 373Wait until the given lock is available. See cf::lock_acquire.
273 374
274=item my $lock = cf::lock_acquire $string 375=item my $lock = cf::lock_acquire $string
275 376
276Wait until the given lock is available and then acquires it and returns 377Wait until the given lock is available and then acquires it and returns
277a Coro::guard object. If the guard object gets destroyed (goes out of scope, 378a L<Guard> object. If the guard object gets destroyed (goes out of scope,
278for example when the coroutine gets canceled), the lock is automatically 379for example when the coroutine gets canceled), the lock is automatically
279returned. 380returned.
280 381
281Locks are *not* recursive, locking from the same coro twice results in a 382Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 383deadlocked coro.
288 389
289Return true if the lock is currently active, i.e. somebody has locked it. 390Return true if the lock is currently active, i.e. somebody has locked it.
290 391
291=cut 392=cut
292 393
293our %LOCK; 394our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 395
296sub lock_wait($) { 396sub lock_wait($) {
297 my ($key) = @_; 397 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 398}
310 399
311sub lock_acquire($) { 400sub lock_acquire($) {
312 my ($key) = @_; 401 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 402}
326 403
327sub lock_active($) { 404sub lock_active($) {
328 my ($key) = @_; 405 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 406}
332 407
333sub freeze_mainloop { 408sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 409 tick_inhibit_inc;
335 410
336 my $guard = Coro::guard { 411 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 412}
342 413
343=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
344 415
345Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 417get spread over time.
347 418
348=cut 419=cut
349 420
350sub periodic($$) { 421sub periodic($$) {
351 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
368 439
369=cut 440=cut
370 441
371our @SLOT_QUEUE; 442our @SLOT_QUEUE;
372our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
373 445
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
377 449
378 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
379 452
380 while () { 453 while () {
381 next_job: 454 next_job:
455
382 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 457
384 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 462 $job->[2]->send;
388 Coro::cede; 463 Coro::cede;
389 goto next_job; 464 goto next_job;
390 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 467 }
392 } 468 }
393 469
394 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
395 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
396 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 473 $signal->wait;
398 } else { 474 } else {
475 $busy = 0;
399 Coro::schedule; 476 Coro::schedule;
400 } 477 }
401 } 478 }
402}; 479};
403 480
404sub get_slot($;$$) { 481sub get_slot($;$$) {
482 return if tick_inhibit || $Coro::current == $Coro::main;
483
405 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
406 485
407 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
408 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
409 489
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
438=cut 518=cut
439 519
440sub sync_job(&) { 520sub sync_job(&) {
441 my ($job) = @_; 521 my ($job) = @_;
442 522
443 if ($Coro::current == $Coro::main) { 523 if (in_main) {
444 my $time = EV::time; 524 my $time = AE::time;
445 525
446 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
448 528
449 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
450 530
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
454 532
455 my $busy = 1; 533 my $busy = 1;
456 my @res; 534 my @res;
457 535
458 (async { 536 (async {
459 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 538 @res = eval { $job->() };
461 warn $@ if $@; 539 error $@ if $@;
462 undef $busy; 540 undef $busy;
463 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
464 542
465 while ($busy) { 543 while ($busy) {
466 if (Coro::nready) { 544 if (Coro::nready) {
468 } else { 546 } else {
469 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
470 } 548 }
471 } 549 }
472 550
473 $time = EV::time - $time; 551 my $time = AE::time - $time;
474 552
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
479 554
480 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
481 } else { 556 } else {
482 # we are in another coroutine, how wonderful, everything just works 557 # we are in another coroutine, how wonderful, everything just works
483 558
527 }, @args; 602 }, @args;
528 603
529 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
530} 605}
531 606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
616}
617
618=item $coin = coin_from_name $name
619
620=cut
621
622our %coin_alias = (
623 "silver" => "silvercoin",
624 "silvercoin" => "silvercoin",
625 "silvercoins" => "silvercoin",
626 "gold" => "goldcoin",
627 "goldcoin" => "goldcoin",
628 "goldcoins" => "goldcoin",
629 "platinum" => "platinacoin",
630 "platinumcoin" => "platinacoin",
631 "platinumcoins" => "platinacoin",
632 "platina" => "platinacoin",
633 "platinacoin" => "platinacoin",
634 "platinacoins" => "platinacoin",
635 "royalty" => "royalty",
636 "royalties" => "royalty",
637);
638
639sub coin_from_name($) {
640 $coin_alias{$_[0]}
641 ? cf::arch::find $coin_alias{$_[0]}
642 : undef
643}
644
532=item $value = cf::db_get $family => $key 645=item $value = cf::db_get $family => $key
533 646
534Returns a single value from the environment database. 647Returns a single value from the environment database.
535 648
536=item cf::db_put $family => $key => $value 649=item cf::db_put $family => $key => $value
544within each server. 657within each server.
545 658
546=cut 659=cut
547 660
548sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
549 my ($name) = @_; 665 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
551 667
552 eval { 668 eval {
553 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
563} 679}
564 680
565our $DB; 681our $DB;
566 682
567sub db_init { 683sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
570 };
571} 685}
572 686
573sub db_get($$) { 687sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
575 689
576 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
577 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
578 694
579 $! ? () 695 $! ? ()
580 : $data 696 : $data
581 }
582} 697}
583 698
584sub db_put($$$) { 699sub db_put($$$) {
585 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
642 757
643 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 759 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
646 761
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 763
649 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
652 767
662 777
663=cut 778=cut
664 779
665sub datalog($@) { 780sub datalog($@) {
666 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 783}
669 784
670=back 785=back
671 786
672=cut 787=cut
673 788
674############################################################################# 789#############################################################################
675 790
676=head2 ATTACHABLE OBJECTS 791=head2 ATTACHABLE OBJECTS
677 792
678Many objects in crossfire are so-called attachable objects. That means you can 793Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 794attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 795to it. All such attachable objects support the following methods.
681 796
682In the following description, CLASS can be any of C<global>, C<object> 797In the following description, CLASS can be any of C<global>, C<object>
683C<player>, C<client> or C<map> (i.e. the attachable objects in 798C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 848=item cf::CLASS::attachment $name, ...
734 849
735Register an attachment by C<$name> through which attachable objects of the 850Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 851given CLASS can refer to this attachment.
737 852
738Some classes such as crossfire maps and objects can specify attachments 853Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 854that are attached at load/instantiate time, thus the need for a name.
740 855
741These calls expect any number of the following handler/hook descriptions: 856These calls expect any number of the following handler/hook descriptions:
742 857
743=over 4 858=over 4
867 982
868 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 985
871 } elsif (ref $type) { 986 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
873 988
874 } else { 989 } else {
875 shift @arg; 990 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
877 } 992 }
878 } 993 }
879} 994}
880 995
881sub _object_attach { 996sub _object_attach {
891 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
892 } 1007 }
893 1008
894 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
895 } else { 1010 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1012 }
898 1013
899 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
900} 1015}
901 1016
960 1075
961 for (@$callbacks) { 1076 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
963 1078
964 if ($@) { 1079 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1081 override;
968 } 1082 }
969 1083
970 return 1 if $override; 1084 return 1 if $override;
971 } 1085 }
1034 1148
1035sub reattach { 1149sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1150 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1151 my ($obj) = @_;
1038 1152
1153 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1154 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1155
1041 my $registry = $obj->registry; 1156 my $registry = $obj->registry;
1042 1157
1043 @$registry = (); 1158 @$registry = ();
1044 1159
1049 for (@$attach) { 1164 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1052 } 1167 }
1053 } else { 1168 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1170 }
1056 } 1171 }
1057} 1172}
1058 1173
1059cf::attachable->attach ( 1174cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1087 1202
1088 sync_job { 1203 sync_job {
1089 if (length $$rdata) { 1204 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1093 1209
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1211 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1098 close $fh; 1217 aio_close $fh;
1099 1218
1100 if (@$objs) { 1219 if (@$objs) {
1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1220 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1102 chmod SAVE_MODE, $fh; 1221 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1222 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1223 aio_write $fh, 0, (length $data), $data, 0;
1105 aio_fsync $fh if $cf::USE_FSYNC; 1224 if ($cf::USE_FSYNC) {
1225 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1226 aio_fsync $fh;
1227 }
1106 close $fh; 1228 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1229 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1230 }
1109 } else { 1231 } else {
1110 aio_unlink "$filename.pst"; 1232 aio_unlink "$filename.pst";
1111 } 1233 }
1112 1234
1113 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1236
1237 $filename =~ s%/[^/]+$%%;
1238 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1239 } else {
1115 warn "FATAL: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1116 } 1241 }
1117 } else { 1242 } else {
1118 aio_unlink $filename; 1243 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1120 } 1245 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1270 $av = $st->{objs};
1146 } 1271 }
1147 1272
1148 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1151 1277
1152 ($data, $av) 1278 ($data, $av)
1153} 1279}
1154 1280
1155=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1337 my ($name, $cb) = @_;
1212 1338
1213 $EXTICMD{$name} = $cb; 1339 $EXTICMD{$name} = $cb;
1214} 1340}
1215 1341
1342use File::Glob ();
1343
1216cf::player->attach ( 1344cf::player->attach (
1217 on_command => sub { 1345 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1219 1347
1220 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1221 or return; 1349 or return;
1222 1350
1245 1373
1246 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1375 if $reply;
1248 1376
1249 } else { 1377 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1379 }
1252 1380
1253 cf::override; 1381 cf::override;
1254 }, 1382 },
1255); 1383);
1256 1384
1385# "readahead" all extensions
1386sub cache_extensions {
1387 my $grp = IO::AIO::aio_group;
1388
1389 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1390 for (grep /\.ext$/, @{$_[0]}) {
1391 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1392 }
1393 };
1394
1395 $grp
1396}
1397
1257sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1258 cf::sync_job { 1401 cf::sync_job {
1259 my %todo; 1402 my %todo;
1260 1403
1261 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1405 next unless -r $path;
1280 1423
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1426
1284 $ext{source} = 1427 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1287 . $source 1430 . $source
1288 . "\n};\n1"; 1431 . "\n};\n1";
1289 1432
1290 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1291 } 1434 }
1292 1435
1436 my $pass = 0;
1293 my %done; 1437 my %done;
1294 while (%todo) { 1438 while (%todo) {
1295 my $progress; 1439 my $progress;
1296 1440
1441 ++$pass;
1442
1443 ext:
1297 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1446 next ext
1300 unless exists $done{$_}; 1447 unless exists $done{$_};
1301 } 1448 }
1302 1449
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1451
1305 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1456
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1458 if exists $v->{meta}{mandatory};
1310 warn $msg; 1459
1311 warn "mandatory extension failed to load, exiting.\n"; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1461 delete $todo{$k};
1313 } 1462 } else {
1314 1463 $done{$k} = delete $todo{$k};
1315 warn $msg; 1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1316 } 1469 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1470 }
1322 1471
1323 skip: 1472 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1326 } 1480 }
1327 }; 1481 };
1328} 1482}
1329 1483
1330############################################################################# 1484#############################################################################
1331 1485
1332=back 1486=back
1333 1487
1334=head2 CORE EXTENSIONS 1488=head2 CORE EXTENSIONS
1335 1489
1336Functions and methods that extend core crossfire objects. 1490Functions and methods that extend core deliantra objects.
1337 1491
1338=cut 1492=cut
1339 1493
1340package cf::player; 1494package cf::player;
1341 1495
1384 1538
1385sub exists($) { 1539sub exists($) {
1386 my ($login) = @_; 1540 my ($login) = @_;
1387 1541
1388 $cf::PLAYER{$login} 1542 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1543 or !aio_stat path $login
1390} 1544}
1391 1545
1392sub find($) { 1546sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1547 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1548 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1560 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1561 or return;
1408 1562
1409 my $pl = cf::player::load_pl $f 1563 my $pl = cf::player::load_pl $f
1410 or return; 1564 or return;
1565
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1566 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1567 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1414 } 1569 }
1415 } 1570 }
1416} 1571}
1417 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1418sub save($) { 1586sub save($) {
1419 my ($pl) = @_; 1587 my ($pl) = @_;
1420 1588
1421 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1422 1590
1425 1593
1426 return if $pl->{deny_save}; 1594 return if $pl->{deny_save};
1427 1595
1428 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1598
1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1603
1431 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1605 cf::cede_to_tick;
1433} 1606}
1434 1607
1466 my ($pl) = @_; 1639 my ($pl) = @_;
1467 1640
1468 my $name = $pl->ob->name; 1641 my $name = $pl->ob->name;
1469 1642
1470 $pl->{deny_save} = 1; 1643 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1645
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1474 $pl->deactivate; 1647 $pl->deactivate;
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1476 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1477 1651
1478 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1518 1692
1519 for my $login (@$dirs) { 1693 for my $login (@$dirs) {
1520 my $path = path $login; 1694 my $path = path $login;
1521 1695
1522 # a .pst is a dead give-away for a valid player 1696 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1697 # if no pst file found, open and chekc for blocked users
1698 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1699 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1700 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1701 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1702 }
1528 1703
1532 1707
1533 \@logins 1708 \@logins
1534} 1709}
1535 1710
1536=item $player->maps 1711=item $player->maps
1712
1713=item cf::player::maps $login
1537 1714
1538Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1539player. May block. 1716player. May block.
1540 1717
1541=cut 1718=cut
1559 } 1736 }
1560 1737
1561 \@paths 1738 \@paths
1562} 1739}
1563 1740
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1741=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1742
1566Expand crossfire pod fragments into protocol xml. 1743Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1744
1657=item $player->ext_reply ($msgid, @msg) 1745=item $player->ext_reply ($msgid, @msg)
1658 1746
1659Sends an ext reply to the player. 1747Sends an ext reply to the player.
1660 1748
1692 1780
1693=cut 1781=cut
1694 1782
1695sub find_by_path($) { 1783sub find_by_path($) {
1696 my ($path) = @_; 1784 my ($path) = @_;
1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1697 1787
1698 my ($match, $specificity); 1788 my ($match, $specificity);
1699 1789
1700 for my $region (list) { 1790 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1817our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1818our $DEFAULT_RESET = 3000;
1729 1819
1730sub generate_random_map { 1820sub generate_random_map {
1731 my ($self, $rmp) = @_; 1821 my ($self, $rmp) = @_;
1822
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824
1732 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1826 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1755 1848
1756sub register { 1849sub register {
1757 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1851 my $pkg = caller;
1759 1852
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1854
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1856}
1765 1857
1766# also paths starting with '/' 1858# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1860
1769sub thawer_merge { 1861sub thawer_merge {
1770 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1771 1863
1772 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1777} 1869}
1778 1870
1779sub normalise { 1871sub normalise {
1780 my ($path, $base) = @_; 1872 my ($path, $base) = @_;
1781 1873
1782 $path = "$path"; # make sure its a string 1874 $path = "$path"; # make sure it's a string
1783 1875
1784 $path =~ s/\.map$//; 1876 $path =~ s/\.map$//;
1785 1877
1786 # map plan: 1878 # map plan:
1787 # 1879 #
1826 $self->init; # pass $1 etc. 1918 $self->init; # pass $1 etc.
1827 return $self; 1919 return $self;
1828 } 1920 }
1829 } 1921 }
1830 1922
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1923 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1924 ()
1833} 1925}
1834 1926
1835sub init { 1927sub init {
1836 my ($self) = @_; 1928 my ($self) = @_;
1858 1950
1859# the temporary/swap location 1951# the temporary/swap location
1860sub save_path { 1952sub save_path {
1861 my ($self) = @_; 1953 my ($self) = @_;
1862 1954
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 1956 "$TMPDIR/$path.map"
1865} 1957}
1866 1958
1867# the unique path, undef == no special unique path 1959# the unique path, undef == no special unique path
1868sub uniq_path { 1960sub uniq_path {
1869 my ($self) = @_; 1961 my ($self) = @_;
1870 1962
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1963 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1964 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 1965}
1883 1966
1884sub decay_objects { 1967sub decay_objects {
1885 my ($self) = @_; 1968 my ($self) = @_;
1886 1969
1968 2051
1969sub find; 2052sub find;
1970sub find { 2053sub find {
1971 my ($path, $origin) = @_; 2054 my ($path, $origin) = @_;
1972 2055
2056 cf::cede_to_tick;
2057
1973 $path = normalise $path, $origin && $origin->path; 2058 $path = normalise $path, $origin && $origin->path;
1974 2059
1975 cf::lock_wait "map_data:$path";#d#remove 2060 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2061 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2062
1978 $cf::MAP{$path} || do { 2063 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2064 my $map = new_from_path cf::map $path
1983 or return; 2065 or return;
1984 2066
1985 $map->{last_save} = $cf::RUNTIME; 2067 $map->{last_save} = $cf::RUNTIME;
1986 2068
1988 or return; 2070 or return;
1989 2071
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2072 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2073 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2074 #$cf::WAIT_FOR_TICK->wait;
2075 undef $guard2;
1993 undef $guard1; 2076 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2077 $map->reset;
1996 return find $path; 2078 return find $path;
1997 } 2079 }
1998 2080
1999 $cf::MAP{$path} = $map 2081 $cf::MAP{$path} = $map
2000 } 2082 }
2001} 2083}
2002 2084
2003sub pre_load { } 2085sub pre_load { }
2004sub post_load { } 2086#sub post_load { } # XS
2005 2087
2006sub load { 2088sub load {
2007 my ($self) = @_; 2089 my ($self) = @_;
2008 2090
2009 local $self->{deny_reset} = 1; # loading can take a long time 2091 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2108 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2109 $f->skip_block;
2028 $self->_load_objects ($f) 2110 $self->_load_objects ($f)
2029 or return; 2111 or return;
2030 2112
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2113 $self->post_load_original
2032 if delete $self->{load_original}; 2114 if delete $self->{load_original};
2033 2115
2034 if (my $uniq = $self->uniq_path) { 2116 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2117 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2118 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2136 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2137 $self->decay_objects;
2056 $self->fix_auto_apply; 2138 $self->fix_auto_apply;
2057 $self->update_buttons; 2139 $self->update_buttons;
2058 cf::cede_to_tick; 2140 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2141 $self->activate;
2062 } 2142 }
2063 2143
2064 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2145 $self->last_access ($cf::RUNTIME);
2066 2146
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2147 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2148 }
2069 2149
2070 $self->post_load; 2150 $self->post_load;
2071} 2151}
2072 2152
2153# customize the map for a given player, i.e.
2154# return the _real_ map. used by e.g. per-player
2155# maps to change the path to ~playername/mappath
2073sub customise_for { 2156sub customise_for {
2074 my ($self, $ob) = @_; 2157 my ($self, $ob) = @_;
2075 2158
2076 return find "~" . $ob->name . "/" . $self->{path} 2159 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2160 if $self->per_player;
2093 or next; 2176 or next;
2094 $neigh = find $neigh, $map 2177 $neigh = find $neigh, $map
2095 or next; 2178 or next;
2096 $neigh->load; 2179 $neigh->load;
2097 2180
2181 # now find the diagonal neighbours
2098 push @neigh, 2182 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2183 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2184 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2185 }
2102 2186
2109} 2193}
2110 2194
2111sub find_sync { 2195sub find_sync {
2112 my ($path, $origin) = @_; 2196 my ($path, $origin) = @_;
2113 2197
2114 cf::sync_job { find $path, $origin } 2198 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199 if $Coro::current == $Coro::main;
2200
2201 find $path, $origin
2115} 2202}
2116 2203
2117sub do_load_sync { 2204sub do_load_sync {
2118 my ($map) = @_; 2205 my ($map) = @_;
2119 2206
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2207 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2208 if $Coro::current == $Coro::main;
2122 2209
2123 cf::sync_job { $map->load }; 2210 $map->load;
2124} 2211}
2125 2212
2126our %MAP_PREFETCH; 2213our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2214our $MAP_PREFETCHER = undef;
2128 2215
2130 my ($path, $origin, $load) = @_; 2217 my ($path, $origin, $load) = @_;
2131 2218
2132 $path = normalise $path, $origin && $origin->{path}; 2219 $path = normalise $path, $origin && $origin->{path};
2133 2220
2134 if (my $map = $cf::MAP{$path}) { 2221 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2222 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2223 }
2137 2224
2138 $MAP_PREFETCH{$path} |= $load; 2225 $MAP_PREFETCH{$path} |= $load;
2139 2226
2140 $MAP_PREFETCHER ||= cf::async { 2227 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2241 $MAP_PREFETCHER->prio (6);
2155 2242
2156 () 2243 ()
2157} 2244}
2158 2245
2246# common code, used by both ->save and ->swapout
2159sub save { 2247sub _save {
2160 my ($self) = @_; 2248 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2249
2164 $self->{last_save} = $cf::RUNTIME; 2250 $self->{last_save} = $cf::RUNTIME;
2165 2251
2166 return unless $self->dirty; 2252 return unless $self->dirty;
2167 2253
2176 2262
2177 cf::async { 2263 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2264 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2265 $_->contr->save for $self->players;
2180 }; 2266 };
2267
2268 cf::get_slot 0.02;
2181 2269
2182 if ($uniq) { 2270 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2271 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2272 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2273 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2274 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2275 }
2188} 2276}
2189 2277
2278sub save {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 $self->_save;
2284}
2285
2190sub swap_out { 2286sub swap_out {
2191 my ($self) = @_; 2287 my ($self) = @_;
2192 2288
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2290
2291 return if $self->in_memory != cf::MAP_ACTIVE;
2292 return if $self->{deny_save};
2198 return if $self->players; 2293 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2294
2295 # first deactivate the map and "unlink" it from the core
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # then atomically save
2301 $self->_save;
2302
2303 # then free the map
2304 $self->clear;
2305}
2306
2307sub reset_at {
2308 my ($self) = @_;
2309
2310 # TODO: safety, remove and allow resettable per-player maps
2311 return 1e99 if $self->{deny_reset};
2312
2313 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2314 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2315
2316 $time + $to
2317}
2318
2319sub should_reset {
2320 my ($self) = @_;
2321
2322 $self->reset_at <= $cf::RUNTIME
2323}
2324
2325sub reset {
2326 my ($self) = @_;
2327
2328 my $lock = cf::lock_acquire "map_data:$self->{path}";
2329
2330 return if $self->players;
2331
2332 cf::trace "resetting map ", $self->path, "\n";
2333
2334 $self->in_memory (cf::MAP_SWAPPED);
2335
2336 # need to save uniques path
2337 unless ($self->{deny_save}) {
2338 my $uniq = $self->uniq_path; utf8::encode $uniq;
2339
2340 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2341 if $uniq;
2342 }
2343
2344 delete $cf::MAP{$self->path};
2203 2345
2204 $self->deactivate; 2346 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2347 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2348 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2349
2252 $self->unlink_save; 2350 $self->unlink_save;
2253 $self->destroy; 2351 $self->destroy;
2254} 2352}
2255 2353
2263 2361
2264 delete $cf::MAP{$self->path}; 2362 delete $cf::MAP{$self->path};
2265 2363
2266 $self->unlink_save; 2364 $self->unlink_save;
2267 2365
2268 bless $self, "cf::map"; 2366 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2367 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2368 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2369 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2370 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2371
2322 2420
2323sub unique_maps() { 2421sub unique_maps() {
2324 [ 2422 [
2325 map { 2423 map {
2326 utf8::decode $_; 2424 utf8::decode $_;
2327 /\.map$/ 2425 s/\.map$//; # TODO future compatibility hack
2426 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2427 ? ()
2328 ? normalise $_ 2428 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2429 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2430 ]
2332} 2431}
2333 2432
2334package cf; 2433=item cf::map::static_maps
2434
2435Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2436file in the shared directory excluding F</styles> and F</editor>). May
2437block.
2438
2439=cut
2440
2441sub static_maps() {
2442 my @dirs = "";
2443 my @maps;
2444
2445 while (@dirs) {
2446 my $dir = shift @dirs;
2447
2448 next if $dir eq "/styles" || $dir eq "/editor";
2449
2450 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2451 or return;
2452
2453 for (@$files) {
2454 s/\.map$// or next;
2455 utf8::decode $_;
2456 push @maps, "$dir/$_";
2457 }
2458
2459 push @dirs, map "$dir/$_", @$dirs;
2460 }
2461
2462 \@maps
2463}
2335 2464
2336=back 2465=back
2337 2466
2338=head3 cf::object 2467=head3 cf::object
2339 2468
2343 2472
2344=over 4 2473=over 4
2345 2474
2346=item $ob->inv_recursive 2475=item $ob->inv_recursive
2347 2476
2348Returns the inventory of the object _and_ their inventories, recursively. 2477Returns the inventory of the object I<and> their inventories, recursively,
2478but I<not> the object itself.
2349 2479
2350=cut 2480=cut
2351 2481
2352sub inv_recursive_; 2482sub inv_recursive_;
2353sub inv_recursive_ { 2483sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2488 inv_recursive_ inv $_[0]
2359} 2489}
2360 2490
2361=item $ref = $ob->ref 2491=item $ref = $ob->ref
2362 2492
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2493Creates and returns a persistent reference to an object that can be stored as a string.
2364 2494
2365=item $ob = cf::object::deref ($refstring) 2495=item $ob = cf::object::deref ($refstring)
2366 2496
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2497returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2498even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2530can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2531dialogue with the given NPC character.
2402 2532
2403=cut 2533=cut
2404 2534
2535our $SAY_CHANNEL = {
2536 id => "say",
2537 title => "Map",
2538 reply => "say ",
2539 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2540};
2541
2542our $CHAT_CHANNEL = {
2543 id => "chat",
2544 title => "Chat",
2545 reply => "chat ",
2546 tooltip => "Player chat and shouts, global to the server.",
2547};
2548
2405# rough implementation of a future "reply" method that works 2549# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2550# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2551#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2552sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2553 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2564 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2565 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2566
2423 } else { 2567 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2568 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2569 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2570 }
2427 } 2571 }
2428} 2572}
2429 2573
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2574=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2599
2456=item $player_object->enter_link 2600=item $player_object->enter_link
2457 2601
2458Freezes the player and moves him/her to a special map (C<{link}>). 2602Freezes the player and moves him/her to a special map (C<{link}>).
2459 2603
2460The player should be reasonably safe there for short amounts of time. You 2604The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2605for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2606though, as the player cannot control the character while it is on the link
2607map.
2462 2608
2463Will never block. 2609Will never block.
2464 2610
2465=item $player_object->leave_link ($map, $x, $y) 2611=item $player_object->leave_link ($map, $x, $y)
2466 2612
2486sub cf::object::player::enter_link { 2632sub cf::object::player::enter_link {
2487 my ($self) = @_; 2633 my ($self) = @_;
2488 2634
2489 $self->deactivate_recursive; 2635 $self->deactivate_recursive;
2490 2636
2637 ++$self->{_link_recursion};
2638
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2639 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2640
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2641 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2642 if $self->map && $self->map->{path} ne "{link}";
2495 2643
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2644 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2645}
2498 2646
2499sub cf::object::player::leave_link { 2647sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2648 my ($self, $map, $x, $y) = @_;
2501 2649
2518 ($x, $y) = (-1, -1) 2666 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2667 unless (defined $x) && (defined $y);
2520 2668
2521 # use -1 or undef as default coordinates, not 0, 0 2669 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2670 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2671 if $x <= 0 && $y <= 0;
2524 2672
2525 $map->load; 2673 $map->load;
2526 $map->load_neighbours; 2674 $map->load_neighbours;
2527 2675
2528 return unless $self->contr->active; 2676 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2677
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2678 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2679 if ($self->enter_map ($map, $x, $y)) {
2533} 2680 # entering was successful
2681 delete $self->{_link_recursion};
2682 # only activate afterwards, to support waiting in hooks
2683 $self->activate_recursive;
2684 }
2534 2685
2686}
2687
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2688=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2689
2537Moves the player to the given map-path and coordinates by first freezing 2690Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2691her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2692that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2693the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2694be called at the end of this process.
2542 2695
2696Note that $check will be called with a potentially non-loaded map, so if
2697it needs a loaded map it has to call C<< ->load >>.
2698
2543=cut 2699=cut
2544 2700
2545our $GOTOGEN; 2701our $GOTOGEN;
2546 2702
2547sub cf::object::player::goto { 2703sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2704 my ($self, $path, $x, $y, $check, $done) = @_;
2705
2706 if ($self->{_link_recursion} >= $MAX_LINKS) {
2707 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2708 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2709 ($path, $x, $y) = @$EMERGENCY_POSITION;
2710 }
2549 2711
2550 # do generation counting so two concurrent goto's will be executed in-order 2712 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2713 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2714
2553 $self->enter_link; 2715 $self->enter_link;
2577 my $map = eval { 2739 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2740 my $map = defined $path ? cf::map::find $path : undef;
2579 2741
2580 if ($map) { 2742 if ($map) {
2581 $map = $map->customise_for ($self); 2743 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2744 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2745 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2746 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2747 }
2586 2748
2587 $map 2749 $map
2595 if ($gen == $self->{_goto_generation}) { 2757 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2758 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2759 $self->leave_link ($map, $x, $y);
2598 } 2760 }
2599 2761
2600 $done->() if $done; 2762 $done->($self) if $done;
2601 })->prio (1); 2763 })->prio (1);
2602} 2764}
2603 2765
2604=item $player_object->enter_exit ($exit_object) 2766=item $player_object->enter_exit ($exit_object)
2605 2767
2625} 2787}
2626 2788
2627sub prepare_random_map { 2789sub prepare_random_map {
2628 my ($exit) = @_; 2790 my ($exit) = @_;
2629 2791
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2792 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2793 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2794 # that depends on the exit object
2635 2795
2636 my $rmp = parse_random_map_params $exit->msg; 2796 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2798 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2799 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2800 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2801 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2802 $rmp->{origin_y} = $exit->y;
2803
2804 $exit->map->touch;
2643 } 2805 }
2644 2806
2645 $rmp->{random_seed} ||= $exit->random_seed; 2807 $rmp->{random_seed} ||= $exit->random_seed;
2646 2808
2647 my $data = cf::encode_json $rmp; 2809 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2810 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2811 my $meta = "$RANDOMDIR/$md5.meta";
2650 2812
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2813 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2814 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2815 undef $fh;
2654 aio_rename "$meta~", $meta; 2816 aio_rename "$meta~", $meta;
2655 2817
2818 my $slaying = "?random/$md5";
2819
2820 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2821 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2822 $exit->msg (undef);
2823 }
2658 } 2824 }
2659} 2825}
2660 2826
2661sub cf::object::player::enter_exit { 2827sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2828 my ($self, $exit) = @_;
2663 2829
2664 return unless $self->type == cf::PLAYER; 2830 return unless $self->type == cf::PLAYER;
2665 2831
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2832 $self->enter_link;
2678 2833
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2834 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2835 $Coro::current->{desc} = "enter_exit";
2685 2836
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2837 unless (eval {
2838 $self->deactivate_recursive; # just to be sure
2839
2840 # random map handling
2841 {
2842 my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844 prepare_random_map $exit
2845 if $exit->slaying eq "/!";
2846 }
2847
2848 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2849 my $x = $exit->stats->hp;
2850 my $y = $exit->stats->sp;
2851
2688 $self->goto ($slaying, $hp, $sp); 2852 $self->goto ($map, $x, $y);
2689 2853
2854 # if exit is damned, update players death & WoR home-position
2855 $self->contr->savebed ($map, $x, $y)
2856 if $exit->flag (cf::FLAG_DAMNED);
2857
2690 1; 2858 1
2691 }) { 2859 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2860 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2861 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2862 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2863 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2864
2697 warn "ERROR in enter_exit: $@"; 2865 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2866 $self->leave_link;
2699 } 2867 }
2700 })->prio (1); 2868 })->prio (1);
2701} 2869}
2702 2870
2714sub cf::client::send_drawinfo { 2882sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2883 my ($self, $text, $flags) = @_;
2716 2884
2717 utf8::encode $text; 2885 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2886 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887}
2888
2889=item $client->send_big_packet ($pkt)
2890
2891Like C<send_packet>, but tries to compress large packets, and fragments
2892them as required.
2893
2894=cut
2895
2896our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2897
2898sub cf::client::send_big_packet {
2899 my ($self, $pkt) = @_;
2900
2901 # try lzf for large packets
2902 $pkt = "lzf " . Compress::LZF::compress $pkt
2903 if 1024 <= length $pkt and $self->{can_lzf};
2904
2905 # split very large packets
2906 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2907 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2908 $pkt = "frag";
2909 }
2910
2911 $self->send_packet ($pkt);
2719} 2912}
2720 2913
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2914=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2915
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2916Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2920
2728=cut 2921=cut
2729 2922
2730# non-persistent channels (usually the info channel) 2923# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2924our %CHANNEL = (
2925 "c/motd" => {
2926 id => "infobox",
2927 title => "MOTD",
2928 reply => undef,
2929 tooltip => "The message of the day",
2930 },
2732 "c/identify" => { 2931 "c/identify" => {
2733 id => "infobox", 2932 id => "infobox",
2734 title => "Identify", 2933 title => "Identify",
2735 reply => undef, 2934 reply => undef,
2736 tooltip => "Items recently identified", 2935 tooltip => "Items recently identified",
2738 "c/examine" => { 2937 "c/examine" => {
2739 id => "infobox", 2938 id => "infobox",
2740 title => "Examine", 2939 title => "Examine",
2741 reply => undef, 2940 reply => undef,
2742 tooltip => "Signs and other items you examined", 2941 tooltip => "Signs and other items you examined",
2942 },
2943 "c/shopinfo" => {
2944 id => "infobox",
2945 title => "Shop Info",
2946 reply => undef,
2947 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 2948 },
2744 "c/book" => { 2949 "c/book" => {
2745 id => "infobox", 2950 id => "infobox",
2746 title => "Book", 2951 title => "Book",
2747 reply => undef, 2952 reply => undef,
2763 id => "infobox", 2968 id => "infobox",
2764 title => "Body Parts", 2969 title => "Body Parts",
2765 reply => undef, 2970 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 2971 tooltip => "Shows which body parts you posess and are available",
2767 }, 2972 },
2973 "c/statistics" => {
2974 id => "infobox",
2975 title => "Statistics",
2976 reply => undef,
2977 tooltip => "Shows your primary statistics",
2978 },
2979 "c/skills" => {
2980 id => "infobox",
2981 title => "Skills",
2982 reply => undef,
2983 tooltip => "Shows your experience per skill and item power",
2984 },
2985 "c/shopitems" => {
2986 id => "infobox",
2987 title => "Shop Items",
2988 reply => undef,
2989 tooltip => "Shows the items currently for sale in this shop",
2990 },
2991 "c/resistances" => {
2992 id => "infobox",
2993 title => "Resistances",
2994 reply => undef,
2995 tooltip => "Shows your resistances",
2996 },
2997 "c/pets" => {
2998 id => "infobox",
2999 title => "Pets",
3000 reply => undef,
3001 tooltip => "Shows information abotu your pets/a specific pet",
3002 },
3003 "c/perceiveself" => {
3004 id => "infobox",
3005 title => "Perceive Self",
3006 reply => undef,
3007 tooltip => "You gained detailed knowledge about yourself",
3008 },
2768 "c/uptime" => { 3009 "c/uptime" => {
2769 id => "infobox", 3010 id => "infobox",
2770 title => "Uptime", 3011 title => "Uptime",
2771 reply => undef, 3012 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3013 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3016 id => "infobox",
2776 title => "Map Info", 3017 title => "Map Info",
2777 reply => undef, 3018 reply => undef,
2778 tooltip => "Information related to the maps", 3019 tooltip => "Information related to the maps",
2779 }, 3020 },
3021 "c/party" => {
3022 id => "party",
3023 title => "Party",
3024 reply => "gsay ",
3025 tooltip => "Messages and chat related to your party",
3026 },
3027 "c/death" => {
3028 id => "death",
3029 title => "Death",
3030 reply => undef,
3031 tooltip => "Reason for and more info about your most recent death",
3032 },
3033 "c/say" => $SAY_CHANNEL,
3034 "c/chat" => $CHAT_CHANNEL,
2780); 3035);
2781 3036
2782sub cf::client::send_msg { 3037sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3038 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3039
2785 $msg = $self->pl->expand_cfpod ($msg); 3040 $msg = $self->pl->expand_cfpod ($msg)
3041 unless $color & cf::NDI_VERBATIM;
2786 3042
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3043 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3044
2789 # check predefined channels, for the benefit of C 3045 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3046 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3047 $channel = $CHANNEL{$channel};
2792 3048
2793 $self->ext_msg (channel_info => $channel) 3049 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3050 $channel = $channel->{id};
2797 3051
2798 } elsif (ref $channel) { 3052 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3053 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3054 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3055 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3056 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3057 }
2805 3058
2806 $channel = $channel->{id}; 3059 $channel = $channel->{id};
2807 } 3060 }
2808 3061
2809 return unless @extra || length $msg; 3062 return unless @extra || length $msg;
2810 3063
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3064 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3065 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3066 if $color & cf::NDI_DEF;
2815 3067
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3068 my $pkt = "msg "
3069 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3070 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3071 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3072
2830 $color &= cf::NDI_COLOR_MASK; 3073 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3074}
2844 3075
2845=item $client->ext_msg ($type, @msg) 3076=item $client->ext_msg ($type, @msg)
2846 3077
2847Sends an ext event to the client. 3078Sends an ext event to the client.
2850 3081
2851sub cf::client::ext_msg($$@) { 3082sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3083 my ($self, $type, @msg) = @_;
2853 3084
2854 if ($self->extcmd == 2) { 3085 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3086 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3087 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3088 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3089 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3090 }
2860} 3091}
2861 3092
2862=item $client->ext_reply ($msgid, @msg) 3093=item $client->ext_reply ($msgid, @msg)
2863 3094
2867 3098
2868sub cf::client::ext_reply($$@) { 3099sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3100 my ($self, $id, @msg) = @_;
2870 3101
2871 if ($self->extcmd == 2) { 3102 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3103 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3104 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3105 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3106 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3107 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3108 }
2878} 3109}
2879 3110
2880=item $success = $client->query ($flags, "text", \&cb) 3111=item $success = $client->query ($flags, "text", \&cb)
2881 3112
2952 3183
2953 $ns->ext_reply ($reply, @reply) 3184 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3185 if $reply;
2955 3186
2956 } else { 3187 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3188 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3189 }
2959 3190
2960 cf::override; 3191 cf::override;
2961 }, 3192 },
2962); 3193);
2982 3213
2983 $coro 3214 $coro
2984} 3215}
2985 3216
2986cf::client->attach ( 3217cf::client->attach (
2987 on_destroy => sub { 3218 on_client_destroy => sub {
2988 my ($ns) = @_; 3219 my ($ns) = @_;
2989 3220
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3221 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3222 },
2992); 3223);
3008our $safe_hole = new Safe::Hole; 3239our $safe_hole = new Safe::Hole;
3009 3240
3010$SIG{FPE} = 'IGNORE'; 3241$SIG{FPE} = 'IGNORE';
3011 3242
3012$safe->permit_only (Opcode::opset qw( 3243$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3244 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3245 grepstart grepwhile mapstart mapwhile
3015 sort time 3246 sort time
3016)); 3247));
3017 3248
3018# here we export the classes and methods available to script code 3249# here we export the classes and methods available to script code
3021 3252
3022The following functions and methods are available within a safe environment: 3253The following functions and methods are available within a safe environment:
3023 3254
3024 cf::object 3255 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3256 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3257 insert remove name archname title slaying race decrease split
3258 value
3027 3259
3028 cf::object::player 3260 cf::object::player
3029 player 3261 player
3030 3262
3031 cf::player 3263 cf::player
3036 3268
3037=cut 3269=cut
3038 3270
3039for ( 3271for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3272 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3273 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3274 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3275 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3276 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3277 ["cf::map" => qw(trigger)],
3046) { 3278) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3279 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3281 for @funs;
3051} 3282}
3052 3283
3067 3298
3068 my $qcode = $code; 3299 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3300 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3301 $qcode =~ s/\n/\\n/g;
3071 3302
3303 %vars = (_dummy => 0) unless %vars;
3304
3305 my @res;
3072 local $_; 3306 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3307
3075 my $eval = 3308 my $eval =
3076 "do {\n" 3309 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3310 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3311 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3312 . $code
3080 . "\n}" 3313 . "\n}"
3081 ; 3314 ;
3082 3315
3316 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3317 sub_generation_inc;
3318 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3319 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3320 sub_generation_inc;
3321 } else {
3322 local @cf::_safe_eval_args = values %vars;
3323 @res = wantarray ? eval eval : scalar eval $eval;
3324 }
3086 3325
3087 if ($@) { 3326 if ($@) {
3088 warn "$@"; 3327 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3328 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3329 "with arguments " . (join " ", %vars) . "\n";
3091 } 3330 }
3092 3331
3093 wantarray ? @res : $res[0] 3332 wantarray ? @res : $res[0]
3094} 3333}
3095 3334
3109=cut 3348=cut
3110 3349
3111sub register_script_function { 3350sub register_script_function {
3112 my ($fun, $cb) = @_; 3351 my ($fun, $cb) = @_;
3113 3352
3114 no strict 'refs'; 3353 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3354 *$fun = $safe_hole->wrap ($cb);
3116} 3355}
3117 3356
3118=back 3357=back
3119 3358
3120=cut 3359=cut
3129 # for this (global event?) 3368 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3370
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3371 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3372
3134 warn "loading facedata from $path\n"; 3373 trace "loading facedata from $path\n";
3135 3374
3136 my $facedata; 3375 my $facedata;
3137 0 < aio_load $path, $facedata 3376 0 < aio_load $path, $facedata
3138 or die "$path: $!"; 3377 or die "$path: $!";
3139 3378
3141 3380
3142 $facedata->{version} == 2 3381 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3382 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3383
3145 # patch in the exptable 3384 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3386 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3387 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3388 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3390 };
3150 cf::cede_to_tick; 3391 cf::cede_to_tick;
3151 3392
3152 { 3393 {
3153 my $faces = $facedata->{faceinfo}; 3394 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3397 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3398
3158 cf::face::set_visibility $idx, $info->{visibility}; 3399 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3400 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3162 3403
3163 cf::cede_to_tick; 3404 cf::cede_to_tick;
3164 } 3405 }
3165 3406
3166 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
3171 3412
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3413 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3414 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3415 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3416 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3417 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3418 }
3178 3419
3179 cf::cede_to_tick; 3420 cf::cede_to_tick;
3180 } 3421 }
3181 } 3422 }
3190 3431
3191 cf::anim::invalidate_all; # d'oh 3432 cf::anim::invalidate_all; # d'oh
3192 } 3433 }
3193 3434
3194 { 3435 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3436 my $res = $facedata->{resource};
3198 3437
3199 while (my ($name, $info) = each %$res) { 3438 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3439 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3440 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3441
3204 if ($info->{type} & 1) { 3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3443 cf::face::set_type $idx, $info->{type};
3219 } else { 3444 } else {
3220 $RESOURCE{$name} = $info; 3445 $RESOURCE{$name} = $info; # unused
3221 } 3446 }
3222 3447
3223 cf::cede_to_tick; 3448 cf::cede_to_tick;
3224 } 3449 }
3225 } 3450 }
3226 3451
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3452 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3453
3229 1 3454 1
3230} 3455}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3456
3252register_exticmd fx_want => sub { 3457register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3458 my ($ns, $want) = @_;
3254 3459
3255 while (my ($k, $v) = each %$want) { 3460 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3461 $ns->fx_want ($k, $v);
3257 } 3462 }
3258}; 3463};
3464
3465sub load_resource_file($) {
3466 my $guard = lock_acquire "load_resource_file";
3467
3468 my $status = load_resource_file_ $_[0];
3469 get_slot 0.1, 100;
3470 cf::arch::commit_load;
3471
3472 $status
3473}
3259 3474
3260sub reload_regions { 3475sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3476 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3477 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3478 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3492}
3278 3493
3279sub reload_archetypes { 3494sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3495 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3496 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3497}
3288 3498
3289sub reload_treasures { 3499sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3500 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3501 or die "unable to load treasurelists\n";
3292} 3502}
3293 3503
3504sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n";
3506
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3511
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_]
3514 or next;
3515
3516 my $face = cf::face::find "sound/$sound->[1]";
3517 cf::sound::set $sound->[0] => $face;
3518 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3519 }
3520
3521 while (my ($k, $v) = each %{$soundconf->{event}}) {
3522 my $face = cf::face::find "sound/$v";
3523 cf::sound::set $k => $face;
3524 }
3525}
3526
3294sub reload_resources { 3527sub reload_resources {
3295 warn "reloading resource files...\n"; 3528 trace "reloading resource files...\n";
3296 3529
3530 reload_exp_table;
3531 reload_materials;
3532 reload_facedata;
3533 reload_sound;
3534 reload_archetypes;
3297 reload_regions; 3535 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3536 reload_treasures;
3302 3537
3303 warn "finished reloading resource files\n"; 3538 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3539}
3309 3540
3310sub reload_config { 3541sub reload_config {
3542 trace "reloading config file...\n";
3543
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3544 open my $fh, "<:utf8", "$CONFDIR/config"
3312 or return; 3545 or return;
3313 3546
3314 local $/; 3547 local $/;
3315 *CFG = YAML::Load <$fh>; 3548 *CFG = YAML::XS::Load scalar <$fh>;
3316 3549
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3550 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3551
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3552 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3553 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3554
3322 if (exists $CFG{mlockall}) { 3555 if (exists $CFG{mlockall}) {
3324 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3557 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3325 and die "WARNING: m(un)lockall failed: $!\n"; 3558 and die "WARNING: m(un)lockall failed: $!\n";
3326 }; 3559 };
3327 warn $@ if $@; 3560 warn $@ if $@;
3328 } 3561 }
3562
3563 trace "finished reloading resource files\n";
3564}
3565
3566sub pidfile() {
3567 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3568 or die "$PIDFILE: $!";
3569 flock $fh, &Fcntl::LOCK_EX
3570 or die "$PIDFILE: flock: $!";
3571 $fh
3572}
3573
3574# make sure only one server instance is running at any one time
3575sub atomic {
3576 my $fh = pidfile;
3577
3578 my $pid = <$fh>;
3579 kill 9, $pid if $pid > 0;
3580
3581 seek $fh, 0, 0;
3582 print $fh $$;
3583}
3584
3585sub main_loop {
3586 trace "EV::loop starting\n";
3587 if (1) {
3588 EV::loop;
3589 }
3590 trace "EV::loop returned\n";
3591 goto &main_loop unless $REALLY_UNLOOP;
3329} 3592}
3330 3593
3331sub main { 3594sub main {
3595 cf::init_globals; # initialise logging
3596
3597 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3598 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3599 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3600 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3601
3602 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3603
3332 # we must not ever block the main coroutine 3604 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3605 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3606 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3607 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3608 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3609 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3610 })->prio (Coro::PRIO_MAX);
3339 }; 3611 };
3340 3612
3613 evthread_start IO::AIO::poll_fileno;
3614
3615 cf::sync_job {
3616 cf::incloader::init ();
3617
3618 cf::init_anim;
3619 cf::init_attackmess;
3620 cf::init_dynamic;
3621
3622 cf::load_settings;
3623
3624 reload_resources;
3341 reload_config; 3625 reload_config;
3342 db_init; 3626 db_init;
3627
3628 cf::init_uuid;
3629 cf::init_signals;
3630 cf::init_skills;
3631
3632 cf::init_beforeplay;
3633
3634 atomic;
3635
3343 load_extensions; 3636 load_extensions;
3344 3637
3345 $TICK_WATCHER->start; 3638 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3639
3347 EV::loop; 3640 # no (long-running) fork's whatsoever before this point(!)
3641 use POSIX ();
3642 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643
3644 (pop @POST_INIT)->(0) while @POST_INIT;
3645 };
3646
3647 cf::object::thawer::errors_are_fatal 0;
3648 info "parse errors in files are no longer fatal from this point on.\n";
3649
3650 my $free_main; $free_main = EV::idle sub {
3651 undef $free_main;
3652 undef &main; # free gobs of memory :)
3653 };
3654
3655 goto &main_loop;
3348} 3656}
3349 3657
3350############################################################################# 3658#############################################################################
3351# initialisation and cleanup 3659# initialisation and cleanup
3352 3660
3353# install some emergency cleanup handlers 3661# install some emergency cleanup handlers
3354BEGIN { 3662BEGIN {
3355 our %SIGWATCHER = (); 3663 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3664 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3665 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3666 cf::cleanup "SIG$signal";
3359 }; 3667 };
3360 } 3668 }
3361} 3669}
3362 3670
3363sub write_runtime { 3671sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3672 my $t0 = AE::time;
3365 3673
3366 # first touch the runtime file to show we are still running: 3674 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3675 # the fsync below can take a very very long time.
3368 3676
3369 IO::AIO::aio_utime $runtime, undef, undef; 3677 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3678
3371 my $guard = cf::lock_acquire "write_runtime"; 3679 my $guard = cf::lock_acquire "write_runtime";
3372 3680
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3682 or return;
3375 3683
3376 my $value = $cf::RUNTIME + 90 + 10; 3684 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3685 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3686 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3696 aio_utime $fh, undef, undef;
3389 3697
3390 close $fh 3698 close $fh
3391 or return; 3699 or return;
3392 3700
3393 aio_rename "$runtime~", $runtime 3701 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3702 and return;
3395 3703
3396 warn "runtime file written.\n"; 3704 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3705
3398 1 3706 1
3707}
3708
3709our $uuid_lock;
3710our $uuid_skip;
3711
3712sub write_uuid_sync($) {
3713 $uuid_skip ||= $_[0];
3714
3715 return if $uuid_lock;
3716 local $uuid_lock = 1;
3717
3718 my $uuid = "$LOCALDIR/uuid";
3719
3720 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3721 or return;
3722
3723 my $value = uuid_seq uuid_cur;
3724
3725 unless ($value) {
3726 info "cowardly refusing to write zero uuid value!\n";
3727 return;
3728 }
3729
3730 my $value = uuid_str $value + $uuid_skip;
3731 $uuid_skip = 0;
3732
3733 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3734 and return;
3735
3736 # always fsync - this file is important
3737 aio_fsync $fh
3738 and return;
3739
3740 close $fh
3741 or return;
3742
3743 aio_rename "$uuid~", $uuid
3744 and return;
3745
3746 trace "uuid file written ($value).\n";
3747
3748 1
3749
3750}
3751
3752sub write_uuid($$) {
3753 my ($skip, $sync) = @_;
3754
3755 $sync ? write_uuid_sync $skip
3756 : async { write_uuid_sync $skip };
3399} 3757}
3400 3758
3401sub emergency_save() { 3759sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3760 my $freeze_guard = cf::freeze_mainloop;
3403 3761
3404 warn "enter emergency perl save\n"; 3762 info "emergency_perl_save: enter\n";
3763
3764 # this is a trade-off: we want to be very quick here, so
3765 # save all maps without fsync, and later call a global sync
3766 # (which in turn might be very very slow)
3767 local $USE_FSYNC = 0;
3405 3768
3406 cf::sync_job { 3769 cf::sync_job {
3770 cf::write_runtime_sync; # external watchdog should not bark
3771
3407 # use a peculiar iteration method to avoid tripping on perl 3772 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3773 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3774 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3775 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3776 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3777 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3778 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3779 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3780 $pl->save;
3416 } 3781 }
3417 warn "end emergency player save\n"; 3782 info "emergency_perl_save: end player save\n";
3418 3783
3419 warn "begin emergency map save\n"; 3784 cf::write_runtime_sync; # external watchdog should not bark
3785
3786 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3787 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3788 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3789 $map->valid or next;
3423 $map->save; 3790 $map->save;
3424 } 3791 }
3425 warn "end emergency map save\n"; 3792 info "emergency_perl_save: end map save\n";
3426 3793
3427 warn "begin emergency database checkpoint\n"; 3794 cf::write_runtime_sync; # external watchdog should not bark
3795
3796 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3797 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3798 info "emergency_perl_save: end database checkpoint\n";
3799
3800 info "emergency_perl_save: begin write uuid\n";
3801 write_uuid_sync 1;
3802 info "emergency_perl_save: end write uuid\n";
3803
3804 cf::write_runtime_sync; # external watchdog should not bark
3805
3806 trace "emergency_perl_save: syncing database to disk";
3807 BDB::db_env_txn_checkpoint $DB_ENV;
3808
3809 info "emergency_perl_save: starting sync\n";
3810 IO::AIO::aio_sync sub {
3811 info "emergency_perl_save: finished sync\n";
3812 };
3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3816 trace "emergency_perl_save: flushing outstanding aio requests";
3817 while (IO::AIO::nreqs || BDB::nreqs) {
3818 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3819 }
3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3822 };
3431 3823
3432 warn "leave emergency perl save\n"; 3824 info "emergency_perl_save: leave\n";
3433} 3825}
3434 3826
3435sub post_cleanup { 3827sub post_cleanup {
3436 my ($make_core) = @_; 3828 my ($make_core) = @_;
3437 3829
3830 IO::AIO::flush;
3831
3438 warn Carp::longmess "post_cleanup backtrace" 3832 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3833 if $make_core;
3834
3835 my $fh = pidfile;
3836 unlink $PIDFILE if <$fh> == $$;
3837}
3838
3839# a safer delete_package, copied from Symbol
3840sub clear_package($) {
3841 my $pkg = shift;
3842
3843 # expand to full symbol table name if needed
3844 unless ($pkg =~ /^main::.*::$/) {
3845 $pkg = "main$pkg" if $pkg =~ /^::/;
3846 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3847 $pkg .= '::' unless $pkg =~ /::$/;
3848 }
3849
3850 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3851 my $stem_symtab = *{$stem}{HASH};
3852
3853 defined $stem_symtab and exists $stem_symtab->{$leaf}
3854 or return;
3855
3856 # clear all symbols
3857 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3858 for my $name (keys %$leaf_symtab) {
3859 _gv_clear *{"$pkg$name"};
3860# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3861 }
3440} 3862}
3441 3863
3442sub do_reload_perl() { 3864sub do_reload_perl() {
3443 # can/must only be called in main 3865 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3866 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3867 error "can only reload from main coroutine";
3446 return; 3868 return;
3447 } 3869 }
3448 3870
3871 return if $RELOAD++;
3872
3873 my $t1 = AE::time;
3874
3875 while ($RELOAD) {
3876 cf::get_slot 0.1, -1, "reload_perl";
3449 warn "reloading..."; 3877 info "reloading...";
3450 3878
3451 warn "entering sync_job"; 3879 trace "entering sync_job";
3452 3880
3453 cf::sync_job { 3881 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3882 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3883
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 3884 trace "cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3885 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3886 %EXT_CORO = ();
3477 3887
3478 warn "removing commands"; 3888 trace "removing commands";
3479 %COMMAND = (); 3889 %COMMAND = ();
3480 3890
3481 warn "removing ext/exti commands"; 3891 trace "removing ext/exti commands";
3482 %EXTCMD = (); 3892 %EXTCMD = ();
3483 %EXTICMD = (); 3893 %EXTICMD = ();
3484 3894
3485 warn "unloading/nuking all extensions"; 3895 trace "unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3896 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3897 trace "... unloading $pkg";
3488 3898
3489 if (my $cb = $pkg->can ("unload")) { 3899 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3900 eval {
3491 $cb->($pkg); 3901 $cb->($pkg);
3492 1 3902 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3903 } or error "$pkg unloaded, but with errors: $@";
3904 }
3905
3906 trace "... clearing $pkg";
3907 clear_package $pkg;
3494 } 3908 }
3495 3909
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3910 trace "unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3911 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3912 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3913
3504 warn "... unloading $k"; 3914 trace "... unloading $k";
3505 delete $INC{$k}; 3915 delete $INC{$k};
3506 3916
3507 $k =~ s/\.pm$//; 3917 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3918 $k =~ s/\//::/g;
3509 3919
3510 if (my $cb = $k->can ("unload_module")) { 3920 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3921 $cb->();
3922 }
3923
3924 clear_package $k;
3512 } 3925 }
3513 3926
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3927 trace "getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3928 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3929 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3930
3521 warn "unloading cf.pm \"a bit\""; 3931 trace "unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3932 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3933 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3934
3525 # don't, removes xs symbols, too, 3935 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3936 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3937 #clear_package __PACKAGE__;
3528 3938
3529 warn "unload completed, starting to reload now"; 3939 info "unload completed, starting to reload now";
3530 3940
3531 warn "reloading cf.pm"; 3941 trace "reloading cf.pm";
3532 require cf; 3942 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3943 cf::_connect_to_perl_1;
3534 3944
3535 warn "loading config and database again"; 3945 trace "loading config and database again";
3536 cf::reload_config; 3946 cf::reload_config;
3537 3947
3538 warn "loading extensions"; 3948 trace "loading extensions";
3539 cf::load_extensions; 3949 cf::load_extensions;
3540 3950
3951 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 3952 trace "reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 3953 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 3954 trace "reattaching attachments to maps";
3544 reattach $_ for values %MAP; 3955 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 3956 trace "reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 3957 reattach $_ for values %PLAYER;
3958 }
3547 3959
3960 trace "running post_init jobs";
3961 (pop @POST_INIT)->(1) while @POST_INIT;
3962
3548 warn "leaving sync_job"; 3963 trace "leaving sync_job";
3549 3964
3550 1 3965 1
3551 } or do { 3966 } or do {
3552 warn $@; 3967 error $@;
3553 warn "error while reloading, exiting."; 3968 cf::cleanup "error while reloading, exiting.";
3554 exit 1; 3969 };
3970
3971 info "reloaded";
3972 --$RELOAD;
3555 }; 3973 }
3556 3974
3557 warn "reloaded"; 3975 $t1 = AE::time - $t1;
3976 info "reload completed in ${t1}s\n";
3558}; 3977};
3559 3978
3560our $RELOAD_WATCHER; # used only during reload 3979our $RELOAD_WATCHER; # used only during reload
3561 3980
3562sub reload_perl() { 3981sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 3982 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 3983 # coro crashes during coro_state_free->destroy here.
3565 3984
3985 $RELOAD_WATCHER ||= cf::async {
3986 Coro::AIO::aio_wait cache_extensions;
3987
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3988 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3567 do_reload_perl; 3989 do_reload_perl;
3568 undef $RELOAD_WATCHER; 3990 undef $RELOAD_WATCHER;
3991 };
3569 }; 3992 };
3570} 3993}
3571 3994
3572register_command "reload" => sub { 3995register_command "reload" => sub {
3573 my ($who, $arg) = @_; 3996 my ($who, $arg) = @_;
3579 reload_perl; 4002 reload_perl;
3580 }; 4003 };
3581 } 4004 }
3582}; 4005};
3583 4006
3584unshift @INC, $LIBDIR; 4007#############################################################################
3585 4008
3586my $bug_warning = 0; 4009my $bug_warning = 0;
3587 4010
3588our @WAIT_FOR_TICK; 4011our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4012our @WAIT_FOR_TICK_BEGIN;
3590 4013
3591sub wait_for_tick { 4014sub wait_for_tick {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4016
3595 my $signal = new Coro::Signal; 4017 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4018 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4019 $signal->wait;
3598} 4020}
3599 4021
3600sub wait_for_tick_begin { 4022sub wait_for_tick_begin {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4023 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4024
3604 my $signal = new Coro::Signal; 4025 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4026 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4027 $signal->wait;
3607} 4028}
3608 4029
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4030sub tick {
3610 if ($Coro::current != $Coro::main) { 4031 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4032 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4033 unless ++$bug_warning > 10;
3613 return; 4034 return;
3614 } 4035 }
3615 4036
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4037 cf::server_tick; # one server iteration
3619 4038
3620 $RUNTIME += $TICK; 4039 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4040
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4041 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4042 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4043 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4044 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4045 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4046 or error "ERROR: unable to write runtime file: $!";
3629 }; 4047 };
3630 } 4048 }
3631 4049
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4050 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4051 $sig->send;
3634 } 4052 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4053 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4054 $sig->send;
3637 } 4055 }
3638 4056
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4057 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4058 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4059
3642 _post_tick; 4060 if (0) {
3643}; 4061 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4062 my $jitter = $TICK_START - $NEXT_TICK;
4063 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4064 debug "jitter $JITTER\n";#d#
4065 }
4066 }
4067}
3645 4068
3646{ 4069{
3647 # configure BDB 4070 # configure BDB
3648 4071
3649 BDB::min_parallel 8; 4072 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4073 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4074 $AnyEvent::BDB::WATCHER->priority (1);
3652 4075
3653 unless ($DB_ENV) { 4076 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4077 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4078 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4079 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4080 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4081 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4082 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4083
3660 cf::sync_job { 4084 cf::sync_job {
3661 eval { 4085 eval {
3687{ 4111{
3688 # configure IO::AIO 4112 # configure IO::AIO
3689 4113
3690 IO::AIO::min_parallel 8; 4114 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4115 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4116 undef $AnyEvent::AIO::WATCHER;
3693} 4117}
3694 4118
3695my $_log_backtrace; 4119my $_log_backtrace;
3696 4120
3697sub _log_backtrace { 4121sub _log_backtrace {
3700 $msg =~ s/\n//; 4124 $msg =~ s/\n//;
3701 4125
3702 # limit the # of concurrent backtraces 4126 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4127 if ($_log_backtrace < 2) {
3704 ++$_log_backtrace; 4128 ++$_log_backtrace;
4129 my $perl_bt = Carp::longmess $msg;
3705 async { 4130 async {
3706 $Coro::current->{desc} = "abt $msg"; 4131 $Coro::current->{desc} = "abt $msg";
3707 4132
3708 my @bt = fork_call { 4133 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4134 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4145 }
3721 4146
3722 @funcs 4147 @funcs
3723 }; 4148 };
3724 4149
3725 LOG llevInfo, "[ABT] $msg\n"; 4150 LOG llevInfo, "[ABT] $perl_bt\n";
4151 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4152 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4153 --$_log_backtrace;
3728 }; 4154 };
3729 } else { 4155 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4156 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4157 LOG llevInfo, "[ABT] [suppressed]\n";
3732 } 4158 }
3733} 4159}
3734 4160
3735# load additional modules 4161# load additional modules
3736use cf::pod; 4162require "cf/$_.pm" for @EXTRA_MODULES;
4163cf::_connect_to_perl_2;
3737 4164
3738END { cf::emergency_save } 4165END { cf::emergency_save }
3739 4166
37401 41671
3741 4168

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines