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.370 by root, Thu Sep 13 10:59:41 2007 UTC vs.
Revision 1.484 by root, Mon Oct 12 14:00:58 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
14 37
38use Guard ();
15use Coro 3.64 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
24use Coro::Util (); 52use Coro::Util ();
25 53
26use JSON::XS (); 54use JSON::XS 2.01 ();
27use BDB (); 55use BDB ();
28use Data::Dumper; 56use Data::Dumper;
29use Digest::MD5; 57use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
129our $NOW;
93 130
94our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
97 134
98# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
… …
161 217
162The raw value load value from the last tick. 218The raw value load value from the last tick.
163 219
164=item %cf::CFG 220=item %cf::CFG
165 221
166Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 223from wherever your confdir points to.
168 224
169=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
170 226
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
176 232
177This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 235that call.
180 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$Event::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
221}; 295};
222 296
223############################################################################# 297#############################################################################
224 298
… …
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 322 $d
249 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
250} 324}
251 325
252=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
253 327
254Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
255 329
256=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
257 331
258Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
259 333
260=cut 334=cut
261 335
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 337
264sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
266 354
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 367deadlocked coro.
… …
285 373
286Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 396}
335 }; 397
336 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
337 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
338} 411}
339 412
340=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
341 414
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
353our @SLOT_QUEUE; 426our @SLOT_QUEUE;
354our $SLOT_QUEUE; 427our $SLOT_QUEUE;
355 428
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
358 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
359 434
360 while () { 435 while () {
361 next_job: 436 next_job:
362 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
… …
370 } 445 }
371 } 446 }
372 } 447 }
373 448
374 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 452 $signal->wait;
378 } else { 453 } else {
379 Coro::schedule; 454 Coro::schedule;
380 } 455 }
381 } 456 }
382}; 457};
383 458
384sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
385 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
386 463
387 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
389 466
… …
403 480
404BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
405 482
406=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
407 484
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 488acceptable.
412 489
413If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
419 496
420sub sync_job(&) { 497sub sync_job(&) {
421 my ($job) = @_; 498 my ($job) = @_;
422 499
423 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 501 my $time = EV::time;
425 502
426 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
428 505
429 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 507
431 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
432 509
433 my $busy = 1; 510 my $busy = 1;
434 my @res; 511 my @res;
435 512
436 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 515 @res = eval { $job->() };
438 warn $@ if $@; 516 warn $@ if $@;
439 undef $busy; 517 undef $busy;
440 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
441 519
442 while ($busy) { 520 while ($busy) {
443 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
444 } 525 }
526 }
445 527
446 $time = Event::time - $time; 528 my $time = EV::time - $time;
447 529
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
452 531
453 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
454 } else { 533 } else {
455 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
456 535
… …
481=item fork_call { }, $args 560=item fork_call { }, $args
482 561
483Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
487 566
488=cut 567=cut
489 568
490sub fork_call(&@) { 569sub fork_call(&@) {
491 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
… …
498 reset_signals; 577 reset_signals;
499 &$cb 578 &$cb
500 }, @args; 579 }, @args;
501 580
502 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
503} 609}
504 610
505=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
506 612
507Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
646 752
647############################################################################# 753#############################################################################
648 754
649=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
650 756
651Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
654 760
655In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 763Deliantra).
658 764
659=over 4 765=over 4
660 766
661=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
662 768
… …
706=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
707 813
708Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
710 816
711Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
713 819
714These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
715 821
716=over 4 822=over 4
… …
944 } 1050 }
945 1051
946 0 1052 0
947} 1053}
948 1054
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1056
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1058
953Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
954 1060
… …
960 1066
961=cut 1067=cut
962 1068
963############################################################################# 1069#############################################################################
964# object support 1070# object support
965#
966 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
967sub _can_merge { 1105sub _can_merge {
968 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
969 1107
970 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1109
974 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
975} 1112}
976 1113
977sub reattach { 1114sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1116 my ($obj) = @_;
980 1117
1118 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1120
983 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
984 1122
985 @$registry = (); 1123 @$registry = ();
986 1124
… …
1001cf::attachable->attach ( 1139cf::attachable->attach (
1002 prio => -1000000, 1140 prio => -1000000,
1003 on_instantiate => sub { 1141 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1005 1143
1006 $data = from_json $data; 1144 $data = decode_json $data;
1007 1145
1008 for (@$data) { 1146 for (@$data) {
1009 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1010 1148
1011 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1024 }, 1162 },
1025); 1163);
1026 1164
1027sub object_freezer_save { 1165sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1167
1032 sync_job { 1168 sync_job {
1033 if (length $$rdata) { 1169 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1037 1173
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1042 close $fh; 1181 aio_close $fh;
1043 1182
1044 if (@$objs) { 1183 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1050 close $fh; 1192 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1194 }
1053 } else { 1195 } else {
1054 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1055 } 1197 }
1056 1198
1057 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1203 } else {
1059 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1060 } 1205 }
1061 } else { 1206 } else {
1062 aio_unlink $filename; 1207 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1064 } 1209 }
1065 }; 1210 };
1066
1067 undef $guard;
1068} 1211}
1069 1212
1070sub object_freezer_as_string { 1213sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1072 1215
… …
1077 1220
1078sub object_thawer_load { 1221sub object_thawer_load {
1079 my ($filename) = @_; 1222 my ($filename) = @_;
1080 1223
1081 my ($data, $av); 1224 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1225
1085 (aio_load $filename, $data) >= 0 1226 (aio_load $filename, $data) >= 0
1086 or return; 1227 or return;
1087 1228
1088 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1231 or return;
1091 1232
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1094 } 1235 }
1095 1236
1096 utf8::decode (my $decname = $filename); 1237 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
… …
1159 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1160 1301
1161 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1162} 1303}
1163 1304
1305use File::Glob ();
1306
1164cf::player->attach ( 1307cf::player->attach (
1165 on_command => sub { 1308 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1167 1310
1168 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1200 1343
1201 cf::override; 1344 cf::override;
1202 }, 1345 },
1203); 1346);
1204 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1205sub load_extensions { 1361sub load_extensions {
1206 cf::sync_job { 1362 cf::sync_job {
1207 my %todo; 1363 my %todo;
1208 1364
1209 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
… …
1228 1384
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1387
1232 $ext{source} = 1388 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1235 . $source 1391 . $source
1236 . "\n};\n1"; 1392 . "\n};\n1";
1237 1393
1238 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1254 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1256 1412
1257 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1414 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1416 }
1262 1417
1263 warn $msg; 1418 warn $msg;
1264 } 1419 }
1265 1420
… …
1279 1434
1280=back 1435=back
1281 1436
1282=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1283 1438
1284Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1285 1440
1286=cut 1441=cut
1287 1442
1288package cf::player; 1443package cf::player;
1289 1444
… …
1332 1487
1333sub exists($) { 1488sub exists($) {
1334 my ($login) = @_; 1489 my ($login) = @_;
1335 1490
1336 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1338} 1493}
1339 1494
1340sub find($) { 1495sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1497 my $login = $_[0];
… …
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1508
1354 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1510 or return;
1356 1511
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1359 or return; 1513 or return;
1514
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1363 } 1518 }
1364 } 1519 }
… …
1374 1529
1375 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1376 1531
1377 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1379 1536
1380 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1538 cf::cede_to_tick;
1382} 1539}
1383 1540
… …
1415 my ($pl) = @_; 1572 my ($pl) = @_;
1416 1573
1417 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1418 1575
1419 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1578
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1426 1585
1427 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1467 1626
1468 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1469 my $path = path $login; 1628 my $path = path $login;
1470 1629
1471 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1636 }
1477 1637
… …
1508 } 1668 }
1509 1669
1510 \@paths 1670 \@paths
1511} 1671}
1512 1672
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1674
1515Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1676
1564=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1565 1678
1566Sends an ext reply to the player. 1679Sends an ext reply to the player.
1567 1680
… …
1634our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1636 1749
1637sub generate_random_map { 1750sub generate_random_map {
1638 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1639 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1756 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1765 1881
1766# the temporary/swap location 1882# the temporary/swap location
1767sub save_path { 1883sub save_path {
1768 my ($self) = @_; 1884 my ($self) = @_;
1769 1885
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1772} 1888}
1773 1889
1774# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1775sub uniq_path { 1891sub uniq_path {
1776 my ($self) = @_; 1892 my ($self) = @_;
1777 1893
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1896}
1790 1897
1791sub decay_objects { 1898sub decay_objects {
1792 my ($self) = @_; 1899 my ($self) = @_;
1793 1900
… …
1877sub find { 1984sub find {
1878 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1879 1986
1880 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1881 1988
1882 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1991
1885 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1890 or return; 1994 or return;
1891 1995
1892 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1893 1997
… …
1895 or return; 1999 or return;
1896 2000
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1900 undef $guard1; 2005 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2006 $map->reset;
1903 return find $path; 2007 return find $path;
1904 } 2008 }
1905 2009
1906 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
… …
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2038 $f->skip_block;
1935 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1936 or return; 2040 or return;
1937 2041
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1939 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1940 2044
1941 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2046 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
… …
1961 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2066 $self->decay_objects;
1963 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1964 $self->update_buttons; 2068 $self->update_buttons;
1965 cf::cede_to_tick; 2069 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2070 $self->activate;
1969 } 2071 }
1970 2072
1971 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1973 2075
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2077 }
1976 2078
1977 $self->post_load; 2079 $self->post_load;
1978} 2080}
1979 2081
… …
2037 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2038 2140
2039 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2040 2142
2041 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2145 }
2044 2146
2045 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2046 2148
2047 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2048 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2154 if (my $map = find $k) {
2051 $map->load if $v; 2155 $map->load if $v;
2052 } 2156 }
… …
2078 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2079 2183
2080 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2081 2185
2082 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2084 }; 2189 };
2190
2191 cf::get_slot 0.02;
2085 2192
2086 if ($uniq) { 2193 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2196 } else {
… …
2098 $self->save; 2205 $self->save;
2099 2206
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2208
2102 return if $self->players; 2209 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2105 2212
2106 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2107 2214
2108 $self->deactivate; 2215 $self->deactivate;
… …
2133 2240
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2242
2136 return if $self->players; 2243 return if $self->players;
2137 2244
2138 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2139 2246
2140 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2141 2248
2142 # need to save uniques path 2249 # need to save uniques path
2143 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2226 2333
2227sub unique_maps() { 2334sub unique_maps() {
2228 [ 2335 [
2229 map { 2336 map {
2230 utf8::decode $_; 2337 utf8::decode $_;
2231 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2232 ? normalise $_ 2341 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2343 ]
2236} 2344}
2237 2345
2238package cf;
2239
2240=back 2346=back
2241 2347
2242=head3 cf::object 2348=head3 cf::object
2243 2349
2244=cut 2350=cut
… …
2247 2353
2248=over 4 2354=over 4
2249 2355
2250=item $ob->inv_recursive 2356=item $ob->inv_recursive
2251 2357
2252Returns the inventory of the object _and_ their inventories, recursively. 2358Returns the inventory of the object I<and> their inventories, recursively,
2359but I<not> the object itself.
2253 2360
2254=cut 2361=cut
2255 2362
2256sub inv_recursive_; 2363sub inv_recursive_;
2257sub inv_recursive_ { 2364sub inv_recursive_ {
… …
2262 inv_recursive_ inv $_[0] 2369 inv_recursive_ inv $_[0]
2263} 2370}
2264 2371
2265=item $ref = $ob->ref 2372=item $ref = $ob->ref
2266 2373
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2374Creates and returns a persistent reference to an object that can be stored as a string.
2268 2375
2269=item $ob = cf::object::deref ($refstring) 2376=item $ob = cf::object::deref ($refstring)
2270 2377
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2378returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2379even if the object actually exists. May block.
… …
2274=cut 2381=cut
2275 2382
2276sub deref { 2383sub deref {
2277 my ($ref) = @_; 2384 my ($ref) = @_;
2278 2385
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2386 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2387 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2388 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2389 or return;
2286 $pl->ob->uuid eq $uuid 2390 $pl->ob->uuid eq $uuid
2287 or return; 2391 or return;
… …
2307can be C<undef>. Does the right thing when the player is currently in a 2411can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2412dialogue with the given NPC character.
2309 2413
2310=cut 2414=cut
2311 2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2429
2312# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2431# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
… …
2327 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2447
2330 } else { 2448 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2451 }
2334 } 2452 }
2335} 2453}
2336 2454
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2362 2480
2363=item $player_object->enter_link 2481=item $player_object->enter_link
2364 2482
2365Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2366 2484
2367The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2369 2489
2370Will never block. 2490Will never block.
2371 2491
2372=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2373 2493
… …
2431 2551
2432 $map->load; 2552 $map->load;
2433 $map->load_neighbours; 2553 $map->load_neighbours;
2434 2554
2435 return unless $self->contr->active; 2555 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2556
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2440} 2562}
2441 2563
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2565
2444Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2568that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2569the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2570be called at the end of this process.
2449 2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2574
2450=cut 2575=cut
2451 2576
2452our $GOTOGEN; 2577our $GOTOGEN;
2453 2578
2454sub cf::object::player::goto { 2579sub cf::object::player::goto {
… …
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2584
2460 $self->enter_link; 2585 $self->enter_link;
2461 2586
2462 (async { 2587 (async {
2588 $Coro::current->{desc} = "player::goto $path $x $y";
2589
2463 # *tag paths override both path and x|y 2590 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2591 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2592 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2593 my $ob = $obs[rand @obs];
2467 2594
… …
2530} 2657}
2531 2658
2532sub prepare_random_map { 2659sub prepare_random_map {
2533 my ($exit) = @_; 2660 my ($exit) = @_;
2534 2661
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2664 # that depends on the exit object
2540 2665
2541 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
… …
2543 if ($exit->map) { 2668 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2548 } 2675 }
2549 2676
2550 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2551 2678
2552 my $data = cf::to_json $rmp; 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2555 2682
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2685 undef $fh;
2559 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2560 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2563 } 2694 }
2564} 2695}
2565 2696
2566sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2568 2699
2569 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2570 2701
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2702 $self->enter_link;
2583 2703
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2704 (async {
2589 $self->deactivate_recursive; # just to be sure 2705 $Coro::current->{desc} = "enter_exit";
2706
2590 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2591 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2592 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2593 1; 2728 1
2594 }) { 2729 }) {
2595 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2596 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2597 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2598 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2599 2734
2600 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
… …
2628the message, with C<log> being the default. If C<$color> is negative, suppress 2763the message, with C<log> being the default. If C<$color> is negative, suppress
2629the message unless the client supports the msg packet. 2764the message unless the client supports the msg packet.
2630 2765
2631=cut 2766=cut
2632 2767
2768# non-persistent channels (usually the info channel)
2633our %CHANNEL = ( 2769our %CHANNEL = (
2634 "c/identify" => { 2770 "c/identify" => {
2635 id => "identify", 2771 id => "infobox",
2636 title => "Identify", 2772 title => "Identify",
2637 reply => undef, 2773 reply => undef,
2638 tooltip => "Items recently identified", 2774 tooltip => "Items recently identified",
2639 }, 2775 },
2640 "c/examine" => { 2776 "c/examine" => {
2641 id => "examine", 2777 id => "infobox",
2642 title => "Examine", 2778 title => "Examine",
2643 reply => undef, 2779 reply => undef,
2644 tooltip => "Signs and other items you examined", 2780 tooltip => "Signs and other items you examined",
2645 }, 2781 },
2782 "c/book" => {
2783 id => "infobox",
2784 title => "Book",
2785 reply => undef,
2786 tooltip => "The contents of a note or book",
2787 },
2788 "c/lookat" => {
2789 id => "infobox",
2790 title => "Look",
2791 reply => undef,
2792 tooltip => "What you saw there",
2793 },
2794 "c/who" => {
2795 id => "infobox",
2796 title => "Players",
2797 reply => undef,
2798 tooltip => "Shows players who are currently online",
2799 },
2800 "c/body" => {
2801 id => "infobox",
2802 title => "Body Parts",
2803 reply => undef,
2804 tooltip => "Shows which body parts you posess and are available",
2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2812 "c/skills" => {
2813 id => "infobox",
2814 title => "Skills",
2815 reply => undef,
2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2841 },
2842 "c/uptime" => {
2843 id => "infobox",
2844 title => "Uptime",
2845 reply => undef,
2846 tooltip => "How long the server has been running since last restart",
2847 },
2848 "c/mapinfo" => {
2849 id => "infobox",
2850 title => "Map Info",
2851 reply => undef,
2852 tooltip => "Information related to the maps",
2853 },
2854 "c/party" => {
2855 id => "party",
2856 title => "Party",
2857 reply => "gsay ",
2858 tooltip => "Messages and chat related to your party",
2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2646); 2868);
2647 2869
2648sub cf::client::send_msg { 2870sub cf::client::send_msg {
2649 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2650 2872
2651 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg)
2874 unless $color & cf::NDI_VERBATIM;
2652 2875
2653 $color &= cf::NDI_CLIENT_MASK; # just in case... 2876 $color &= cf::NDI_CLIENT_MASK; # just in case...
2654 2877
2655 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2656 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2879 if ($CHANNEL{$channel}) {
2880 $channel = $CHANNEL{$channel};
2657 2881
2882 $self->ext_msg (channel_info => $channel);
2883 $channel = $channel->{id};
2884
2658 if (ref $channel) { 2885 } elsif (ref $channel) {
2659 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2660 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2661 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2662 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2663 if $self->can_msg;
2664 } 2890 }
2665 2891
2666 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2667 } 2893 }
2668 2894
2669 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2670 2896
2671 if ($self->can_msg) {
2672 # default colour, mask it out 2897 # default colour, mask it out
2673 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2674 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2675 2900
2676 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2901 my $pkt = "msg "
2902 . $self->{json_coder}->encode (
2677 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2678 } else { 2904 );
2679 if ($color >= 0) {
2680 # replace some tags by gcfclient-compatible ones
2681 for ($msg) {
2682 1 while
2683 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2684 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2685 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2686 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2687 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2688 }
2689 2905
2690 $color &= cf::NDI_COLOR_MASK; 2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2691 2909
2692 utf8::encode $msg; 2910 # split very large packets
2693 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2694 if (0 && $msg =~ /\[/) { 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2695 # COMMAND/INFO 2913 $pkt = "frag";
2696 $self->send_packet ("drawextinfo $color 10 8 $msg")
2697 } else {
2698 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2699 $self->send_packet ("drawinfo $color $msg")
2700 }
2701 }
2702 } 2914 }
2915
2916 $self->send_packet ($pkt);
2703} 2917}
2704 2918
2705=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2706 2920
2707Sends an ext event to the client. 2921Sends an ext event to the client.
… …
2880=pod 3094=pod
2881 3095
2882The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
2883 3097
2884 cf::object 3098 cf::object
2885 contr pay_amount pay_player map x y force_find force_add 3099 contr pay_amount pay_player map x y force_find force_add destroy
2886 insert remove name archname title slaying race decrease_ob_nr 3100 insert remove name archname title slaying race decrease split
3101 value
2887 3102
2888 cf::object::player 3103 cf::object::player
2889 player 3104 player
2890 3105
2891 cf::player 3106 cf::player
… …
2896 3111
2897=cut 3112=cut
2898 3113
2899for ( 3114for (
2900 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2901 insert remove inv name archname title slaying race 3116 insert remove inv nrof name archname title slaying race
2902 decrease_ob_nr)], 3117 decrease split destroy change_exp value msg lore send_msg)],
2903 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
2904 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
2905 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
2906) { 3121) {
2907 no strict 'refs'; 3122 no strict 'refs';
2908 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
2909 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2926 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
2927 3142
2928 my $qcode = $code; 3143 my $qcode = $code;
2929 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2930 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
2931 3148
2932 local $_; 3149 local $_;
2933 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
2934 3151
2935 my $eval = 3152 my $eval =
… …
3012 { 3229 {
3013 my $faces = $facedata->{faceinfo}; 3230 my $faces = $facedata->{faceinfo};
3014 3231
3015 while (my ($face, $info) = each %$faces) { 3232 while (my ($face, $info) = each %$faces) {
3016 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3233 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234
3017 cf::face::set_visibility $idx, $info->{visibility}; 3235 cf::face::set_visibility $idx, $info->{visibility};
3018 cf::face::set_magicmap $idx, $info->{magicmap}; 3236 cf::face::set_magicmap $idx, $info->{magicmap};
3019 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3020 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3021 3239
3022 cf::cede_to_tick; 3240 cf::cede_to_tick;
3023 } 3241 }
3024 3242
3025 while (my ($face, $info) = each %$faces) { 3243 while (my ($face, $info) = each %$faces) {
3026 next unless $info->{smooth}; 3244 next unless $info->{smooth};
3245
3027 my $idx = cf::face::find $face 3246 my $idx = cf::face::find $face
3028 or next; 3247 or next;
3248
3029 if (my $smooth = cf::face::find $info->{smooth}) { 3249 if (my $smooth = cf::face::find $info->{smooth}) {
3030 cf::face::set_smooth $idx, $smooth; 3250 cf::face::set_smooth $idx, $smooth;
3031 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3251 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3032 } else { 3252 } else {
3033 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3253 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3051 { 3271 {
3052 # TODO: for gcfclient pleasure, we should give resources 3272 # TODO: for gcfclient pleasure, we should give resources
3053 # that gcfclient doesn't grok a >10000 face index. 3273 # that gcfclient doesn't grok a >10000 face index.
3054 my $res = $facedata->{resource}; 3274 my $res = $facedata->{resource};
3055 3275
3056 my $soundconf = delete $res->{"res/sound.conf"};
3057
3058 while (my ($name, $info) = each %$res) { 3276 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) {
3059 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3278 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3060 my $data; 3279 my $data;
3061 3280
3062 if ($info->{type} & 1) { 3281 if ($info->{type} & 1) {
3063 # prepend meta info 3282 # prepend meta info
3064 3283
3065 my $meta = $enc->encode ({ 3284 my $meta = $enc->encode ({
3066 name => $name, 3285 name => $name,
3067 %{ $info->{meta} || {} }, 3286 %{ $info->{meta} || {} },
3068 }); 3287 });
3069 3288
3070 $data = pack "(w/a*)*", $meta, $info->{data}; 3289 $data = pack "(w/a*)*", $meta, $info->{data};
3290 } else {
3291 $data = $info->{data};
3292 }
3293
3294 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295 cf::face::set_type $idx, $info->{type};
3071 } else { 3296 } else {
3072 $data = $info->{data}; 3297 $RESOURCE{$name} = $info;
3073 } 3298 }
3074 3299
3075 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3076 cf::face::set_type $idx, $info->{type};
3077
3078 cf::cede_to_tick; 3300 cf::cede_to_tick;
3079 } 3301 }
3080
3081 if ($soundconf) {
3082 $soundconf = $enc->decode (delete $soundconf->{data});
3083
3084 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3085 my $sound = $soundconf->{compat}[$_]
3086 or next;
3087
3088 my $face = cf::face::find "sound/$sound->[1]";
3089 cf::sound::set $sound->[0] => $face;
3090 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3091 }
3092
3093 while (my ($k, $v) = each %{$soundconf->{event}}) {
3094 my $face = cf::face::find "sound/$v";
3095 cf::sound::set $k => $face;
3096 }
3097 }
3098 } 3302 }
3303
3304 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3099 3305
3100 1 3306 1
3101} 3307}
3308
3309cf::global->attach (on_resource_update => sub {
3310 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3311 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3312
3313 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3314 my $sound = $soundconf->{compat}[$_]
3315 or next;
3316
3317 my $face = cf::face::find "sound/$sound->[1]";
3318 cf::sound::set $sound->[0] => $face;
3319 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3320 }
3321
3322 while (my ($k, $v) = each %{$soundconf->{event}}) {
3323 my $face = cf::face::find "sound/$v";
3324 cf::sound::set $k => $face;
3325 }
3326 }
3327});
3102 3328
3103register_exticmd fx_want => sub { 3329register_exticmd fx_want => sub {
3104 my ($ns, $want) = @_; 3330 my ($ns, $want) = @_;
3105 3331
3106 while (my ($k, $v) = each %$want) { 3332 while (my ($k, $v) = each %$want) {
3107 $ns->fx_want ($k, $v); 3333 $ns->fx_want ($k, $v);
3108 } 3334 }
3109}; 3335};
3336
3337sub load_resource_file($) {
3338 my $guard = lock_acquire "load_resource_file";
3339
3340 my $status = load_resource_file_ $_[0];
3341 get_slot 0.1, 100;
3342 cf::arch::commit_load;
3343
3344 $status
3345}
3110 3346
3111sub reload_regions { 3347sub reload_regions {
3112 # HACK to clear player env face cache, we need some signal framework 3348 # HACK to clear player env face cache, we need some signal framework
3113 # for this (global event?) 3349 # for this (global event?)
3114 %ext::player_env::MUSIC_FACE_CACHE = (); 3350 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3128} 3364}
3129 3365
3130sub reload_archetypes { 3366sub reload_archetypes {
3131 load_resource_file "$DATADIR/archetypes" 3367 load_resource_file "$DATADIR/archetypes"
3132 or die "unable to load archetypes\n"; 3368 or die "unable to load archetypes\n";
3133 #d# NEED to laod twice to resolve forward references
3134 # this really needs to be done in an extra post-pass
3135 # (which needs to be synchronous, so solve it differently)
3136 load_resource_file "$DATADIR/archetypes"
3137 or die "unable to load archetypes\n";
3138} 3369}
3139 3370
3140sub reload_treasures { 3371sub reload_treasures {
3141 load_resource_file "$DATADIR/treasures" 3372 load_resource_file "$DATADIR/treasures"
3142 or die "unable to load treasurelists\n"; 3373 or die "unable to load treasurelists\n";
3143} 3374}
3144 3375
3145sub reload_resources { 3376sub reload_resources {
3146 warn "reloading resource files...\n"; 3377 warn "reloading resource files...\n";
3147 3378
3379 reload_facedata;
3380 reload_archetypes;
3148 reload_regions; 3381 reload_regions;
3149 reload_facedata;
3150 #reload_archetypes;#d#
3151 reload_archetypes;
3152 reload_treasures; 3382 reload_treasures;
3153 3383
3154 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
3155}
3156
3157sub init {
3158 reload_resources;
3159} 3385}
3160 3386
3161sub reload_config { 3387sub reload_config {
3162 open my $fh, "<:utf8", "$CONFDIR/config" 3388 open my $fh, "<:utf8", "$CONFDIR/config"
3163 or return; 3389 or return;
3164 3390
3165 local $/; 3391 local $/;
3166 *CFG = YAML::Syck::Load <$fh>; 3392 *CFG = YAML::XS::Load <$fh>;
3167 3393
3168 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3169 3395
3170 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3396 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3171 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3397 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3177 }; 3403 };
3178 warn $@ if $@; 3404 warn $@ if $@;
3179 } 3405 }
3180} 3406}
3181 3407
3408sub pidfile() {
3409 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3410 or die "$PIDFILE: $!";
3411 flock $fh, &Fcntl::LOCK_EX
3412 or die "$PIDFILE: flock: $!";
3413 $fh
3414}
3415
3416# make sure only one server instance is running at any one time
3417sub atomic {
3418 my $fh = pidfile;
3419
3420 my $pid = <$fh>;
3421 kill 9, $pid if $pid > 0;
3422
3423 seek $fh, 0, 0;
3424 print $fh $$;
3425}
3426
3427sub main_loop {
3428 warn "EV::loop starting\n";
3429 if (1) {
3430 EV::loop;
3431 }
3432 warn "EV::loop returned\n";
3433 goto &main_loop unless $REALLY_UNLOOP;
3434}
3435
3182sub main { 3436sub main {
3437 cf::init_globals; # initialise logging
3438
3439 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3440 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3441 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3442 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3443
3444 cf::init_experience;
3445 cf::init_anim;
3446 cf::init_attackmess;
3447 cf::init_dynamic;
3448
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450
3183 # we must not ever block the main coroutine 3451 # we must not ever block the main coroutine
3184 local $Coro::idle = sub { 3452 local $Coro::idle = sub {
3185 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3453 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3186 (async { 3454 (async {
3187 Event::one_event; 3455 $Coro::current->{desc} = "IDLE BUG HANDLER";
3456 EV::loop EV::LOOP_ONESHOT;
3188 })->prio (Coro::PRIO_MAX); 3457 })->prio (Coro::PRIO_MAX);
3189 }; 3458 };
3190 3459
3460 evthread_start IO::AIO::poll_fileno;
3461
3462 cf::sync_job {
3463 reload_resources;
3191 reload_config; 3464 reload_config;
3192 db_init; 3465 db_init;
3466
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid;
3470 cf::init_signals;
3471 cf::init_commands;
3472 cf::init_skills;
3473
3474 cf::init_beforeplay;
3475
3476 atomic;
3477
3193 load_extensions; 3478 load_extensions;
3194 3479
3195 $TICK_WATCHER->start; 3480 utime time, time, $RUNTIMEFILE;
3196 Event::loop; 3481
3482 # no (long-running) fork's whatsoever before this point(!)
3483 use POSIX ();
3484 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3485
3486 (pop @POST_INIT)->(0) while @POST_INIT;
3487 };
3488
3489 main_loop;
3197} 3490}
3198 3491
3199############################################################################# 3492#############################################################################
3200# initialisation and cleanup 3493# initialisation and cleanup
3201 3494
3202# install some emergency cleanup handlers 3495# install some emergency cleanup handlers
3203BEGIN { 3496BEGIN {
3497 our %SIGWATCHER = ();
3204 for my $signal (qw(INT HUP TERM)) { 3498 for my $signal (qw(INT HUP TERM)) {
3205 Event->signal ( 3499 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3206 reentrant => 0,
3207 data => WF_AUTOCANCEL,
3208 signal => $signal,
3209 prio => 0,
3210 cb => sub {
3211 cf::cleanup "SIG$signal"; 3500 cf::cleanup "SIG$signal";
3212 },
3213 ); 3501 };
3214 } 3502 }
3215} 3503}
3216 3504
3217sub write_runtime { 3505sub write_runtime_sync {
3218 my $runtime = "$LOCALDIR/runtime";
3219
3220 # first touch the runtime file to show we are still running: 3506 # first touch the runtime file to show we are still running:
3221 # the fsync below can take a very very long time. 3507 # the fsync below can take a very very long time.
3222 3508
3223 IO::AIO::aio_utime $runtime, undef, undef; 3509 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3224 3510
3225 my $guard = cf::lock_acquire "write_runtime"; 3511 my $guard = cf::lock_acquire "write_runtime";
3226 3512
3227 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3513 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3228 or return; 3514 or return;
3229 3515
3230 my $value = $cf::RUNTIME + 90 + 10; 3516 my $value = $cf::RUNTIME + 90 + 10;
3231 # 10 is the runtime save interval, for a monotonic clock 3517 # 10 is the runtime save interval, for a monotonic clock
3232 # 60 allows for the watchdog to kill the server. 3518 # 60 allows for the watchdog to kill the server.
… …
3242 aio_utime $fh, undef, undef; 3528 aio_utime $fh, undef, undef;
3243 3529
3244 close $fh 3530 close $fh
3245 or return; 3531 or return;
3246 3532
3247 aio_rename "$runtime~", $runtime 3533 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3248 and return; 3534 and return;
3249 3535
3250 warn "runtime file written.\n"; 3536 warn "runtime file written.\n";
3251 3537
3252 1 3538 1
3539}
3540
3541our $uuid_lock;
3542our $uuid_skip;
3543
3544sub write_uuid_sync($) {
3545 $uuid_skip ||= $_[0];
3546
3547 return if $uuid_lock;
3548 local $uuid_lock = 1;
3549
3550 my $uuid = "$LOCALDIR/uuid";
3551
3552 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3553 or return;
3554
3555 my $value = uuid_seq uuid_cur;
3556
3557 unless ($value) {
3558 warn "cowardly refusing to write zero uuid value!\n";
3559 return;
3560 }
3561
3562 my $value = uuid_str $value + $uuid_skip;
3563 $uuid_skip = 0;
3564
3565 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3566 and return;
3567
3568 # always fsync - this file is important
3569 aio_fsync $fh
3570 and return;
3571
3572 close $fh
3573 or return;
3574
3575 aio_rename "$uuid~", $uuid
3576 and return;
3577
3578 warn "uuid file written ($value).\n";
3579
3580 1
3581
3582}
3583
3584sub write_uuid($$) {
3585 my ($skip, $sync) = @_;
3586
3587 $sync ? write_uuid_sync $skip
3588 : async { write_uuid_sync $skip };
3253} 3589}
3254 3590
3255sub emergency_save() { 3591sub emergency_save() {
3256 my $freeze_guard = cf::freeze_mainloop; 3592 my $freeze_guard = cf::freeze_mainloop;
3257 3593
3258 warn "enter emergency perl save\n"; 3594 warn "emergency_perl_save: enter\n";
3259 3595
3260 cf::sync_job { 3596 cf::sync_job {
3597 # this is a trade-off: we want to be very quick here, so
3598 # save all maps without fsync, and later call a global sync
3599 # (which in turn might be very very slow)
3600 local $USE_FSYNC = 0;
3601
3261 # use a peculiar iteration method to avoid tripping on perl 3602 # use a peculiar iteration method to avoid tripping on perl
3262 # refcount bugs in for. also avoids problems with players 3603 # refcount bugs in for. also avoids problems with players
3263 # and maps saved/destroyed asynchronously. 3604 # and maps saved/destroyed asynchronously.
3264 warn "begin emergency player save\n"; 3605 warn "emergency_perl_save: begin player save\n";
3265 for my $login (keys %cf::PLAYER) { 3606 for my $login (keys %cf::PLAYER) {
3266 my $pl = $cf::PLAYER{$login} or next; 3607 my $pl = $cf::PLAYER{$login} or next;
3267 $pl->valid or next; 3608 $pl->valid or next;
3609 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3268 $pl->save; 3610 $pl->save;
3269 } 3611 }
3270 warn "end emergency player save\n"; 3612 warn "emergency_perl_save: end player save\n";
3271 3613
3272 warn "begin emergency map save\n"; 3614 warn "emergency_perl_save: begin map save\n";
3273 for my $path (keys %cf::MAP) { 3615 for my $path (keys %cf::MAP) {
3274 my $map = $cf::MAP{$path} or next; 3616 my $map = $cf::MAP{$path} or next;
3275 $map->valid or next; 3617 $map->valid or next;
3276 $map->save; 3618 $map->save;
3277 } 3619 }
3278 warn "end emergency map save\n"; 3620 warn "emergency_perl_save: end map save\n";
3279 3621
3280 warn "begin emergency database checkpoint\n"; 3622 warn "emergency_perl_save: begin database checkpoint\n";
3281 BDB::db_env_txn_checkpoint $DB_ENV; 3623 BDB::db_env_txn_checkpoint $DB_ENV;
3282 warn "end emergency database checkpoint\n"; 3624 warn "emergency_perl_save: end database checkpoint\n";
3625
3626 warn "emergency_perl_save: begin write uuid\n";
3627 write_uuid_sync 1;
3628 warn "emergency_perl_save: end write uuid\n";
3283 }; 3629 };
3284 3630
3631 warn "emergency_perl_save: starting sync()\n";
3632 IO::AIO::aio_sync sub {
3633 warn "emergency_perl_save: finished sync()\n";
3634 };
3635
3285 warn "leave emergency perl save\n"; 3636 warn "emergency_perl_save: leave\n";
3286} 3637}
3287 3638
3288sub post_cleanup { 3639sub post_cleanup {
3289 my ($make_core) = @_; 3640 my ($make_core) = @_;
3290 3641
3291 warn Carp::longmess "post_cleanup backtrace" 3642 warn Carp::longmess "post_cleanup backtrace"
3292 if $make_core; 3643 if $make_core;
3644
3645 my $fh = pidfile;
3646 unlink $PIDFILE if <$fh> == $$;
3647}
3648
3649# a safer delete_package, copied from Symbol
3650sub clear_package($) {
3651 my $pkg = shift;
3652
3653 # expand to full symbol table name if needed
3654 unless ($pkg =~ /^main::.*::$/) {
3655 $pkg = "main$pkg" if $pkg =~ /^::/;
3656 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3657 $pkg .= '::' unless $pkg =~ /::$/;
3658 }
3659
3660 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3661 my $stem_symtab = *{$stem}{HASH};
3662
3663 defined $stem_symtab and exists $stem_symtab->{$leaf}
3664 or return;
3665
3666 # clear all symbols
3667 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3668 for my $name (keys %$leaf_symtab) {
3669 _gv_clear *{"$pkg$name"};
3670# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3671 }
3672 warn "cleared package $pkg\n";#d#
3293} 3673}
3294 3674
3295sub do_reload_perl() { 3675sub do_reload_perl() {
3296 # can/must only be called in main 3676 # can/must only be called in main
3297 if ($Coro::current != $Coro::main) { 3677 if ($Coro::current != $Coro::main) {
3298 warn "can only reload from main coroutine"; 3678 warn "can only reload from main coroutine";
3299 return; 3679 return;
3300 } 3680 }
3301 3681
3682 return if $RELOAD++;
3683
3684 my $t1 = EV::time;
3685
3686 while ($RELOAD) {
3302 warn "reloading..."; 3687 warn "reloading...";
3303 3688
3304 warn "entering sync_job"; 3689 warn "entering sync_job";
3305 3690
3306 cf::sync_job { 3691 cf::sync_job {
3307 cf::write_runtime; # external watchdog should not bark 3692 cf::write_runtime_sync; # external watchdog should not bark
3308 cf::emergency_save; 3693 cf::emergency_save;
3309 cf::write_runtime; # external watchdog should not bark 3694 cf::write_runtime_sync; # external watchdog should not bark
3310 3695
3311 warn "syncing database to disk"; 3696 warn "syncing database to disk";
3312 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
3313 3698
3314 # if anything goes wrong in here, we should simply crash as we already saved 3699 # if anything goes wrong in here, we should simply crash as we already saved
3315 3700
3316 warn "cancelling all WF_AUTOCANCEL watchers";
3317 for (Event::all_watchers) {
3318 $_->cancel if $_->data & WF_AUTOCANCEL;
3319 }
3320
3321 warn "flushing outstanding aio requests"; 3701 warn "flushing outstanding aio requests";
3322 for (;;) {
3323 BDB::flush;
3324 IO::AIO::flush;
3325 Coro::cede;
3326 last unless IO::AIO::nreqs || BDB::nreqs; 3702 while (IO::AIO::nreqs || BDB::nreqs) {
3327 warn "iterate..."; 3703 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3328 }
3329
3330 ++$RELOAD;
3331
3332 warn "cancelling all extension coros";
3333 $_->cancel for values %EXT_CORO;
3334 %EXT_CORO = ();
3335
3336 warn "removing commands";
3337 %COMMAND = ();
3338
3339 warn "removing ext/exti commands";
3340 %EXTCMD = ();
3341 %EXTICMD = ();
3342
3343 warn "unloading/nuking all extensions";
3344 for my $pkg (@EXTS) {
3345 warn "... unloading $pkg";
3346
3347 if (my $cb = $pkg->can ("unload")) {
3348 eval {
3349 $cb->($pkg);
3350 1
3351 } or warn "$pkg unloaded, but with errors: $@";
3352 } 3704 }
3353 3705
3354 warn "... nuking $pkg"; 3706 warn "cancelling all extension coros";
3355 Symbol::delete_package $pkg; 3707 $_->cancel for values %EXT_CORO;
3356 } 3708 %EXT_CORO = ();
3357 3709
3358 warn "unloading all perl modules loaded from $LIBDIR"; 3710 warn "removing commands";
3359 while (my ($k, $v) = each %INC) { 3711 %COMMAND = ();
3360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3361 3712
3713 warn "removing ext/exti commands";
3714 %EXTCMD = ();
3715 %EXTICMD = ();
3716
3717 warn "unloading/nuking all extensions";
3718 for my $pkg (@EXTS) {
3362 warn "... unloading $k"; 3719 warn "... unloading $pkg";
3363 delete $INC{$k};
3364 3720
3365 $k =~ s/\.pm$//;
3366 $k =~ s/\//::/g;
3367
3368 if (my $cb = $k->can ("unload_module")) { 3721 if (my $cb = $pkg->can ("unload")) {
3722 eval {
3369 $cb->(); 3723 $cb->($pkg);
3724 1
3725 } or warn "$pkg unloaded, but with errors: $@";
3726 }
3727
3728 warn "... clearing $pkg";
3729 clear_package $pkg;
3370 } 3730 }
3371 3731
3372 Symbol::delete_package $k; 3732 warn "unloading all perl modules loaded from $LIBDIR";
3733 while (my ($k, $v) = each %INC) {
3734 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3735
3736 warn "... unloading $k";
3737 delete $INC{$k};
3738
3739 $k =~ s/\.pm$//;
3740 $k =~ s/\//::/g;
3741
3742 if (my $cb = $k->can ("unload_module")) {
3743 $cb->();
3744 }
3745
3746 clear_package $k;
3373 } 3747 }
3374 3748
3375 warn "getting rid of safe::, as good as possible"; 3749 warn "getting rid of safe::, as good as possible";
3376 Symbol::delete_package "safe::$_" 3750 clear_package "safe::$_"
3377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3751 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3378 3752
3379 warn "unloading cf.pm \"a bit\""; 3753 warn "unloading cf.pm \"a bit\"";
3380 delete $INC{"cf.pm"}; 3754 delete $INC{"cf.pm"};
3381 delete $INC{"cf/pod.pm"}; 3755 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3382 3756
3383 # don't, removes xs symbols, too, 3757 # don't, removes xs symbols, too,
3384 # and global variables created in xs 3758 # and global variables created in xs
3385 #Symbol::delete_package __PACKAGE__; 3759 #clear_package __PACKAGE__;
3386 3760
3387 warn "unload completed, starting to reload now"; 3761 warn "unload completed, starting to reload now";
3388 3762
3389 warn "reloading cf.pm"; 3763 warn "reloading cf.pm";
3390 require cf; 3764 require cf;
3391 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3765 cf::_connect_to_perl_1;
3392 3766
3393 warn "loading config and database again"; 3767 warn "loading config and database again";
3394 cf::reload_config; 3768 cf::reload_config;
3395 3769
3396 warn "loading extensions"; 3770 warn "loading extensions";
3397 cf::load_extensions; 3771 cf::load_extensions;
3398 3772
3773 if ($REATTACH_ON_RELOAD) {
3399 warn "reattaching attachments to objects/players"; 3774 warn "reattaching attachments to objects/players";
3400 _global_reattach; # objects, sockets 3775 _global_reattach; # objects, sockets
3401 warn "reattaching attachments to maps"; 3776 warn "reattaching attachments to maps";
3402 reattach $_ for values %MAP; 3777 reattach $_ for values %MAP;
3403 warn "reattaching attachments to players"; 3778 warn "reattaching attachments to players";
3404 reattach $_ for values %PLAYER; 3779 reattach $_ for values %PLAYER;
3780 }
3405 3781
3782 warn "running post_init jobs";
3783 (pop @POST_INIT)->(1) while @POST_INIT;
3784
3406 warn "leaving sync_job"; 3785 warn "leaving sync_job";
3407 3786
3408 1 3787 1
3409 } or do { 3788 } or do {
3410 warn $@; 3789 warn $@;
3411 warn "error while reloading, exiting."; 3790 cf::cleanup "error while reloading, exiting.";
3412 exit 1;
3413 }; 3791 };
3414 3792
3415 warn "reloaded"; 3793 warn "reloaded";
3794 --$RELOAD;
3795 }
3796
3797 $t1 = EV::time - $t1;
3798 warn "reload completed in ${t1}s\n";
3416}; 3799};
3417 3800
3418our $RELOAD_WATCHER; # used only during reload 3801our $RELOAD_WATCHER; # used only during reload
3419 3802
3420sub reload_perl() { 3803sub reload_perl() {
3421 # doing reload synchronously and two reloads happen back-to-back, 3804 # doing reload synchronously and two reloads happen back-to-back,
3422 # coro crashes during coro_state_free->destroy here. 3805 # coro crashes during coro_state_free->destroy here.
3423 3806
3424 $RELOAD_WATCHER ||= Event->timer ( 3807 $RELOAD_WATCHER ||= cf::async {
3425 reentrant => 0, 3808 Coro::AIO::aio_wait cache_extensions;
3426 after => 0, 3809
3427 data => WF_AUTOCANCEL, 3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3428 cb => sub {
3429 do_reload_perl; 3811 do_reload_perl;
3430 undef $RELOAD_WATCHER; 3812 undef $RELOAD_WATCHER;
3431 }, 3813 };
3432 ); 3814 };
3433} 3815}
3434 3816
3435register_command "reload" => sub { 3817register_command "reload" => sub {
3436 my ($who, $arg) = @_; 3818 my ($who, $arg) = @_;
3437 3819
3438 if ($who->flag (FLAG_WIZ)) { 3820 if ($who->flag (FLAG_WIZ)) {
3439 $who->message ("reloading server."); 3821 $who->message ("reloading server.");
3822 async {
3823 $Coro::current->{desc} = "perl_reload";
3440 async { reload_perl }; 3824 reload_perl;
3825 };
3441 } 3826 }
3442}; 3827};
3443 3828
3444unshift @INC, $LIBDIR; 3829unshift @INC, $LIBDIR;
3445 3830
… …
3447 3832
3448our @WAIT_FOR_TICK; 3833our @WAIT_FOR_TICK;
3449our @WAIT_FOR_TICK_BEGIN; 3834our @WAIT_FOR_TICK_BEGIN;
3450 3835
3451sub wait_for_tick { 3836sub wait_for_tick {
3452 return unless $TICK_WATCHER->is_active;
3453 return if $Coro::current == $Coro::main; 3837 return if tick_inhibit || $Coro::current == $Coro::main;
3454 3838
3455 my $signal = new Coro::Signal; 3839 my $signal = new Coro::Signal;
3456 push @WAIT_FOR_TICK, $signal; 3840 push @WAIT_FOR_TICK, $signal;
3457 $signal->wait; 3841 $signal->wait;
3458} 3842}
3459 3843
3460sub wait_for_tick_begin { 3844sub wait_for_tick_begin {
3461 return unless $TICK_WATCHER->is_active;
3462 return if $Coro::current == $Coro::main; 3845 return if tick_inhibit || $Coro::current == $Coro::main;
3463 3846
3464 my $signal = new Coro::Signal; 3847 my $signal = new Coro::Signal;
3465 push @WAIT_FOR_TICK_BEGIN, $signal; 3848 push @WAIT_FOR_TICK_BEGIN, $signal;
3466 $signal->wait; 3849 $signal->wait;
3467} 3850}
3468 3851
3469$TICK_WATCHER = Event->timer ( 3852sub tick {
3470 reentrant => 0,
3471 parked => 1,
3472 prio => 0,
3473 at => $NEXT_TICK || $TICK,
3474 data => WF_AUTOCANCEL,
3475 cb => sub {
3476 if ($Coro::current != $Coro::main) { 3853 if ($Coro::current != $Coro::main) {
3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3478 unless ++$bug_warning > 10; 3855 unless ++$bug_warning > 10;
3479 return; 3856 return;
3480 } 3857 }
3481 3858
3482 $NOW = $tick_start = Event::time;
3483
3484 cf::server_tick; # one server iteration 3859 cf::server_tick; # one server iteration
3485 3860
3486 $RUNTIME += $TICK;
3487 $NEXT_TICK += $TICK;
3488
3489 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3861 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3490 $NEXT_RUNTIME_WRITE = $NOW + 10; 3862 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3491 Coro::async_pool { 3863 Coro::async_pool {
3864 $Coro::current->{desc} = "runtime saver";
3492 write_runtime 3865 write_runtime_sync
3493 or warn "ERROR: unable to write runtime file: $!"; 3866 or warn "ERROR: unable to write runtime file: $!";
3494 };
3495 } 3867 };
3868 }
3496 3869
3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3870 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3498 $sig->send; 3871 $sig->send;
3499 } 3872 }
3500 while (my $sig = shift @WAIT_FOR_TICK) { 3873 while (my $sig = shift @WAIT_FOR_TICK) {
3501 $sig->send; 3874 $sig->send;
3502 } 3875 }
3503 3876
3504 $NOW = Event::time; 3877 $LOAD = ($NOW - $TICK_START) / $TICK;
3505
3506 # if we are delayed by four ticks or more, skip them all
3507 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3508
3509 $TICK_WATCHER->at ($NEXT_TICK);
3510 $TICK_WATCHER->start;
3511
3512 $LOAD = ($NOW - $tick_start) / $TICK;
3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3878 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3514 3879
3515 _post_tick; 3880 if (0) {
3881 if ($NEXT_TICK) {
3882 my $jitter = $TICK_START - $NEXT_TICK;
3883 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3884 warn "jitter $JITTER\n";#d#
3885 }
3516 }, 3886 }
3517); 3887}
3518 3888
3519{ 3889{
3890 # configure BDB
3891
3520 BDB::min_parallel 8; 3892 BDB::min_parallel 8;
3521 BDB::max_poll_time $TICK * 0.1; 3893 BDB::max_poll_reqs $TICK * 0.1;
3522 $BDB_POLL_WATCHER = Event->io ( 3894 $AnyEvent::BDB::WATCHER->priority (1);
3523 reentrant => 0,
3524 fd => BDB::poll_fileno,
3525 poll => 'r',
3526 prio => 0,
3527 data => WF_AUTOCANCEL,
3528 cb => \&BDB::poll_cb,
3529 );
3530
3531 BDB::set_sync_prepare {
3532 my $status;
3533 my $current = $Coro::current;
3534 (
3535 sub {
3536 $status = $!;
3537 $current->ready; undef $current;
3538 },
3539 sub {
3540 Coro::schedule while defined $current;
3541 $! = $status;
3542 },
3543 )
3544 };
3545 3895
3546 unless ($DB_ENV) { 3896 unless ($DB_ENV) {
3547 $DB_ENV = BDB::db_env_create; 3897 $DB_ENV = BDB::db_env_create;
3898 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3899 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3900 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3901 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3902 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3548 3903
3549 cf::sync_job { 3904 cf::sync_job {
3550 eval { 3905 eval {
3551 BDB::db_env_open 3906 BDB::db_env_open
3552 $DB_ENV, 3907 $DB_ENV,
… …
3554 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3909 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3555 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3910 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3556 0666; 3911 0666;
3557 3912
3558 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3913 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3559
3560 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3561 | BDB::LOG_AUTOREMOVE, 1);
3562 $DB_ENV->set_lk_detect;
3563 }; 3914 };
3564 3915
3565 cf::cleanup "db_env_open(db): $@" if $@; 3916 cf::cleanup "db_env_open(db): $@" if $@;
3566 }; 3917 };
3567 } 3918 }
3568 3919
3569 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3920 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3570 after => 11, 3921 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3571 interval => 60, 3922 };
3572 hard => 1, 3923 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 prio => 0,
3574 data => WF_AUTOCANCEL,
3575 cb => sub {
3576 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3924 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3577 },
3578 ); 3925 };
3579 $BDB_TRICKLE_WATCHER = Event->timer ( 3926 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3580 after => 5,
3581 interval => 10,
3582 hard => 1,
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => sub {
3586 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3927 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3587 },
3588 ); 3928 };
3589} 3929}
3590 3930
3591{ 3931{
3932 # configure IO::AIO
3933
3592 IO::AIO::min_parallel 8; 3934 IO::AIO::min_parallel 8;
3593
3594 undef $Coro::AIO::WATCHER;
3595 IO::AIO::max_poll_time $TICK * 0.1; 3935 IO::AIO::max_poll_time $TICK * 0.1;
3596 $AIO_POLL_WATCHER = Event->io ( 3936 undef $AnyEvent::AIO::WATCHER;
3597 reentrant => 0,
3598 data => WF_AUTOCANCEL,
3599 fd => IO::AIO::poll_fileno,
3600 poll => 'r',
3601 prio => 6,
3602 cb => \&IO::AIO::poll_cb,
3603 );
3604} 3937}
3605 3938
3606my $_log_backtrace; 3939my $_log_backtrace;
3607 3940
3608sub _log_backtrace { 3941sub _log_backtrace {
… …
3611 $msg =~ s/\n//; 3944 $msg =~ s/\n//;
3612 3945
3613 # limit the # of concurrent backtraces 3946 # limit the # of concurrent backtraces
3614 if ($_log_backtrace < 2) { 3947 if ($_log_backtrace < 2) {
3615 ++$_log_backtrace; 3948 ++$_log_backtrace;
3949 my $perl_bt = Carp::longmess $msg;
3616 async { 3950 async {
3951 $Coro::current->{desc} = "abt $msg";
3952
3617 my @bt = fork_call { 3953 my @bt = fork_call {
3618 @addr = map { sprintf "%x", $_ } @addr; 3954 @addr = map { sprintf "%x", $_ } @addr;
3619 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3955 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3620 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3956 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3621 or die "addr2line: $!"; 3957 or die "addr2line: $!";
… …
3629 } 3965 }
3630 3966
3631 @funcs 3967 @funcs
3632 }; 3968 };
3633 3969
3634 LOG llevInfo, "[ABT] $msg\n"; 3970 LOG llevInfo, "[ABT] $perl_bt\n";
3971 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3635 LOG llevInfo, "[ABT] $_\n" for @bt; 3972 LOG llevInfo, "[ABT] $_\n" for @bt;
3636 --$_log_backtrace; 3973 --$_log_backtrace;
3637 }; 3974 };
3638 } else { 3975 } else {
3639 LOG llevInfo, "[ABT] $msg\n"; 3976 LOG llevInfo, "[ABT] $msg\n";
3640 LOG llevInfo, "[ABT] [suppressed]\n"; 3977 LOG llevInfo, "[ABT] [suppressed]\n";
3641 } 3978 }
3642} 3979}
3643 3980
3644# load additional modules 3981# load additional modules
3645use cf::pod; 3982require "cf/$_.pm" for @EXTRA_MODULES;
3983cf::_connect_to_perl_2;
3646 3984
3647END { cf::emergency_save } 3985END { cf::emergency_save }
3648 3986
36491 39871
3650 3988

Diff Legend

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