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

Diff Legend

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