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

Diff Legend

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