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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use 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;
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
75 118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
83 123
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 127our $DB_ENV;
89 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
90our %CFG; 131our %CFG;
91 132
92our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 134our $RUNTIME;
135our $NOW;
94 136
95our (%PLAYER, %PLAYER_LOADING); # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 138our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
98 140
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
162 227
163The raw value load value from the last tick. 228The raw value load value from the last tick.
164 229
165=item %cf::CFG 230=item %cf::CFG
166 231
167Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 233from wherever your confdir points to.
169 234
170=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
171 236
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 240
176=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
177 242
178This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 245that call.
181 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
182=back 253=back
183 254
184=cut 255=cut
185 256
186BEGIN { 257$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 258 my $msg = join "", @_;
189 259
190 $msg .= "\n" 260 $msg .= "\n"
191 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
192 262
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 264
195 LOG llevError, $msg; 265 LOG llevError, $msg;
196 }; 266};
197} 267
268$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "=="
270
271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d#
276 }#d#
277
278 # kill coroutine otherwise
279 Coro::terminate
280};
198 281
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 292for my $pkg (qw(
210 cf::global cf::attachable 293 cf::global cf::attachable
211 cf::object cf::object::player 294 cf::object cf::object::player
212 cf::client cf::player 295 cf::client cf::player
213 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
214 cf::map cf::party cf::region 298 cf::party cf::region
215)) { 299)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 301}
219 302
220$Event::DIED = sub { 303$EV::DIED = sub {
221 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
222}; 305};
223 306
224############################################################################# 307#############################################################################
225 308
226=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 331 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 332 $d
250 } || "[unable to dump $_[0]: '$@']"; 333 } || "[unable to dump $_[0]: '$@']";
251} 334}
252 335
253=item $ref = cf::from_json $json 336=item $ref = cf::decode_json $json
254 337
255Converts a JSON string into the corresponding perl data structure. 338Converts a JSON string into the corresponding perl data structure.
256 339
257=item $json = cf::to_json $ref 340=item $json = cf::encode_json $ref
258 341
259Converts a perl data structure into its JSON representation. 342Converts a perl data structure into its JSON representation.
260 343
261=cut 344=cut
262 345
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 347
265sub to_json ($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
267 364
268=item cf::lock_wait $string 365=item cf::lock_wait $string
269 366
270Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
271 368
272=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
273 370
274Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
277returned. 374returned.
278 375
279Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 377deadlocked coro.
286 383
287Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
288 385
289=cut 386=cut
290 387
291our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 389
294sub lock_wait($) { 390sub lock_wait($) {
295 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 392}
308 393
309sub lock_acquire($) { 394sub lock_acquire($) {
310 my ($key) = @_; 395 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 396}
324 397
325sub lock_active($) { 398sub lock_active($) {
326 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 400}
330 401
331sub freeze_mainloop { 402sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 403 tick_inhibit_inc;
333 404
334 my $guard = Coro::guard { 405 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 406}
336 }; 407
337 $TICK_WATCHER->stop; 408=item cf::periodic $interval, $cb
338 $guard 409
410Like EV::periodic, but randomly selects a starting point so that the actions
411get spread over time.
412
413=cut
414
415sub periodic($$) {
416 my ($interval, $cb) = @_;
417
418 my $start = rand List::Util::min 180, $interval;
419
420 EV::periodic $start, $interval, 0, $cb
339} 421}
340 422
341=item cf::get_slot $time[, $priority[, $name]] 423=item cf::get_slot $time[, $priority[, $name]]
342 424
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 425Allocate $time seconds of blocking CPU time at priority C<$priority>:
351 433
352=cut 434=cut
353 435
354our @SLOT_QUEUE; 436our @SLOT_QUEUE;
355our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
356 439
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
442 $Coro::current->desc ("timeslot manager");
443
359 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
360 446
361 while () { 447 while () {
362 next_job: 448 next_job:
449
363 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 451
365 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 456 $job->[2]->send;
369 Coro::cede; 457 Coro::cede;
370 goto next_job; 458 goto next_job;
371 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 461 }
373 } 462 }
374 463
375 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 467 $signal->wait;
379 } else { 468 } else {
469 $busy = 0;
380 Coro::schedule; 470 Coro::schedule;
381 } 471 }
382 } 472 }
383}; 473};
384 474
385sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
386 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
387 479
388 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
389 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
390 483
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
404 497
405BEGIN { *async = \&Coro::async_pool } 498BEGIN { *async = \&Coro::async_pool }
406 499
407=item cf::sync_job { BLOCK } 500=item cf::sync_job { BLOCK }
408 501
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 502The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 503is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 504partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 505acceptable.
413 506
414If it must be done, put the blocking parts into C<sync_job>. This will run 507If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 508the given BLOCK in another coroutine while waiting for the result. The
420 513
421sub sync_job(&) { 514sub sync_job(&) {
422 my ($job) = @_; 515 my ($job) = @_;
423 516
424 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 518 my $time = AE::time;
426 519
427 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
429 522
430 # TODO: use suspend/resume instead 523 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 524
432 my $freeze_guard = freeze_mainloop; 525 my $freeze_guard = freeze_mainloop;
433 526
434 my $busy = 1; 527 my $busy = 1;
435 my @res; 528 my @res;
436 529
437 (async { 530 (async {
531 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 532 @res = eval { $job->() };
439 warn $@ if $@; 533 warn $@ if $@;
440 undef $busy; 534 undef $busy;
441 })->prio (Coro::PRIO_MAX); 535 })->prio (Coro::PRIO_MAX);
442 536
443 while ($busy) { 537 while ($busy) {
444 Coro::cede or Event::one_event; 538 if (Coro::nready) {
539 Coro::cede_notself;
540 } else {
541 EV::loop EV::LOOP_ONESHOT;
445 } 542 }
543 }
446 544
447 $time = Event::time - $time; 545 my $time = AE::time - $time;
448 546
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
453 548
454 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
455 } else { 550 } else {
456 # we are in another coroutine, how wonderful, everything just works 551 # we are in another coroutine, how wonderful, everything just works
457 552
482=item fork_call { }, $args 577=item fork_call { }, $args
483 578
484Executes the given code block with the given arguments in a seperate 579Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 580process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 581Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 582never block itself or use any form of event handling.
488 583
489=cut 584=cut
490 585
491sub fork_call(&@) { 586sub fork_call(&@) {
492 my ($cb, @args) = @_; 587 my ($cb, @args) = @_;
499 reset_signals; 594 reset_signals;
500 &$cb 595 &$cb
501 }, @args; 596 }, @args;
502 597
503 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
610}
611
612=item $coin = coin_from_name $name
613
614=cut
615
616our %coin_alias = (
617 "silver" => "silvercoin",
618 "silvercoin" => "silvercoin",
619 "silvercoins" => "silvercoin",
620 "gold" => "goldcoin",
621 "goldcoin" => "goldcoin",
622 "goldcoins" => "goldcoin",
623 "platinum" => "platinacoin",
624 "platinumcoin" => "platinacoin",
625 "platinumcoins" => "platinacoin",
626 "platina" => "platinacoin",
627 "platinacoin" => "platinacoin",
628 "platinacoins" => "platinacoin",
629 "royalty" => "royalty",
630 "royalties" => "royalty",
631);
632
633sub coin_from_name($) {
634 $coin_alias{$_[0]}
635 ? cf::arch::find $coin_alias{$_[0]}
636 : undef
504} 637}
505 638
506=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
507 640
508Returns a single value from the environment database. 641Returns a single value from the environment database.
647 780
648############################################################################# 781#############################################################################
649 782
650=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
651 784
652Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
655 788
656In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 791Deliantra).
659 792
660=over 4 793=over 4
661 794
662=item $attachable->attach ($attachment, key => $value...) 795=item $attachable->attach ($attachment, key => $value...)
663 796
707=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
708 841
709Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
711 844
712Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
714 847
715These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
716 849
717=over 4 850=over 4
945 } 1078 }
946 1079
947 0 1080 0
948} 1081}
949 1082
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1083=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1084
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1085=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1086
954Generate an object-specific event with the given arguments. 1087Generate an object-specific event with the given arguments.
955 1088
961 1094
962=cut 1095=cut
963 1096
964############################################################################# 1097#############################################################################
965# object support 1098# object support
966#
967 1099
1100sub _object_equal($$);
1101sub _object_equal($$) {
1102 my ($a, $b) = @_;
1103
1104 return 0 unless (ref $a) eq (ref $b);
1105
1106 if ("HASH" eq ref $a) {
1107 my @ka = keys %$a;
1108 my @kb = keys %$b;
1109
1110 return 0 if @ka != @kb;
1111
1112 for (0 .. $#ka) {
1113 return 0 unless $ka[$_] eq $kb[$_];
1114 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1115 }
1116
1117 } elsif ("ARRAY" eq ref $a) {
1118
1119 return 0 if @$a != @$b;
1120
1121 for (0 .. $#$a) {
1122 return 0 unless _object_equal $a->[$_], $b->[$_];
1123 }
1124
1125 } elsif ($a ne $b) {
1126 return 0;
1127 }
1128
1129 1
1130}
1131
1132our $SLOW_MERGES;#d#
968sub _can_merge { 1133sub _can_merge {
969 my ($ob1, $ob2) = @_; 1134 my ($ob1, $ob2) = @_;
970 1135
971 local $Storable::canonical = 1; 1136 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1137
975 $fob1 eq $fob2 1138 # we do the slow way here
1139 return _object_equal $ob1, $ob2
976} 1140}
977 1141
978sub reattach { 1142sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1144 my ($obj) = @_;
981 1145
1146 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1148
984 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
985 1150
986 @$registry = (); 1151 @$registry = ();
987 1152
1002cf::attachable->attach ( 1167cf::attachable->attach (
1003 prio => -1000000, 1168 prio => -1000000,
1004 on_instantiate => sub { 1169 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1170 my ($obj, $data) = @_;
1006 1171
1007 $data = from_json $data; 1172 $data = decode_json $data;
1008 1173
1009 for (@$data) { 1174 for (@$data) {
1010 my ($name, $args) = @$_; 1175 my ($name, $args) = @$_;
1011 1176
1012 $obj->attach ($name, %{$args || {} }); 1177 $obj->attach ($name, %{$args || {} });
1030 1195
1031 sync_job { 1196 sync_job {
1032 if (length $$rdata) { 1197 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1036 1202
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1041 close $fh; 1210 aio_close $fh;
1042 1211
1043 if (@$objs) { 1212 if (@$objs) {
1044 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1045 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1048 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1049 close $fh; 1221 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1223 }
1052 } else { 1224 } else {
1053 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1054 } 1226 }
1055 1227
1056 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1057 } else { 1232 } else {
1058 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1059 } 1234 }
1060 } else { 1235 } else {
1061 aio_unlink $filename; 1236 aio_unlink $filename;
1062 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1063 } 1238 }
1082 1257
1083 unless (aio_stat "$filename.pst") { 1258 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1259 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1260 or return;
1086 1261
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1262 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs};
1088 } 1264 }
1089 1265
1090 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1093 1270
1094 ($data, $av) 1271 ($data, $av)
1095} 1272}
1096 1273
1097=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1153 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1154 1331
1155 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1156} 1333}
1157 1334
1335use File::Glob ();
1336
1158cf::player->attach ( 1337cf::player->attach (
1159 on_command => sub { 1338 on_unknown_command => sub {
1160 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1161 1340
1162 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1163 or return; 1342 or return;
1164 1343
1194 1373
1195 cf::override; 1374 cf::override;
1196 }, 1375 },
1197); 1376);
1198 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1199sub load_extensions { 1391sub load_extensions {
1200 cf::sync_job { 1392 cf::sync_job {
1201 my %todo; 1393 my %todo;
1202 1394
1203 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1222 1414
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1417
1226 $ext{source} = 1418 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1229 . $source 1421 . $source
1230 . "\n};\n1"; 1422 . "\n};\n1";
1231 1423
1232 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1233 } 1425 }
1234 1426
1427 my $pass = 0;
1235 my %done; 1428 my %done;
1236 while (%todo) { 1429 while (%todo) {
1237 my $progress; 1430 my $progress;
1238 1431
1432 ++$pass;
1433
1434 ext:
1239 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1437 next ext
1242 unless exists $done{$_}; 1438 unless exists $done{$_};
1243 } 1439 }
1244 1440
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1442
1247 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1447
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1449 if exists $v->{meta}{mandatory};
1252 warn $msg; 1450
1253 warn "mandatory extension failed to load, exiting.\n"; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1452 delete $todo{$k};
1255 } 1453 } else {
1256 1454 $done{$k} = delete $todo{$k};
1257 warn $msg; 1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1258 } 1460 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1461 }
1264 1462
1265 skip: 1463 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1268 } 1471 }
1269 }; 1472 };
1270} 1473}
1271 1474
1272############################################################################# 1475#############################################################################
1273 1476
1274=back 1477=back
1275 1478
1276=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1277 1480
1278Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1279 1482
1280=cut 1483=cut
1281 1484
1282package cf::player; 1485package cf::player;
1283 1486
1326 1529
1327sub exists($) { 1530sub exists($) {
1328 my ($login) = @_; 1531 my ($login) = @_;
1329 1532
1330 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1332} 1535}
1333 1536
1334sub find($) { 1537sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1539 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1552 or return;
1350 1553
1351 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1352 or return; 1555 or return;
1556
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1356 } 1560 }
1357 } 1561 }
1358} 1562}
1359 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1360sub save($) { 1577sub save($) {
1361 my ($pl) = @_; 1578 my ($pl) = @_;
1362 1579
1363 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1364 1581
1367 1584
1368 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1369 1586
1370 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1589
1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1372 1594
1373 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1596 cf::cede_to_tick;
1375} 1597}
1376 1598
1408 my ($pl) = @_; 1630 my ($pl) = @_;
1409 1631
1410 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1411 1633
1412 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1636
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1416 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1418 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1419 1642
1420 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 1683
1461 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1462 my $path = path $login; 1685 my $path = path $login;
1463 1686
1464 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1693 }
1470 1694
1474 1698
1475 \@logins 1699 \@logins
1476} 1700}
1477 1701
1478=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1479 1705
1480Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1481player. May block. 1707player. May block.
1482 1708
1483=cut 1709=cut
1501 } 1727 }
1502 1728
1503 \@paths 1729 \@paths
1504} 1730}
1505 1731
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1733
1508Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1735
1557=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1558 1737
1559Sends an ext reply to the player. 1738Sends an ext reply to the player.
1560 1739
1592 1771
1593=cut 1772=cut
1594 1773
1595sub find_by_path($) { 1774sub find_by_path($) {
1596 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1597 1778
1598 my ($match, $specificity); 1779 my ($match, $specificity);
1599 1780
1600 for my $region (list) { 1781 for my $region (list) {
1601 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1627our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1629 1810
1630sub generate_random_map { 1811sub generate_random_map {
1631 my ($self, $rmp) = @_; 1812 my ($self, $rmp) = @_;
1813
1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815
1632 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1633 $self->_create_random_map ( 1817 $self->_create_random_map (
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1637 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1638 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1639 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1640 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1662 1846
1663 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1664} 1848}
1665 1849
1666# also paths starting with '/' 1850# also paths starting with '/'
1667$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1668 1852
1669sub thawer_merge { 1853sub thawer_merge {
1670 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1671 1855
1672 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1758 1942
1759# the temporary/swap location 1943# the temporary/swap location
1760sub save_path { 1944sub save_path {
1761 my ($self) = @_; 1945 my ($self) = @_;
1762 1946
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1765} 1949}
1766 1950
1767# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1768sub uniq_path { 1952sub uniq_path {
1769 my ($self) = @_; 1953 my ($self) = @_;
1770 1954
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1773}
1774
1775# and all this just because we cannot iterate over
1776# all maps in C++...
1777sub change_all_map_light {
1778 my ($change) = @_;
1779
1780 $_->change_map_light ($change)
1781 for grep $_->outdoor, values %cf::MAP;
1782} 1957}
1783 1958
1784sub decay_objects { 1959sub decay_objects {
1785 my ($self) = @_; 1960 my ($self) = @_;
1786 1961
1870sub find { 2045sub find {
1871 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1872 2047
1873 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1874 2049
1875 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1877 2052
1878 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1882 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1883 or return; 2055 or return;
1884 2056
1885 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1886 2058
1888 or return; 2060 or return;
1889 2061
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
1893 undef $guard1; 2066 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2067 $map->reset;
1896 return find $path; 2068 return find $path;
1897 } 2069 }
1898 2070
1899 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1900 } 2072 }
1901} 2073}
1902 2074
1903sub pre_load { } 2075sub pre_load { }
1904sub post_load { } 2076#sub post_load { } # XS
1905 2077
1906sub load { 2078sub load {
1907 my ($self) = @_; 2079 my ($self) = @_;
1908 2080
1909 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2099 $f->skip_block;
1928 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
1929 or return; 2101 or return;
1930 2102
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
1932 if delete $self->{load_original}; 2104 if delete $self->{load_original};
1933 2105
1934 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2107 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
1954 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
1955 $self->decay_objects; 2127 $self->decay_objects;
1956 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
1957 $self->update_buttons; 2129 $self->update_buttons;
1958 cf::cede_to_tick; 2130 cf::cede_to_tick;
1959 $self->set_darkness_map;
1960 cf::cede_to_tick;
1961 $self->activate; 2131 $self->activate;
1962 } 2132 }
1963 2133
1964 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
1966 2136
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2138 }
1969 2139
1970 $self->post_load; 2140 $self->post_load;
1971} 2141}
1972 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
1973sub customise_for { 2146sub customise_for {
1974 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
1975 2148
1976 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
1977 if $self->per_player; 2150 if $self->per_player;
1993 or next; 2166 or next;
1994 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
1995 or next; 2168 or next;
1996 $neigh->load; 2169 $neigh->load;
1997 2170
2171 # now find the diagonal neighbours
1998 push @neigh, 2172 push @neigh,
1999 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2000 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2001 } 2175 }
2002 2176
2030 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2031 2205
2032 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2033 2207
2034 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2210 }
2037 2211
2038 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2039 2213
2040 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
2215 $Coro::current->{desc} = "map prefetcher";
2216
2041 while (%MAP_PREFETCH) { 2217 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2218 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2219 if (my $map = find $k) {
2044 $map->load if $v; 2220 $map->load if $v;
2045 } 2221 }
2052 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2053 2229
2054 () 2230 ()
2055} 2231}
2056 2232
2233# common code, used by both ->save and ->swapout
2057sub save { 2234sub _save {
2058 my ($self) = @_; 2235 my ($self) = @_;
2059
2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2236
2062 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2063 2238
2064 return unless $self->dirty; 2239 return unless $self->dirty;
2065 2240
2071 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2072 2247
2073 local $self->{last_access} = $self->last_access;#d# 2248 local $self->{last_access} = $self->last_access;#d#
2074 2249
2075 cf::async { 2250 cf::async {
2251 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2077 }; 2253 };
2254
2255 cf::get_slot 0.02;
2078 2256
2079 if ($uniq) { 2257 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2260 } else {
2083 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2084 } 2262 }
2085} 2263}
2086 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2087sub swap_out { 2273sub swap_out {
2088 my ($self) = @_; 2274 my ($self) = @_;
2089 2275
2090 # save first because save cedes
2091 $self->save;
2092
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2095 return if $self->players; 2280 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2097 return if $self->{deny_save};
2098 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2099 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2100 2332
2101 $self->deactivate; 2333 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2103 $self->clear; 2335 $self->clear;
2104}
2105
2106sub reset_at {
2107 my ($self) = @_;
2108
2109 # TODO: safety, remove and allow resettable per-player maps
2110 return 1e99 if $self->{deny_reset};
2111
2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2113 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2114
2115 $time + $to
2116}
2117
2118sub should_reset {
2119 my ($self) = @_;
2120
2121 $self->reset_at <= $cf::RUNTIME
2122}
2123
2124sub reset {
2125 my ($self) = @_;
2126
2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
2128
2129 return if $self->players;
2130
2131 warn "resetting map ", $self->path;
2132
2133 $self->in_memory (cf::MAP_SWAPPED);
2134
2135 # need to save uniques path
2136 unless ($self->{deny_save}) {
2137 my $uniq = $self->uniq_path; utf8::encode $uniq;
2138
2139 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2140 if $uniq;
2141 }
2142
2143 delete $cf::MAP{$self->path};
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear;
2148 2336
2149 $self->unlink_save; 2337 $self->unlink_save;
2150 $self->destroy; 2338 $self->destroy;
2151} 2339}
2152 2340
2160 2348
2161 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2162 2350
2163 $self->unlink_save; 2351 $self->unlink_save;
2164 2352
2165 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2166 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2167 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2168 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2170 2358
2219 2407
2220sub unique_maps() { 2408sub unique_maps() {
2221 [ 2409 [
2222 map { 2410 map {
2223 utf8::decode $_; 2411 utf8::decode $_;
2224 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2225 ? normalise $_ 2415 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2417 ]
2229} 2418}
2230 2419
2231package cf; 2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2232 2451
2233=back 2452=back
2234 2453
2235=head3 cf::object 2454=head3 cf::object
2236 2455
2240 2459
2241=over 4 2460=over 4
2242 2461
2243=item $ob->inv_recursive 2462=item $ob->inv_recursive
2244 2463
2245Returns the inventory of the object _and_ their inventories, recursively. 2464Returns the inventory of the object I<and> their inventories, recursively,
2465but I<not> the object itself.
2246 2466
2247=cut 2467=cut
2248 2468
2249sub inv_recursive_; 2469sub inv_recursive_;
2250sub inv_recursive_ { 2470sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2256} 2476}
2257 2477
2258=item $ref = $ob->ref 2478=item $ref = $ob->ref
2259 2479
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2480Creates and returns a persistent reference to an object that can be stored as a string.
2261 2481
2262=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2263 2483
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2484returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2485even if the object actually exists. May block.
2267=cut 2487=cut
2268 2488
2269sub deref { 2489sub deref {
2270 my ($ref) = @_; 2490 my ($ref) = @_;
2271 2491
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2492 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2493 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2494 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2495 or return;
2279 $pl->ob->uuid eq $uuid 2496 $pl->ob->uuid eq $uuid
2280 or return; 2497 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2518dialogue with the given NPC character.
2302 2519
2303=cut 2520=cut
2304 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2305# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2537# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2553
2323 } else { 2554 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2557 }
2327 } 2558 }
2328} 2559}
2329 2560
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2586
2356=item $player_object->enter_link 2587=item $player_object->enter_link
2357 2588
2358Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2359 2590
2360The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2362 2595
2363Will never block. 2596Will never block.
2364 2597
2365=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2366 2599
2386sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2387 my ($self) = @_; 2620 my ($self) = @_;
2388 2621
2389 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2390 2623
2624 ++$self->{_link_recursion};
2625
2391 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2392 2627
2393 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2394 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2395 2630
2396 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2397} 2632}
2398 2633
2399sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2400 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2401 2636
2418 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2419 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2420 2655
2421 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2422 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2423 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2424 2659
2425 $map->load; 2660 $map->load;
2426 $map->load_neighbours; 2661 $map->load_neighbours;
2427 2662
2428 return unless $self->contr->active; 2663 return unless $self->contr->active;
2429 $self->activate_recursive;
2430 2664
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2433} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2434 2672
2673}
2674
2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2436 2676
2437Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2438her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2681be called at the end of this process.
2442 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2443=cut 2686=cut
2444 2687
2445our $GOTOGEN; 2688our $GOTOGEN;
2446 2689
2447sub cf::object::player::goto { 2690sub cf::object::player::goto {
2448 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2449 2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2698
2450 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2701
2453 $self->enter_link; 2702 $self->enter_link;
2454 2703
2455 (async { 2704 (async {
2705 $Coro::current->{desc} = "player::goto $path $x $y";
2706
2456 # *tag paths override both path and x|y 2707 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2708 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2709 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2710 my $ob = $obs[rand @obs];
2460 2711
2475 my $map = eval { 2726 my $map = eval {
2476 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2477 2728
2478 if ($map) { 2729 if ($map) {
2479 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2732 } else {
2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2734 }
2484 2735
2485 $map 2736 $map
2493 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2496 } 2747 }
2497 2748
2498 $done->() if $done; 2749 $done->($self) if $done;
2499 })->prio (1); 2750 })->prio (1);
2500} 2751}
2501 2752
2502=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2503 2754
2523} 2774}
2524 2775
2525sub prepare_random_map { 2776sub prepare_random_map {
2526 my ($exit) = @_; 2777 my ($exit) = @_;
2527 2778
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2781 # that depends on the exit object
2533 2782
2534 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2785 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2541 } 2792 }
2542 2793
2543 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2544 2795
2545 my $data = cf::to_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2548 2799
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2802 undef $fh;
2552 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2553 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2556 } 2811 }
2557} 2812}
2558 2813
2559sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2561 2816
2562 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2563 2818
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2819 $self->enter_link;
2576 2820
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2821 (async {
2582 $self->deactivate_recursive; # just to be sure 2822 $Coro::current->{desc} = "enter_exit";
2823
2583 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2584 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2585 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2586 1; 2845 1
2587 }) { 2846 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2851
2593 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2610sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2612 2871
2613 utf8::encode $text; 2872 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2615} 2899}
2616 2900
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 2902
2619Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2906the message unless the client supports the msg packet.
2623 2907
2624=cut 2908=cut
2625 2909
2910# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2627 "c/identify" => { 2918 "c/identify" => {
2628 id => "identify", 2919 id => "infobox",
2629 title => "Identify", 2920 title => "Identify",
2630 reply => undef, 2921 reply => undef,
2631 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2632 }, 2923 },
2633 "c/examine" => { 2924 "c/examine" => {
2634 id => "examine", 2925 id => "infobox",
2635 title => "Examine", 2926 title => "Examine",
2636 reply => undef, 2927 reply => undef,
2637 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2638 }, 2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2935 },
2936 "c/book" => {
2937 id => "infobox",
2938 title => "Book",
2939 reply => undef,
2940 tooltip => "The contents of a note or book",
2941 },
2942 "c/lookat" => {
2943 id => "infobox",
2944 title => "Look",
2945 reply => undef,
2946 tooltip => "What you saw there",
2947 },
2948 "c/who" => {
2949 id => "infobox",
2950 title => "Players",
2951 reply => undef,
2952 tooltip => "Shows players who are currently online",
2953 },
2954 "c/body" => {
2955 id => "infobox",
2956 title => "Body Parts",
2957 reply => undef,
2958 tooltip => "Shows which body parts you posess and are available",
2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2996 "c/uptime" => {
2997 id => "infobox",
2998 title => "Uptime",
2999 reply => undef,
3000 tooltip => "How long the server has been running since last restart",
3001 },
3002 "c/mapinfo" => {
3003 id => "infobox",
3004 title => "Map Info",
3005 reply => undef,
3006 tooltip => "Information related to the maps",
3007 },
3008 "c/party" => {
3009 id => "party",
3010 title => "Party",
3011 reply => "gsay ",
3012 tooltip => "Messages and chat related to your party",
3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2639); 3022);
2640 3023
2641sub cf::client::send_msg { 3024sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2643 3026
2644 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2645 3029
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 3031
2648 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3033 if ($CHANNEL{$channel}) {
3034 $channel = $CHANNEL{$channel};
2650 3035
3036 $self->ext_msg (channel_info => $channel);
3037 $channel = $channel->{id};
3038
2651 if (ref $channel) { 3039 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 3044 }
2658 3045
2659 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2660 } 3047 }
2661 3048
2662 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2663 3050
2664 if ($self->can_msg) {
2665 # default colour, mask it out 3051 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2668 3054
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 3058 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 3059
2683 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 3061}
2697 3062
2698=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2699 3064
2700Sends an ext event to the client. 3065Sends an ext event to the client.
2703 3068
2704sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2706 3071
2707 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 3077 }
2713} 3078}
2714 3079
2715=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2716 3081
2720 3085
2721sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2723 3088
2724 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3092 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3095 }
2731} 3096}
2732 3097
2733=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2734 3099
2835 3200
2836 $coro 3201 $coro
2837} 3202}
2838 3203
2839cf::client->attach ( 3204cf::client->attach (
2840 on_destroy => sub { 3205 on_client_destroy => sub {
2841 my ($ns) = @_; 3206 my ($ns) = @_;
2842 3207
2843 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2844 }, 3209 },
2845); 3210);
2861our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
2862 3227
2863$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
2864 3229
2865$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
2868 sort time 3233 sort time
2869)); 3234));
2870 3235
2871# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
2873=pod 3238=pod
2874 3239
2875The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
2876 3241
2877 cf::object 3242 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3243 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
2880 3246
2881 cf::object::player 3247 cf::object::player
2882 player 3248 player
2883 3249
2884 cf::player 3250 cf::player
2889 3255
2890=cut 3256=cut
2891 3257
2892for ( 3258for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3261 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
2899) { 3265) {
2900 no strict 'refs'; 3266 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2920 3286
2921 my $qcode = $code; 3287 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
2924 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
2925 local $_; 3294 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3295
2928 my $eval = 3296 my $eval =
2929 "do {\n" 3297 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3300 . $code
2933 . "\n}" 3301 . "\n}"
2934 ; 3302 ;
2935 3303
3304 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
2939 3313
2940 if ($@) { 3314 if ($@) {
2941 warn "$@"; 3315 warn "$@";
2942 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
2962=cut 3336=cut
2963 3337
2964sub register_script_function { 3338sub register_script_function {
2965 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
2966 3340
2967 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
2969} 3343}
2970 3344
2971=back 3345=back
2972 3346
2973=cut 3347=cut
2994 3368
2995 $facedata->{version} == 2 3369 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3371
2998 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3375 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3378 };
3003 cf::cede_to_tick; 3379 cf::cede_to_tick;
3004 3380
3005 { 3381 {
3006 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3007 3383
3008 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386
3010 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3014 3391
3015 cf::cede_to_tick; 3392 cf::cede_to_tick;
3016 } 3393 }
3017 3394
3018 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3396 next unless $info->{smooth};
3397
3020 my $idx = cf::face::find $face 3398 my $idx = cf::face::find $face
3021 or next; 3399 or next;
3400
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3401 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3402 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3404 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3405 warn "smooth face '$info->{smooth}' not found for face '$face'";
3040 3419
3041 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3042 } 3421 }
3043 3422
3044 { 3423 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3048 3425
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3427 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3429
3055 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3431 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3432 } else {
3065 $data = $info->{data}; 3433 $RESOURCE{$name} = $info;
3066 } 3434 }
3067 3435
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3436 cf::cede_to_tick;
3072 } 3437 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3438 }
3439
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3441
3093 1 3442 1
3094} 3443}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3095 3464
3096register_exticmd fx_want => sub { 3465register_exticmd fx_want => sub {
3097 my ($ns, $want) = @_; 3466 my ($ns, $want) = @_;
3098 3467
3099 while (my ($k, $v) = each %$want) { 3468 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3469 $ns->fx_want ($k, $v);
3101 } 3470 }
3102}; 3471};
3472
3473sub load_resource_file($) {
3474 my $guard = lock_acquire "load_resource_file";
3475
3476 my $status = load_resource_file_ $_[0];
3477 get_slot 0.1, 100;
3478 cf::arch::commit_load;
3479
3480 $status
3481}
3103 3482
3104sub reload_regions { 3483sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3484 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3485 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3486 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3500}
3122 3501
3123sub reload_archetypes { 3502sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3503 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3504 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3505}
3132 3506
3133sub reload_treasures { 3507sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3508 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3509 or die "unable to load treasurelists\n";
3136} 3510}
3137 3511
3138sub reload_resources { 3512sub reload_resources {
3139 warn "reloading resource files...\n"; 3513 warn "reloading resource files...\n";
3140 3514
3515 reload_facedata;
3516 reload_archetypes;
3141 reload_regions; 3517 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3518 reload_treasures;
3146 3519
3147 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3148} 3521}
3149 3522
3150sub init {
3151 reload_resources;
3152}
3153
3154sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3156 or return; 3527 or return;
3157 3528
3158 local $/; 3529 local $/;
3159 *CFG = YAML::Syck::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3160 3531
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3162 3533
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3165 3536
3166 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
3168 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3169 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3170 }; 3541 };
3171 warn $@ if $@; 3542 warn $@ if $@;
3172 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3546}
3547
3548sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!";
3551 flock $fh, &Fcntl::LOCK_EX
3552 or die "$PIDFILE: flock: $!";
3553 $fh
3554}
3555
3556# make sure only one server instance is running at any one time
3557sub atomic {
3558 my $fh = pidfile;
3559
3560 my $pid = <$fh>;
3561 kill 9, $pid if $pid > 0;
3562
3563 seek $fh, 0, 0;
3564 print $fh $$;
3565}
3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3173} 3574}
3174 3575
3175sub main { 3576sub main {
3577 cf::init_globals; # initialise logging
3578
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585
3176 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3589 (async {
3180 Event::one_event; 3590 $Coro::current->{desc} = "IDLE BUG HANDLER";
3591 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3592 })->prio (Coro::PRIO_MAX);
3182 }; 3593 };
3183 3594
3595 evthread_start IO::AIO::poll_fileno;
3596
3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3606 reload_resources;
3184 reload_config; 3607 reload_config;
3185 db_init; 3608 db_init;
3609
3610 cf::init_uuid;
3611 cf::init_signals;
3612 cf::init_skills;
3613
3614 cf::init_beforeplay;
3615
3616 atomic;
3617
3186 load_extensions; 3618 load_extensions;
3187 3619
3188 $TICK_WATCHER->start; 3620 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3621
3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625
3626 (pop @POST_INIT)->(0) while @POST_INIT;
3627 };
3628
3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3190} 3633}
3191 3634
3192############################################################################# 3635#############################################################################
3193# initialisation and cleanup 3636# initialisation and cleanup
3194 3637
3195# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3196BEGIN { 3639BEGIN {
3640 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3205 },
3206 ); 3644 };
3207 } 3645 }
3208} 3646}
3209 3647
3210sub write_runtime { 3648sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3649 my $t0 = AE::time;
3212 3650
3213 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3215 3653
3216 IO::AIO::aio_utime $runtime, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3655
3218 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3219 3657
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3221 or return; 3659 or return;
3222 3660
3223 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3673 aio_utime $fh, undef, undef;
3236 3674
3237 close $fh 3675 close $fh
3238 or return; 3676 or return;
3239 3677
3240 aio_rename "$runtime~", $runtime 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3679 and return;
3242 3680
3243 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3244 3682
3245 1 3683 1
3684}
3685
3686our $uuid_lock;
3687our $uuid_skip;
3688
3689sub write_uuid_sync($) {
3690 $uuid_skip ||= $_[0];
3691
3692 return if $uuid_lock;
3693 local $uuid_lock = 1;
3694
3695 my $uuid = "$LOCALDIR/uuid";
3696
3697 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3698 or return;
3699
3700 my $value = uuid_seq uuid_cur;
3701
3702 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n";
3704 return;
3705 }
3706
3707 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0;
3709
3710 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3711 and return;
3712
3713 # always fsync - this file is important
3714 aio_fsync $fh
3715 and return;
3716
3717 close $fh
3718 or return;
3719
3720 aio_rename "$uuid~", $uuid
3721 and return;
3722
3723 warn "uuid file written ($value).\n";
3724
3725 1
3726
3727}
3728
3729sub write_uuid($$) {
3730 my ($skip, $sync) = @_;
3731
3732 $sync ? write_uuid_sync $skip
3733 : async { write_uuid_sync $skip };
3246} 3734}
3247 3735
3248sub emergency_save() { 3736sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3737 my $freeze_guard = cf::freeze_mainloop;
3250 3738
3251 warn "enter emergency perl save\n"; 3739 warn "emergency_perl_save: enter\n";
3252 3740
3253 cf::sync_job { 3741 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746
3254 # use a peculiar iteration method to avoid tripping on perl 3747 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3748 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3749 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3750 warn "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3751 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3752 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3753 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3755 $pl->save;
3262 } 3756 }
3263 warn "end emergency player save\n"; 3757 warn "emergency_perl_save: end player save\n";
3264 3758
3265 warn "begin emergency map save\n"; 3759 warn "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3760 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3761 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3762 $map->valid or next;
3269 $map->save; 3763 $map->save;
3270 } 3764 }
3271 warn "end emergency map save\n"; 3765 warn "emergency_perl_save: end map save\n";
3272 3766
3273 warn "begin emergency database checkpoint\n"; 3767 warn "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3768 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3769 warn "emergency_perl_save: end database checkpoint\n";
3770
3771 warn "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n";
3276 }; 3774 };
3277 3775
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3278 warn "leave emergency perl save\n"; 3781 warn "emergency_perl_save: leave\n";
3279} 3782}
3280 3783
3281sub post_cleanup { 3784sub post_cleanup {
3282 my ($make_core) = @_; 3785 my ($make_core) = @_;
3283 3786
3284 warn Carp::longmess "post_cleanup backtrace" 3787 warn Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3788 if $make_core;
3789
3790 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$;
3792}
3793
3794# a safer delete_package, copied from Symbol
3795sub clear_package($) {
3796 my $pkg = shift;
3797
3798 # expand to full symbol table name if needed
3799 unless ($pkg =~ /^main::.*::$/) {
3800 $pkg = "main$pkg" if $pkg =~ /^::/;
3801 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3802 $pkg .= '::' unless $pkg =~ /::$/;
3803 }
3804
3805 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3806 my $stem_symtab = *{$stem}{HASH};
3807
3808 defined $stem_symtab and exists $stem_symtab->{$leaf}
3809 or return;
3810
3811 # clear all symbols
3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3813 for my $name (keys %$leaf_symtab) {
3814 _gv_clear *{"$pkg$name"};
3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3816 }
3286} 3817}
3287 3818
3288sub do_reload_perl() { 3819sub do_reload_perl() {
3289 # can/must only be called in main 3820 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3291 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3292 return; 3823 return;
3293 } 3824 }
3294 3825
3826 return if $RELOAD++;
3827
3828 my $t1 = AE::time;
3829
3830 while ($RELOAD) {
3295 warn "reloading..."; 3831 warn "reloading...";
3296 3832
3297 warn "entering sync_job"; 3833 warn "entering sync_job";
3298 3834
3299 cf::sync_job { 3835 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark 3836 cf::write_runtime_sync; # external watchdog should not bark
3301 cf::emergency_save; 3837 cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark 3838 cf::write_runtime_sync; # external watchdog should not bark
3303 3839
3304 warn "syncing database to disk"; 3840 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV; 3841 BDB::db_env_txn_checkpoint $DB_ENV;
3306 3842
3307 # if anything goes wrong in here, we should simply crash as we already saved 3843 # if anything goes wrong in here, we should simply crash as we already saved
3308 3844
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests"; 3845 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs; 3846 while (IO::AIO::nreqs || BDB::nreqs) {
3320 warn "iterate..."; 3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = ();
3328
3329 warn "removing commands";
3330 %COMMAND = ();
3331
3332 warn "removing ext/exti commands";
3333 %EXTCMD = ();
3334 %EXTICMD = ();
3335
3336 warn "unloading/nuking all extensions";
3337 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg";
3339
3340 if (my $cb = $pkg->can ("unload")) {
3341 eval {
3342 $cb->($pkg);
3343 1
3344 } or warn "$pkg unloaded, but with errors: $@";
3345 } 3848 }
3346 3849
3347 warn "... nuking $pkg"; 3850 warn "cancelling all extension coros";
3348 Symbol::delete_package $pkg; 3851 $_->cancel for values %EXT_CORO;
3349 } 3852 %EXT_CORO = ();
3350 3853
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3854 warn "removing commands";
3352 while (my ($k, $v) = each %INC) { 3855 %COMMAND = ();
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3856
3857 warn "removing ext/exti commands";
3858 %EXTCMD = ();
3859 %EXTICMD = ();
3860
3861 warn "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) {
3355 warn "... unloading $k"; 3863 warn "... unloading $pkg";
3356 delete $INC{$k};
3357 3864
3358 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g;
3360
3361 if (my $cb = $k->can ("unload_module")) { 3865 if (my $cb = $pkg->can ("unload")) {
3866 eval {
3362 $cb->(); 3867 $cb->($pkg);
3868 1
3869 } or warn "$pkg unloaded, but with errors: $@";
3870 }
3871
3872 warn "... clearing $pkg";
3873 clear_package $pkg;
3363 } 3874 }
3364 3875
3365 Symbol::delete_package $k; 3876 warn "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879
3880 warn "... unloading $k";
3881 delete $INC{$k};
3882
3883 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g;
3885
3886 if (my $cb = $k->can ("unload_module")) {
3887 $cb->();
3888 }
3889
3890 clear_package $k;
3366 } 3891 }
3367 3892
3368 warn "getting rid of safe::, as good as possible"; 3893 warn "getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3894 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3896
3372 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3900
3376 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3902 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3379 3904
3380 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3381 3906
3382 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3383 require cf; 3908 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3385 3910
3386 warn "loading config and database again"; 3911 warn "loading config and database again";
3387 cf::reload_config; 3912 cf::reload_config;
3388 3913
3389 warn "loading extensions"; 3914 warn "loading extensions";
3390 cf::load_extensions; 3915 cf::load_extensions;
3391 3916
3917 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 3918 warn "reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 3919 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 3920 warn "reattaching attachments to maps";
3395 reattach $_ for values %MAP; 3921 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 3922 warn "reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 3923 reattach $_ for values %PLAYER;
3924 }
3398 3925
3926 warn "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928
3399 warn "leaving sync_job"; 3929 warn "leaving sync_job";
3400 3930
3401 1 3931 1
3402 } or do { 3932 } or do {
3403 warn $@; 3933 warn $@;
3404 warn "error while reloading, exiting."; 3934 cf::cleanup "error while reloading, exiting.";
3405 exit 1;
3406 }; 3935 };
3407 3936
3408 warn "reloaded"; 3937 warn "reloaded";
3938 --$RELOAD;
3939 }
3940
3941 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n";
3409}; 3943};
3410 3944
3411our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3412 3946
3413sub reload_perl() { 3947sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 3948 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3416 3950
3417 $RELOAD_WATCHER ||= Event->timer ( 3951 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 3952 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 3953
3420 data => WF_AUTOCANCEL, 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 3955 do_reload_perl;
3423 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3424 }, 3957 };
3425 ); 3958 };
3426} 3959}
3427 3960
3428register_command "reload" => sub { 3961register_command "reload" => sub {
3429 my ($who, $arg) = @_; 3962 my ($who, $arg) = @_;
3430 3963
3431 if ($who->flag (FLAG_WIZ)) { 3964 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 3965 $who->message ("reloading server.");
3966 async {
3967 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 3968 reload_perl;
3969 };
3434 } 3970 }
3435}; 3971};
3436 3972
3437unshift @INC, $LIBDIR; 3973unshift @INC, $LIBDIR;
3438 3974
3440 3976
3441our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3443 3979
3444sub wait_for_tick { 3980sub wait_for_tick {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3447 3982
3448 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 3985 $signal->wait;
3451} 3986}
3452 3987
3453sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3456 3990
3457 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 3993 $signal->wait;
3460} 3994}
3461 3995
3462$TICK_WATCHER = Event->timer ( 3996sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 3997 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3998 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3472 return; 4000 return;
3473 } 4001 }
3474 4002
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
3478 4004
3479 $RUNTIME += $TICK; 4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3480 $NEXT_TICK += $TICK;
3481 4006
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 4009 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 4011 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 4012 or warn "ERROR: unable to write runtime file: $!";
3487 };
3488 } 4013 };
4014 }
3489 4015
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 4017 $sig->send;
3492 } 4018 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 4019 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 4020 $sig->send;
3495 } 4021 }
3496 4022
3497 $NOW = Event::time; 4023 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4024 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 4025
3508 _post_tick; 4026 if (0) {
4027 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d#
4031 }
3509 }, 4032 }
3510); 4033}
3511 4034
3512{ 4035{
4036 # configure BDB
4037
3513 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3514 BDB::max_poll_time $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 4040 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 4041
3539 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4044 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 4045 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4046 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4047 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4049
3546 cf::sync_job { 4050 cf::sync_job {
3547 eval { 4051 eval {
3557 4061
3558 cf::cleanup "db_env_open(db): $@" if $@; 4062 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 4063 };
3560 } 4064 }
3561 4065
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 4066 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4067 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 4068 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4069 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4070 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 4071 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 4072 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4073 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 4074 };
3592} 4075}
3593 4076
3594{ 4077{
4078 # configure IO::AIO
4079
3595 IO::AIO::min_parallel 8; 4080 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 4081 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 4082 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 4083}
3608 4084
3609my $_log_backtrace; 4085my $_log_backtrace;
3610 4086
3611sub _log_backtrace { 4087sub _log_backtrace {
3614 $msg =~ s/\n//; 4090 $msg =~ s/\n//;
3615 4091
3616 # limit the # of concurrent backtraces 4092 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 4093 if ($_log_backtrace < 2) {
3618 ++$_log_backtrace; 4094 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg;
3619 async { 4096 async {
4097 $Coro::current->{desc} = "abt $msg";
4098
3620 my @bt = fork_call { 4099 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 4100 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4101 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4102 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 4103 or die "addr2line: $!";
3632 } 4111 }
3633 4112
3634 @funcs 4113 @funcs
3635 }; 4114 };
3636 4115
3637 LOG llevInfo, "[ABT] $msg\n"; 4116 LOG llevInfo, "[ABT] $perl_bt\n";
4117 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 4118 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 4119 --$_log_backtrace;
3640 }; 4120 };
3641 } else { 4121 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 4122 LOG llevInfo, "[ABT] $msg\n";
3643 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3644 } 4124 }
3645} 4125}
3646 4126
3647# load additional modules 4127# load additional modules
3648use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3649 4130
3650END { cf::emergency_save } 4131END { cf::emergency_save }
3651 4132
36521 41331
3653 4134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines