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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC

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

Diff Legend

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