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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines