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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$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 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
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;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
71 120
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $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 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
77our $NOW; 138our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off
79 139
80our $BDB_POLL_WATCHER; 140our (%PLAYER, %PLAYER_LOADING); # all users
81our $DB_ENV; 141our (%MAP, %MAP_LOADING ); # all maps
82
83our %CFG;
84
85our $UPTIME; $UPTIME ||= time;
86our $RUNTIME;
87
88our %PLAYER; # all users
89our %MAP; # all maps
90our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
91 143
92# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 146
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
98 159
99binmode STDOUT; 160binmode STDOUT;
100binmode STDERR; 161binmode STDERR;
101 162
102# read virtual server time, if available 163# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
107} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
108 171
109mkdir $_ 172mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 174
112our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
113 176
114sub cf::map::normalise; 177sub cf::map::normalise;
115 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
116############################################################################# 183#############################################################################
117 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
118=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
119 197
120=over 4 198=over 4
121 199
122=item $cf::UPTIME 200=item $cf::UPTIME
123 201
124The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
125 218
126=item $cf::RUNTIME 219=item $cf::RUNTIME
127 220
128The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
129every server tick. 222every server tick.
135Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
136directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
138database environment. 231database environment.
139 232
140=item $cf::NOW
141
142The time of the last (current) server tick.
143
144=item $cf::TICK
145
146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG 233=item $cf::LOADAVG
149 234
150The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
155 240
156The raw value load value from the last tick. 241The raw value load value from the last tick.
157 242
158=item %cf::CFG 243=item %cf::CFG
159 244
160Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 246from wherever your confdir points to.
162 247
163=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
164 249
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These 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 251returns directly I<after> the tick processing (and consequently, can only wake one thread
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
271=item @cf::INVOKE_RESULTS
272
273This array contains the results of the last C<invoke ()> call. When
274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
275that call.
276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
169=back 283=back
170 284
171=cut 285=cut
172 286
173BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 294 my $msg = join "", @_;
176 295
177 $msg .= "\n" 296 $msg .= "\n"
178 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
179 298
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 300
182 utf8::encode $msg;
183 LOG llevError, $msg; 301 LOG llevWarn, $msg;
184 }; 302};
185} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
186 317
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 328for my $pkg (qw(
198 cf::global cf::attachable 329 cf::global cf::attachable
199 cf::object cf::object::player 330 cf::object cf::object::player
200 cf::client cf::player 331 cf::client cf::player
201 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
202 cf::map cf::party cf::region 334 cf::party cf::region
203)) { 335)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 337}
207 338
208$Event::DIED = sub { 339$EV::DIED = sub {
209 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
210}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
211 347
212############################################################################# 348#############################################################################
213 349
214=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
215 351
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 373 $d
238 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
239} 375}
240 376
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working 377=item $scalar = load_file $path
242 378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
243=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
244 392
245Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
246 394
247=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
248 396
249Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
250 398
399=cut
400
401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
402
403sub encode_json($) { $json_coder->encode ($_[0]) }
404sub decode_json($) { $json_coder->decode ($_[0]) }
405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
251=item cf::lock_wait $string 468=item cf::lock_wait $string
252 469
253Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
254 471
255=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
256 473
257Wait until the given lock is available and then acquires it and returns 474Wait 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, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
259for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
260returned. 477returned.
261 478
479Locks are *not* recursive, locking from the same coro twice results in a
480deadlocked coro.
481
262Lock names should begin with a unique identifier (for example, cf::map::find 482Lock names should begin with a unique identifier (for example, cf::map::find
263uses map_find and cf::map::load uses map_load). 483uses map_find and cf::map::load uses map_load).
264 484
265=item $locked = cf::lock_active $string 485=item $locked = cf::lock_active $string
266 486
267Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
268 488
269=cut 489=cut
270 490
271our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
272 492
273sub lock_wait($) { 493sub lock_wait($) {
274 my ($key) = @_; 494 $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} 495}
282 496
283sub lock_acquire($) { 497sub lock_acquire($) {
284 my ($key) = @_; 498 $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} 499}
296 500
297sub lock_active($) { 501sub lock_active($) {
298 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 503}
302 504
303sub freeze_mainloop { 505sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
305 507
306 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
307 $TICK_WATCHER->start; 509}
510
511=item cf::periodic $interval, $cb
512
513Like EV::periodic, but randomly selects a starting point so that the actions
514get spread over time.
515
516=cut
517
518sub periodic($$) {
519 my ($interval, $cb) = @_;
520
521 my $start = rand List::Util::min 180, $interval;
522
523 EV::periodic $start, $interval, 0, $cb
524}
525
526=item cf::get_slot $time[, $priority[, $name]]
527
528Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least
530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
535
536The optional C<$name> can be used to identify the job to run. It might be
537used for statistical purposes and should identify the same time-class.
538
539Useful for short background jobs.
540
541=cut
542
543our @SLOT_QUEUE;
544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
546
547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
548$SLOT_QUEUE = Coro::async {
549 $Coro::current->desc ("timeslot manager");
550
551 my $signal = new Coro::Signal;
552 my $busy;
553
554 while () {
555 next_job:
556
557 my $avail = cf::till_tick;
558
559 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send;
564 Coro::cede;
565 goto next_job;
566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 }
569 }
570
571 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
573 $WAIT_FOR_TICK->wait;
574 } else {
575 $busy = 0;
576 Coro::schedule;
577 }
308 }; 578 }
309 $TICK_WATCHER->stop; 579};
310 $guard 580
581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
584 my ($time, $pri, $name) = @_;
585
586 $time = clamp $time, 0.01, $TICK * .6;
587
588 my $sig = new Coro::Signal;
589
590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
592 $SLOT_QUEUE->ready;
593 $sig->wait;
311} 594}
312 595
313=item cf::async { BLOCK } 596=item cf::async { BLOCK }
314 597
315Currently the same as Coro::async_pool, meaning you cannot use 598Currently the same as Coro::async_pool, meaning you cannot use
320 603
321BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
322 605
323=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
324 607
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 609is 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 610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 611acceptable.
329 612
330If it must be done, put the blocking parts into C<sync_job>. This will run 613If 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 614the given BLOCK in another coroutine while waiting for the result. The
335=cut 618=cut
336 619
337sub sync_job(&) { 620sub sync_job(&) {
338 my ($job) = @_; 621 my ($job) = @_;
339 622
340 if ($Coro::current == $Coro::main) { 623 if (in_main) {
341 my $time = Event::time; 624 my $time = AE::time;
342 625
343 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
345 628
346 # TODO: use suspend/resume instead 629 #LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 630
348 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
349 632
350 my $busy = 1; 633 my $busy = 1;
351 my @res; 634 my @res;
352 635
353 (async { 636 (async {
637 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 638 @res = eval { $job->() };
355 warn $@ if $@; 639 error $@ if $@;
356 undef $busy; 640 undef $busy;
357 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
358 642
359 while ($busy) { 643 while ($busy) {
360 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
361 } 648 }
649 }
362 650
363 $time = Event::time - $time; 651 my $time = AE::time - $time;
364 652
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 653 $TICK_START += $time; # do not account sync jobs to server load
369 654
370 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
371 } else { 656 } else {
372 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
373 658
393 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
394 679
395 $coro 680 $coro
396} 681}
397 682
398=item fork_call { }, $args 683=item fork_call { }, @args
399 684
400Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
404 689
405=cut 690=cut
691
692sub post_fork {
693 reset_signals;
694}
406 695
407sub fork_call(&@) { 696sub fork_call(&@) {
408 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
409 698
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 699 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 700 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 701 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 702
415 if (my $pid = fork) { 703 my @res = Coro::Util::fork_eval {
416 close $fh2; 704 cf::post_fork;
705 &$cb
706 } @args;
417 707
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 708 wantarray ? @res : $res[-1]
419 $res = Coro::Storable::thaw $res; 709}
420 710
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 711sub objinfo {
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 } 712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
440} 747}
441 748
442=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
443 750
444Returns a single value from the environment database. 751Returns a single value from the environment database.
446=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
447 754
448Stores the given C<$value> in the family. It can currently store binary 755Stores 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). 756data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 757
758=item $db = cf::db_table "name"
759
760Create and/or open a new database table. The string must not be "db" and must be unique
761within each server.
762
451=cut 763=cut
764
765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
769 my ($name) = @_;
770 my $db = BDB::db_create $DB_ENV;
771
772 eval {
773 $db->set_flags (BDB::CHKSUM);
774
775 utf8::encode $name;
776 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
777 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
778 cf::cleanup "db_open(db): $!" if $!;
779 };
780 cf::cleanup "db_open(db): $@" if $@;
781
782 $db
783}
452 784
453our $DB; 785our $DB;
454 786
455sub db_init { 787sub db_init {
456 unless ($DB) { 788 $DB ||= db_table "db";
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
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 }
470} 789}
471 790
472sub db_get($$) { 791sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
474 793
475 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
476 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
477 798
478 $! ? () 799 $! ? ()
479 : $data 800 : $data
480 }
481} 801}
482 802
483sub db_put($$$) { 803sub db_put($$$) {
484 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
513 833
514 my @data; 834 my @data;
515 my $md5; 835 my $md5;
516 836
517 for (0 .. $#$src) { 837 for (0 .. $#$src) {
518 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
519 or Carp::croak "$src->[$_]: $!";
520 } 839 }
521 840
522 # if processing is expensive, check 841 # if processing is expensive, check
523 # checksum first 842 # checksum first
524 if (1) { 843 if (1) {
525 $md5 = 844 $md5 =
526 join "\x00", 845 join "\x00",
527 $processversion, 846 $processversion,
528 map { 847 map {
529 Coro::cede; 848 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 849 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 850 } 0.. $#$src;
532 851
533 852
534 my $dbmd5 = db_get cache => "$id/md5"; 853 my $dbmd5 = db_get cache => "$id/md5";
541 860
542 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data); 862 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
545 864
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
547 866
548 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
551 870
561 880
562=cut 881=cut
563 882
564sub datalog($@) { 883sub datalog($@) {
565 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
566 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
567} 886}
568 887
569=back 888=back
570 889
571=cut 890=cut
572 891
573############################################################################# 892#############################################################################
574 893
575=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
576 895
577Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
578attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
580 899
581In the following description, CLASS can be any of C<global>, C<object> 900In 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 901C<player>, C<client> or C<map> (i.e. the attachable objects in
583Crossfire TRT). 902Deliantra).
584 903
585=over 4 904=over 4
586 905
587=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
588 907
632=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
633 952
634Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
636 955
637Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
638that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
639 958
640These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
641 960
642=over 4 961=over 4
766 1085
767 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
768 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
769 1088
770 } elsif (ref $type) { 1089 } elsif (ref $type) {
771 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
772 1091
773 } else { 1092 } else {
774 shift @arg; 1093 shift @arg;
775 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
776 } 1095 }
777 } 1096 }
778} 1097}
779 1098
780sub _object_attach { 1099sub _object_attach {
790 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
791 } 1110 }
792 1111
793 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
794 } else { 1113 } else {
795 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
796 } 1115 }
797 1116
798 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
799} 1118}
800 1119
840 "; 1159 ";
841 die if $@; 1160 die if $@;
842} 1161}
843 1162
844our $override; 1163our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1164our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1165
847sub override { 1166sub override {
848 $override = 1; 1167 $override = 1;
849 @invoke_results = (); 1168 @INVOKE_RESULTS = (@_);
850} 1169}
851 1170
852sub do_invoke { 1171sub do_invoke {
853 my $event = shift; 1172 my $event = shift;
854 my $callbacks = shift; 1173 my $callbacks = shift;
855 1174
856 @invoke_results = (); 1175 @INVOKE_RESULTS = ();
857 1176
858 local $override; 1177 local $override;
859 1178
860 for (@$callbacks) { 1179 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
862 1181
863 if ($@) { 1182 if ($@) {
864 warn "$@";
865 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
866 override; 1184 override;
867 } 1185 }
868 1186
869 return 1 if $override; 1187 return 1 if $override;
870 } 1188 }
871 1189
872 0 1190 0
873} 1191}
874 1192
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1194
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1196
879Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
880 1198
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1199This 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 1200removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1201results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1202
885=back 1203=back
886 1204
887=cut 1205=cut
888 1206
889############################################################################# 1207#############################################################################
890# object support 1208# object support
1209
1210sub _object_equal($$);
1211sub _object_equal($$) {
1212 my ($a, $b) = @_;
1213
1214 return 0 unless (ref $a) eq (ref $b);
1215
1216 if ("HASH" eq ref $a) {
1217 my @ka = keys %$a;
1218 my @kb = keys %$b;
1219
1220 return 0 if @ka != @kb;
1221
1222 for (0 .. $#ka) {
1223 return 0 unless $ka[$_] eq $kb[$_];
1224 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1225 }
1226
1227 } elsif ("ARRAY" eq ref $a) {
1228
1229 return 0 if @$a != @$b;
1230
1231 for (0 .. $#$a) {
1232 return 0 unless _object_equal $a->[$_], $b->[$_];
1233 }
1234
1235 } elsif ($a ne $b) {
1236 return 0;
1237 }
1238
1239 1
1240}
1241
1242our $SLOW_MERGES;#d#
1243sub _can_merge {
1244 my ($ob1, $ob2) = @_;
1245
1246 ++$SLOW_MERGES;#d#
1247
1248 # we do the slow way here
1249 return _object_equal $ob1, $ob2
1250}
891 1251
892sub reattach { 1252sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1254 my ($obj) = @_;
895 1255
1256 # no longer needed after getting rid of delete_package?
896 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
897 1258
898 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
899 1260
900 @$registry = (); 1261 @$registry = ();
901 1262
906 for (@$attach) { 1267 for (@$attach) {
907 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
908 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
909 } 1270 }
910 } else { 1271 } else {
911 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
912 } 1273 }
913 } 1274 }
914} 1275}
915 1276
916cf::attachable->attach ( 1277cf::attachable->attach (
917 prio => -1000000, 1278 prio => -1000000,
918 on_instantiate => sub { 1279 on_instantiate => sub {
919 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
920 1281
921 $data = from_json $data; 1282 $data = decode_json $data;
922 1283
923 for (@$data) { 1284 for (@$data) {
924 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
925 1286
926 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
942sub object_freezer_save { 1303sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
944 1305
945 sync_job { 1306 sync_job {
946 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
949 1312
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
954 close $fh; 1320 aio_close $fh;
955 1321
956 if (@$objs) { 1322 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
962 close $fh; 1331 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
964 } 1333 }
965 } else { 1334 } else {
966 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
967 } 1336 }
968 1337
969 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1342 } else {
971 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
972 } 1344 }
973 } else { 1345 } else {
974 aio_unlink $filename; 1346 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
976 } 1348 }
977 } 1349 };
978} 1350}
979 1351
980sub object_freezer_as_string { 1352sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
982 1354
994 or return; 1366 or return;
995 1367
996 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
998 or return; 1370 or return;
1371
999 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1000 } 1374 }
1001 1375
1376 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1380
1004 return ($data, $av); 1381 ($data, $av)
1005} 1382}
1006 1383
1007=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1008 1385
1009=over 4 1386=over 4
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1406 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1407}
1031 1408
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1409=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1410
1034Register a callback fro execution when the client sends an extcmd packet. 1411Register a callback for execution when the client sends an (synchronous)
1412extcmd packet. Ext commands will be processed in the order they are
1413received by the server, like other user commands. The first argument is
1414the logged-in player. Ext commands can only be processed after a player
1415has logged in successfully.
1035 1416
1036If the callback returns something, it is sent back as if reply was being 1417If the callback returns something, it is sent back as if reply was being
1037called. 1418called.
1038 1419
1420=item cf::register_exticmd $name => \&callback($ns,$packet);
1421
1422Register a callback for execution when the client sends an (asynchronous)
1423exticmd packet. Exti commands are processed by the server as soon as they
1424are received, i.e. out of order w.r.t. other commands. The first argument
1425is a client socket. Exti commands can be received anytime, even before
1426log-in.
1427
1428If the callback returns something, it is sent back as if reply was being
1429called.
1430
1039=cut 1431=cut
1040 1432
1041sub register_extcmd { 1433sub register_extcmd {
1042 my ($name, $cb) = @_; 1434 my ($name, $cb) = @_;
1043 1435
1044 $EXTCMD{$name} = $cb; 1436 $EXTCMD{$name} = $cb;
1045} 1437}
1046 1438
1439sub register_exticmd {
1440 my ($name, $cb) = @_;
1441
1442 $EXTICMD{$name} = $cb;
1443}
1444
1445use File::Glob ();
1446
1047cf::player->attach ( 1447cf::player->attach (
1048 on_command => sub { 1448 on_unknown_command => sub {
1049 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1050 1450
1051 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1052 or return; 1452 or return;
1053 1453
1058 cf::override; 1458 cf::override;
1059 }, 1459 },
1060 on_extcmd => sub { 1460 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1062 1462
1063 my $msg = eval { from_json $buf }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1464
1065 if (ref $msg) { 1465 if (ref $msg) {
1466 my ($type, $reply, @payload) =
1467 "ARRAY" eq ref $msg
1468 ? @$msg
1469 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470
1471 my @reply;
1472
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1473 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1474 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1475 }
1476
1477 $pl->ext_reply ($reply, @reply)
1478 if $reply;
1479
1071 } else { 1480 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1482 }
1074 1483
1075 cf::override; 1484 cf::override;
1076 }, 1485 },
1077); 1486);
1078 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1079sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1080 cf::sync_job { 1504 cf::sync_job {
1081 my %todo; 1505 my %todo;
1082 1506
1083 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1084 next unless -r $path; 1508 next unless -r $path;
1102 1526
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1529
1106 $ext{source} = 1530 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1108 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1109 . $source 1533 . $source
1110 . "\n};\n1"; 1534 . "\n};\n1";
1111 1535
1112 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1113 } 1537 }
1114 1538
1539 my $pass = 0;
1115 my %done; 1540 my %done;
1116 while (%todo) { 1541 while (%todo) {
1117 my $progress; 1542 my $progress;
1118 1543
1544 ++$pass;
1545
1546 ext:
1119 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip 1549 next ext
1122 unless exists $done{$_}; 1550 unless exists $done{$_};
1123 } 1551 }
1124 1552
1125 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1126 1554
1127 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1128 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1129 : "$v->{base}: extension inactive.\n";
1130 1559
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1131 if (exists $v->{meta}{mandatory}) { 1561 if exists $v->{meta}{mandatory};
1132 warn $msg; 1562
1133 warn "mandatory extension failed to load, exiting.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1134 exit 1; 1564 delete $todo{$k};
1135 } 1565 } else {
1136 1566 $done{$k} = delete $todo{$k};
1137 warn $msg; 1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1138 } 1572 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
1143 } 1573 }
1144 1574
1145 skip: 1575 unless ($progress) {
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1147 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1148 } 1585 }
1149 }; 1586 };
1150} 1587}
1151 1588
1152############################################################################# 1589#############################################################################
1153 1590
1154=back 1591=back
1155 1592
1156=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1157 1594
1158Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1159 1596
1160=cut 1597=cut
1161 1598
1162package cf::player; 1599package cf::player;
1163 1600
1164use Coro::AIO; 1601use Coro::AIO;
1165 1602
1166=head3 cf::player 1603=head3 cf::player
1167 1604
1168=over 4 1605=over 4
1606
1607=item cf::player::num_playing
1608
1609Returns the official number of playing players, as per the Crossfire metaserver rules.
1610
1611=cut
1612
1613sub num_playing {
1614 scalar grep
1615 $_->ob->map
1616 && !$_->hidden
1617 && !$_->ob->flag (cf::FLAG_WIZ),
1618 cf::player::list
1619}
1169 1620
1170=item cf::player::find $login 1621=item cf::player::find $login
1171 1622
1172Returns the given player object, loading it if necessary (might block). 1623Returns the given player object, loading it if necessary (might block).
1173 1624
1192 1643
1193sub exists($) { 1644sub exists($) {
1194 my ($login) = @_; 1645 my ($login) = @_;
1195 1646
1196 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1198} 1649}
1199 1650
1200sub find($) { 1651sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1653 my $login = $_[0];
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1660 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1661 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1662 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1663 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1664
1214 my $pl = load_pl path $login 1665 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1666 or return;
1667
1668 my $pl = cf::player::load_pl $f
1669 or return;
1670
1671 local $cf::PLAYER_LOADING{$login} = $pl;
1672 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1217 } 1674 }
1218 } 1675 }
1219} 1676}
1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1220 1690
1221sub save($) { 1691sub save($) {
1222 my ($pl) = @_; 1692 my ($pl) = @_;
1223 1693
1224 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1229 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1230 1700
1231 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1233 1703
1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1708
1234 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1235 Coro::cede; 1710 cf::cede_to_tick;
1236} 1711}
1237 1712
1238sub new($) { 1713sub new($) {
1239 my ($login) = @_; 1714 my ($login) = @_;
1240 1715
1246 $cf::PLAYER{$login} = $self; 1721 $cf::PLAYER{$login} = $self;
1247 1722
1248 $self 1723 $self
1249} 1724}
1250 1725
1726=item $player->send_msg ($channel, $msg, $color, [extra...])
1727
1728=cut
1729
1730sub send_msg {
1731 my $ns = shift->ns
1732 or return;
1733 $ns->send_msg (@_);
1734}
1735
1251=item $pl->quit_character 1736=item $pl->quit_character
1252 1737
1253Nukes the player without looking back. If logged in, the connection will 1738Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1739be destroyed. May block for a long time.
1255 1740
1259 my ($pl) = @_; 1744 my ($pl) = @_;
1260 1745
1261 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1262 1747
1263 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1265 1750
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1267 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1269 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1270 1759
1271 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1273 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1308 or return []; 1797 or return [];
1309 1798
1310 my @logins; 1799 my @logins;
1311 1800
1312 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1802 my $path = path $login;
1803
1804 # a .pst is a dead give-away for a valid player
1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1810 }
1316 1811
1317 utf8::decode $login; 1812 utf8::decode $login;
1318 push @logins, $login; 1813 push @logins, $login;
1319 } 1814 }
1320 1815
1321 \@logins 1816 \@logins
1322} 1817}
1323 1818
1324=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1325 1822
1326Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1327player. May block. 1824player. May block.
1328 1825
1329=cut 1826=cut
1347 } 1844 }
1348 1845
1349 \@paths 1846 \@paths
1350} 1847}
1351 1848
1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850
1851Expand deliantra pod fragments into protocol xml.
1852
1352=item $player->ext_reply ($msgid, %msg) 1853=item $player->ext_reply ($msgid, @msg)
1353 1854
1354Sends an ext reply to the player. 1855Sends an ext reply to the player.
1355 1856
1356=cut 1857=cut
1357 1858
1358sub ext_reply($$%) { 1859sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1860 my ($self, $id, @msg) = @_;
1360 1861
1361 $msg{msgid} = $id; 1862 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1863}
1365 1864
1366=item $player->ext_event ($type, %msg) 1865=item $player->ext_msg ($type, @msg)
1367 1866
1368Sends an ext event to the client. 1867Sends an ext event to the client.
1369 1868
1370=cut 1869=cut
1371 1870
1372sub ext_event($$%) { 1871sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1872 my ($self, $type, @msg) = @_;
1374 1873
1375 $self->ns->ext_event ($type, %msg); 1874 $self->ns->ext_msg ($type, @msg);
1376} 1875}
1377 1876
1378=head3 cf::region 1877=head3 cf::region
1379 1878
1380=over 4 1879=over 4
1390=cut 1889=cut
1391 1890
1392sub find_by_path($) { 1891sub find_by_path($) {
1393 my ($path) = @_; 1892 my ($path) = @_;
1394 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1395 my ($match, $specificity); 1896 my ($match, $specificity);
1396 1897
1397 for my $region (list) { 1898 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1901 if $region->specificity > $specificity;
1401 } 1902 }
1402 } 1903 }
1403 1904
1424our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1426 1927
1427sub generate_random_map { 1928sub generate_random_map {
1428 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1429 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1430 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1434 $rmp->{exit_on_final_map},
1435 $rmp->{xsize}, $rmp->{ysize},
1436 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1437 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1438 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1439 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1440 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1441 (cf::region::find $rmp->{region}), $rmp->{custom}
1442 )
1443} 1934}
1444 1935
1445=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1446 1937
1447Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1452 1943
1453sub register { 1944sub register {
1454 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1455 my $pkg = caller; 1946 my $pkg = caller;
1456 1947
1457 no strict;
1458 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1459 1949
1460 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1461} 1951}
1462 1952
1463# also paths starting with '/' 1953# also paths starting with '/'
1464$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1465 1955
1466sub thawer_merge { 1956sub thawer_merge {
1467 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1468 1958
1469 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1474} 1964}
1475 1965
1476sub normalise { 1966sub normalise {
1477 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1478 1968
1479 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1480 1970
1481 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1482 1972
1483 # map plan: 1973 # map plan:
1484 # 1974 #
1499 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1500 $path = "$base/$path"; 1990 $path = "$base/$path";
1501 } 1991 }
1502 1992
1503 for ($path) { 1993 for ($path) {
1504 redo if s{//}{/};
1505 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1506 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1507 } 1996 }
1508 1997
1509 $path 1998 $path
1523 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1524 return $self; 2013 return $self;
1525 } 2014 }
1526 } 2015 }
1527 2016
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1529 () 2018 ()
1530} 2019}
1531 2020
2021# may re-bless or do other evil things
1532sub init { 2022sub init {
1533 my ($self) = @_; 2023 my ($self) = @_;
1534 2024
1535 $self 2025 $self
1536} 2026}
1555 2045
1556# the temporary/swap location 2046# the temporary/swap location
1557sub save_path { 2047sub save_path {
1558 my ($self) = @_; 2048 my ($self) = @_;
1559 2049
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1562} 2052}
1563 2053
1564# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1565sub uniq_path { 2055sub uniq_path {
1566 my ($self) = @_; 2056 my ($self) = @_;
1567 2057
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1570}
1571
1572# and all this just because we cannot iterate over
1573# all maps in C++...
1574sub change_all_map_light {
1575 my ($change) = @_;
1576
1577 $_->change_map_light ($change)
1578 for grep $_->outdoor, values %cf::MAP;
1579} 2060}
1580 2061
1581sub decay_objects { 2062sub decay_objects {
1582 my ($self) = @_; 2063 my ($self) = @_;
1583 2064
1596 2077
1597sub load_header_from($) { 2078sub load_header_from($) {
1598 my ($self, $path) = @_; 2079 my ($self, $path) = @_;
1599 2080
1600 utf8::encode $path; 2081 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 2082 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 or return; 2083 or return;
1606 2084
2085 $self->_load_header ($f)
2086 or return;
2087
2088 local $MAP_LOADING{$self->{path}} = $self;
2089 $f->resolve_delayed_derefs;
2090
1607 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1608 2092
1609 1 2093 1
1610} 2094}
1611 2095
2096# used to laod the header of an original map
1612sub load_header_orig { 2097sub load_header_orig {
1613 my ($self) = @_; 2098 my ($self) = @_;
1614 2099
1615 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1616} 2101}
1617 2102
2103# used to laod the header of an instantiated map
1618sub load_header_temp { 2104sub load_header_temp {
1619 my ($self) = @_; 2105 my ($self) = @_;
1620 2106
1621 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1622} 2108}
1623 2109
2110# called after loading the header from an instantiated map
1624sub prepare_temp { 2111sub prepare_temp {
1625 my ($self) = @_; 2112 my ($self) = @_;
1626 2113
1627 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1628 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1629 # safety 2116 # safety
1630 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1631 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1632} 2119}
1633 2120
2121# called after loading the header from an original map
1634sub prepare_orig { 2122sub prepare_orig {
1635 my ($self) = @_; 2123 my ($self) = @_;
1636 2124
1637 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1638 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1662 2150
1663sub find; 2151sub find;
1664sub find { 2152sub find {
1665 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1666 2154
2155 cf::cede_to_tick;
2156
1667 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1668 2158
2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1670 2161
1671 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path";
1673 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1674 or return; 2164 or return;
1675 2165
1676 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1677 2167
1679 or return; 2169 or return;
1680 2170
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2175 undef $guard1;
1684 $map->reset; 2176 $map->reset;
1685 undef $guard;
1686 return find $path; 2177 return find $path;
1687 } 2178 }
1688 2179
1689 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1690 } 2181 }
1691} 2182}
1692 2183
1693sub pre_load { } 2184sub pre_load { }
1694sub post_load { } 2185#sub post_load { } # XS
1695 2186
1696sub load { 2187sub load {
1697 my ($self) = @_; 2188 my ($self) = @_;
1698 2189
1699 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1700 2191
1701 my $path = $self->{path}; 2192 my $path = $self->{path};
1702 2193
1703 { 2194 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1705 2196
2197 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1707
1708 $self->in_memory (cf::MAP_LOADING);
1709 2199
1710 $self->alloc; 2200 $self->alloc;
1711 2201
1712 $self->pre_load; 2202 $self->pre_load;
1713 Coro::cede; 2203 cf::cede_to_tick;
1714 2204
1715 $self->_load_objects ($self->{load_path}, 1) 2205 if (exists $self->{load_path}) {
2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2207 $f->skip_block;
2208 $self->_load_objects ($f)
1716 or return; 2209 or return;
1717 2210
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
1719 if delete $self->{load_original}; 2212 if delete $self->{load_original};
1720 2213
1721 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2215 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2216 unless (aio_stat $uniq) {
2217 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2218 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2219 $self->_load_objects ($f);
2220 $f->resolve_delayed_derefs;
2221 }
2222 }
1726 } 2223 }
1727 }
1728 2224
1729 Coro::cede; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2232
2233 cf::cede_to_tick;
1730 # now do the right thing for maps 2234 # now do the right thing for maps
1731 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2237 unless $self->difficulty;
1734 Coro::cede; 2238 cf::cede_to_tick;
1735 2239
1736 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2241 $self->decay_objects;
1738 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
1739 $self->update_buttons; 2243 $self->update_buttons;
1740 Coro::cede; 2244 $self->post_load_physics;
1741 $self->set_darkness_map; 2245 cf::cede_to_tick;
1742 Coro::cede; 2246 #$self->activate; # no longer activate maps automatically
1743 $self->activate;
1744 } 2247 }
1745 2248
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2249 $self->{last_save} = $cf::RUNTIME;
2250 $self->last_access ($cf::RUNTIME);
1747 } 2251 }
1748 2252
1749 $self->post_load; 2253 $self->post_load;
1750}
1751 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
1752sub customise_for { 2261sub customise_for {
1753 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
1754 2263
1755 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
1756 if $self->per_player; 2265 if $self->per_player;
1760 2269
1761 $self 2270 $self
1762} 2271}
1763 2272
1764# find and load all maps in the 3x3 area around a map 2273# find and load all maps in the 3x3 area around a map
1765sub load_diag { 2274sub load_neighbours {
1766 my ($map) = @_; 2275 my ($map) = @_;
1767 2276
1768 my @diag; # diagonal neighbours 2277 my @neigh; # diagonal neighbours
1769 2278
1770 for (0 .. 3) { 2279 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2280 my $neigh = $map->tile_path ($_)
1772 or next; 2281 or next;
1773 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
1774 or next; 2283 or next;
1775 $neigh->load; 2284 $neigh->load;
1776 2285
2286 # now find the diagonal neighbours
2287 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2290 }
1780 2291
1781 for (@diag) { 2292 for (grep defined $_->[0], @neigh) {
2293 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2294 my $neigh = find $path, $origin
1783 or next; 2295 or next;
1784 $neigh->load; 2296 $neigh->load;
1785 } 2297 }
1786} 2298}
1787 2299
1788sub find_sync { 2300sub find_sync {
1789 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
1790 2302
1791 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
1792} 2308}
1793 2309
1794sub do_load_sync { 2310sub do_load_sync {
1795 my ($map) = @_; 2311 my ($map) = @_;
1796 2312
1797 cf::sync_job { $map->load }; 2313 # it's a bug to call this from the main context
2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2315 if $Coro::current == $Coro::main;
2316
2317 $map->load;
1798} 2318}
1799 2319
1800our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
1802 2322
1803sub find_async { 2323sub find_async {
1804 my ($path, $origin) = @_; 2324 my ($path, $origin, $load) = @_;
1805 2325
1806 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
1807 2327
2328 print "find async $path (from $origin)\n";#d#
2329
1808 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2331 return $map if !$load || $map->linkable;
1810 } 2332 }
1811 2333
1812 undef $MAP_PREFETCH{$path}; 2334 $MAP_PREFETCH{$path} |= $load;
2335
1813 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2337 $Coro::current->{desc} = "map prefetcher";
2338
1814 while (%MAP_PREFETCH) { 2339 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2340 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2341 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2342 $map->load if $v;
2343 }
1819 2344
1820 delete $MAP_PREFETCH{$path}; 2345 delete $MAP_PREFETCH{$k};
1821 } 2346 }
1822 } 2347 }
1823 undef $MAP_PREFETCHER; 2348 undef $MAP_PREFETCHER;
1824 }; 2349 };
1825 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
1826 2351
1827 () 2352 ()
1828} 2353}
1829 2354
2355# common code, used by both ->save and ->swapout
1830sub save { 2356sub _save {
1831 my ($self) = @_; 2357 my ($self) = @_;
1832
1833 my $lock = cf::lock_acquire "map_data:" . $self->path;
1834 2358
1835 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
1836 2360
1837 return unless $self->dirty; 2361 return unless $self->dirty;
1838 2362
1844 return if $self->{deny_save}; 2368 return if $self->{deny_save};
1845 2369
1846 local $self->{last_access} = $self->last_access;#d# 2370 local $self->{last_access} = $self->last_access;#d#
1847 2371
1848 cf::async { 2372 cf::async {
2373 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2374 $_->contr->save for $self->players;
1850 }; 2375 };
2376
2377 cf::get_slot 0.02;
1851 2378
1852 if ($uniq) { 2379 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2381 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2382 } else {
1856 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1857 } 2384 }
1858} 2385}
1859 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
1860sub swap_out { 2395sub swap_out {
1861 my ($self) = @_; 2396 my ($self) = @_;
1862 2397
1863 # save first because save cedes
1864 $self->save;
1865
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
1868 return if $self->players; 2402 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY;
1870 return if $self->{deny_save};
1871 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
1872 $self->clear; 2413 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2414}
1875 2415
1876sub reset_at { 2416sub reset_at {
1877 my ($self) = @_; 2417 my ($self) = @_;
1878 2418
1896 2436
1897 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
1898 2438
1899 return if $self->players; 2439 return if $self->players;
1900 2440
1901 warn "resetting map ", $self->path; 2441 cf::trace "resetting map ", $self->path, "\n";
1902 2442
1903 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
1904 2444
1905 # need to save uniques path 2445 # need to save uniques path
1906 unless ($self->{deny_save}) { 2446 unless ($self->{deny_save}) {
1907 my $uniq = $self->uniq_path; utf8::encode $uniq; 2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
1908 2448
1910 if $uniq; 2450 if $uniq;
1911 } 2451 }
1912 2452
1913 delete $cf::MAP{$self->path}; 2453 delete $cf::MAP{$self->path};
1914 2454
2455 $self->deactivate;
2456 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2457 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2458
1919 $self->unlink_save; 2459 $self->unlink_save;
1920 $self->destroy; 2460 $self->destroy;
1921} 2461}
1922 2462
1923my $nuke_counter = "aaaa"; 2463my $nuke_counter = "aaaa";
1924 2464
1925sub nuke { 2465sub nuke {
1926 my ($self) = @_; 2466 my ($self) = @_;
1927 2467
2468 {
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
1928 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
1929 2472
1930 $self->unlink_save; 2473 $self->unlink_save;
1931 2474
1932 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
1933 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2480
1938 $cf::MAP{$self->path} = $self; 2481 $cf::MAP{$self->path} = $self;
2482 }
1939 2483
1940 $self->reset; # polite request, might not happen 2484 $self->reset; # polite request, might not happen
1941} 2485}
1942 2486
1943=item $maps = cf::map::tmp_maps 2487=item $maps = cf::map::tmp_maps
1985 2529
1986sub unique_maps() { 2530sub unique_maps() {
1987 [ 2531 [
1988 map { 2532 map {
1989 utf8::decode $_; 2533 utf8::decode $_;
1990 /\.map$/ 2534 s/\.map$//; # TODO future compatibility hack
2535 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2536 ? ()
1991 ? normalise $_ 2537 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2539 ]
1995} 2540}
1996 2541
1997package cf; 2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
1998 2573
1999=back 2574=back
2000 2575
2001=head3 cf::object 2576=head3 cf::object
2002 2577
2006 2581
2007=over 4 2582=over 4
2008 2583
2009=item $ob->inv_recursive 2584=item $ob->inv_recursive
2010 2585
2011Returns the inventory of the object _and_ their inventories, recursively. 2586Returns the inventory of the object I<and> their inventories, recursively,
2587but I<not> the object itself.
2012 2588
2013=cut 2589=cut
2014 2590
2015sub inv_recursive_; 2591sub inv_recursive_;
2016sub inv_recursive_ { 2592sub inv_recursive_ {
2019 2595
2020sub inv_recursive { 2596sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2597 inv_recursive_ inv $_[0]
2022} 2598}
2023 2599
2600=item $ref = $ob->ref
2601
2602Creates and returns a persistent reference to an object that can be stored as a string.
2603
2604=item $ob = cf::object::deref ($refstring)
2605
2606returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2607even if the object actually exists. May block.
2608
2609=cut
2610
2611sub deref {
2612 my ($ref) = @_;
2613
2614 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2615 my ($uuid, $name) = ($1, $2);
2616 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2617 or return;
2618 $pl->ob->uuid eq $uuid
2619 or return;
2620
2621 $pl->ob
2622 } else {
2623 warn "$ref: cannot resolve object reference\n";
2624 undef
2625 }
2626}
2627
2024package cf; 2628package cf;
2025 2629
2026=back 2630=back
2027 2631
2028=head3 cf::object::player 2632=head3 cf::object::player
2034Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2638Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2035can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2036dialogue with the given NPC character. 2640dialogue with the given NPC character.
2037 2641
2038=cut 2642=cut
2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2039 2657
2040# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2659# with dialog boxes.
2042#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2043sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2050 2668
2051 } else { 2669 } else {
2052 my $pl = $self->contr; 2670 my $pl = $self->contr;
2053 2671
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2672 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2675
2060 } else { 2676 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2679 }
2064 } 2680 }
2681}
2682
2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2684
2685=cut
2686
2687sub cf::object::send_msg {
2688 my $pl = shift->contr
2689 or return;
2690 $pl->send_msg (@_);
2065} 2691}
2066 2692
2067=item $player_object->may ("access") 2693=item $player_object->may ("access")
2068 2694
2069Returns wether the given player is authorized to access resource "access" 2695Returns wether the given player is authorized to access resource "access"
2082 2708
2083=item $player_object->enter_link 2709=item $player_object->enter_link
2084 2710
2085Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2086 2712
2087The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2088I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2089 2717
2090Will never block. 2718Will never block.
2091 2719
2092=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2093 2721
2113sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2114 my ($self) = @_; 2742 my ($self) = @_;
2115 2743
2116 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2117 2745
2746 ++$self->{_link_recursion};
2747
2118 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2119 2749
2120 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2121 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2122 2752
2123 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2124} 2754}
2125 2755
2126sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2127 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2128 2758
2145 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2146 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2147 2777
2148 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2151 2781
2152 $map->load; 2782 $map->load;
2153 $map->load_diag; 2783 $map->load_neighbours;
2154 2784
2155 return unless $self->contr->active; 2785 return unless $self->contr->active;
2156 $self->activate_recursive;
2157 2786
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2160} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2161 2794
2795}
2796
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2163 2798
2164Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2802the new (success) or old (failed) map position. In either case, $done will
2803be called at the end of this process.
2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2168 2807
2169=cut 2808=cut
2170 2809
2171our $GOTOGEN; 2810our $GOTOGEN;
2172 2811
2173sub cf::object::player::goto { 2812sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2175 2820
2176 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2823
2179 $self->enter_link; 2824 $self->enter_link;
2180 2825
2181 (async { 2826 (async {
2827 $Coro::current->{desc} = "player::goto $path $x $y";
2828
2829 # *tag paths override both path and x|y
2830 if ($path =~ /^\*(.*)$/) {
2831 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2832 my $ob = $obs[rand @obs];
2833
2834 # see if we actually can go there
2835 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2836 $ob = $obs[rand @obs];
2837 } else {
2838 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2839 }
2840 # else put us there anyways for now #d#
2841
2842 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2843 } else {
2844 ($path, $x, $y) = (undef, undef, undef);
2845 }
2846 }
2847
2182 my $map = eval { 2848 my $map = eval {
2183 my $map = cf::map::find $path; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2184 2850
2185 if ($map) { 2851 if ($map) {
2186 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2188 } else { 2854 } else {
2189 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2190 } 2856 }
2191 2857
2192 $map 2858 $map
2193 }; 2859 };
2194 2860
2199 2865
2200 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2203 } 2869 }
2870
2871 $done->($self) if $done;
2204 })->prio (1); 2872 })->prio (1);
2205} 2873}
2206 2874
2207=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2208 2876
2228} 2896}
2229 2897
2230sub prepare_random_map { 2898sub prepare_random_map {
2231 my ($exit) = @_; 2899 my ($exit) = @_;
2232 2900
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2903 # that depends on the exit object
2238 2904
2239 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2241 if ($exit->map) { 2907 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2246 } 2914 }
2247 2915
2248 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2249 2917
2250 my $data = cf::to_json $rmp; 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2253 2921
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2924 undef $fh;
2257 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2258 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2261 } 2933 }
2262} 2934}
2263 2935
2264sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2266 2938
2267 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2268 2940
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2941 $self->enter_link;
2281 2942
2282 (async { 2943 (async {
2283 $self->deactivate_recursive; # just to be sure 2944 $Coro::current->{desc} = "enter_exit";
2945
2284 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2285 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2286 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2287 1; 2982 1
2288 }) { 2983 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2291 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2988
2294 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2295 $self->leave_link; 2990 $self->leave_link;
2296 } 2991 }
2297 })->prio (1); 2992 })->prio (1);
2298} 2993}
2299 2994
2313 3008
2314 utf8::encode $text; 3009 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 3011}
2317 3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
3036}
3037
3038=item $client->send_msg ($channel, $msg, $color, [extra...])
3039
3040Send a drawinfo or msg packet to the client, formatting the msg for the
3041client if neccessary. C<$type> should be a string identifying the type of
3042the message, with C<log> being the default. If C<$color> is negative, suppress
3043the message unless the client supports the msg packet.
3044
3045=cut
3046
3047# non-persistent channels (usually the info channel)
3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
3055 "c/identify" => {
3056 id => "infobox",
3057 title => "Identify",
3058 reply => undef,
3059 tooltip => "Items recently identified",
3060 },
3061 "c/examine" => {
3062 id => "infobox",
3063 title => "Examine",
3064 reply => undef,
3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
3072 },
3073 "c/book" => {
3074 id => "infobox",
3075 title => "Book",
3076 reply => undef,
3077 tooltip => "The contents of a note or book",
3078 },
3079 "c/lookat" => {
3080 id => "infobox",
3081 title => "Look",
3082 reply => undef,
3083 tooltip => "What you saw there",
3084 },
3085 "c/who" => {
3086 id => "infobox",
3087 title => "Players",
3088 reply => undef,
3089 tooltip => "Shows players who are currently online",
3090 },
3091 "c/body" => {
3092 id => "infobox",
3093 title => "Body Parts",
3094 reply => undef,
3095 tooltip => "Shows which body parts you posess and are available",
3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
3133 "c/uptime" => {
3134 id => "infobox",
3135 title => "Uptime",
3136 reply => undef,
3137 tooltip => "How long the server has been running since last restart",
3138 },
3139 "c/mapinfo" => {
3140 id => "infobox",
3141 title => "Map Info",
3142 reply => undef,
3143 tooltip => "Information related to the maps",
3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
3159);
3160
3161sub cf::client::send_msg {
3162 my ($self, $channel, $msg, $color, @extra) = @_;
3163
3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
3166
3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
3168
3169 # check predefined channels, for the benefit of C
3170 if ($CHANNEL{$channel}) {
3171 $channel = $CHANNEL{$channel};
3172
3173 $self->ext_msg (channel_info => $channel);
3174 $channel = $channel->{id};
3175
3176 } elsif (ref $channel) {
3177 # send meta info to client, if not yet sent
3178 unless (exists $self->{channel}{$channel->{id}}) {
3179 $self->{channel}{$channel->{id}} = $channel;
3180 $self->ext_msg (channel_info => $channel);
3181 }
3182
3183 $channel = $channel->{id};
3184 }
3185
3186 return unless @extra || length $msg;
3187
3188 # default colour, mask it out
3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3190 if $color & cf::NDI_DEF;
3191
3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3195 );
3196
3197 $self->send_big_packet ($pkt);
3198}
3199
2318=item $client->ext_event ($type, %msg) 3200=item $client->ext_msg ($type, @msg)
2319 3201
2320Sends an exti event to the client. 3202Sends an ext event to the client.
2321 3203
2322=cut 3204=cut
2323 3205
2324sub cf::client::ext_event($$%) { 3206sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 3207 my ($self, $type, @msg) = @_;
2326 3208
3209 if ($self->extcmd == 2) {
3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3211 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 3212 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3214 }
3215}
3216
3217=item $client->ext_reply ($msgid, @msg)
3218
3219Sends an ext reply to the client.
3220
3221=cut
3222
3223sub cf::client::ext_reply($$@) {
3224 my ($self, $id, @msg) = @_;
3225
3226 if ($self->extcmd == 2) {
3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3228 } elsif ($self->extcmd == 1) {
3229 #TODO: version 1, remove
3230 unshift @msg, msgtype => "reply", msgid => $id;
3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3232 }
2329} 3233}
2330 3234
2331=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2332 3236
2333Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3238the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3239C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 3240
2337Queries can fail, so check the return code. Or don't, as queries will become 3241Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 3242become reliable at some point in the future.
2339 3243
2340=cut 3244=cut
2341 3245
2342sub cf::client::query { 3246sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 3247 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 3255 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3256 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 3257
2354 $self->send_packet ($self->{query_queue}[0][0]) 3258 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 3259 if @{ $self->{query_queue} } == 1;
3260
3261 1
2356} 3262}
2357 3263
2358cf::client->attach ( 3264cf::client->attach (
3265 on_connect => sub {
3266 my ($ns) = @_;
3267
3268 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3269 },
2359 on_reply => sub { 3270 on_reply => sub {
2360 my ($ns, $msg) = @_; 3271 my ($ns, $msg) = @_;
2361 3272
2362 # this weird shuffling is so that direct followup queries 3273 # this weird shuffling is so that direct followup queries
2363 # get handled first 3274 # get handled first
2375 } else { 3286 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3287 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 3288 }
2378 } 3289 }
2379 }, 3290 },
3291 on_exticmd => sub {
3292 my ($ns, $buf) = @_;
3293
3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3295
3296 if (ref $msg) {
3297 my ($type, $reply, @payload) =
3298 "ARRAY" eq ref $msg
3299 ? @$msg
3300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3301
3302 my @reply;
3303
3304 if (my $cb = $EXTICMD{$type}) {
3305 @reply = $cb->($ns, @payload);
3306 }
3307
3308 $ns->ext_reply ($reply, @reply)
3309 if $reply;
3310
3311 } else {
3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3313 }
3314
3315 cf::override;
3316 },
2380); 3317);
2381 3318
2382=item $client->async (\&cb) 3319=item $client->async (\&cb)
2383 3320
2384Create a new coroutine, running the specified callback. The coroutine will 3321Create a new coroutine, running the specified callback. The coroutine will
2400 3337
2401 $coro 3338 $coro
2402} 3339}
2403 3340
2404cf::client->attach ( 3341cf::client->attach (
2405 on_destroy => sub { 3342 on_client_destroy => sub {
2406 my ($ns) = @_; 3343 my ($ns) = @_;
2407 3344
2408 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2409 }, 3346 },
2410); 3347);
2425our $safe = new Safe "safe"; 3362our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
2427 3364
2428$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
2429 3366
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3367$safe->permit_only (Opcode::opset qw(
3368 :base_core :base_mem :base_orig :base_math :base_loop
3369 grepstart grepwhile mapstart mapwhile
3370 sort time
3371));
2431 3372
2432# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
2433 3374
2434=pod 3375=pod
2435 3376
2436The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
2437 3378
2438 cf::object contr pay_amount pay_player map 3379 cf::object
3380 contr pay_amount pay_player map x y force_find force_add destroy
3381 insert remove name archname title slaying race decrease split
3382 value
3383
2439 cf::object::player player 3384 cf::object::player
2440 cf::player peaceful 3385 player
2441 cf::map trigger 3386
3387 cf::player
3388 peaceful
3389
3390 cf::map
3391 trigger
2442 3392
2443=cut 3393=cut
2444 3394
2445for ( 3395for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3397 insert remove inv nrof name archname title slaying race
3398 decrease split destroy change_exp value msg lore send_msg)],
2447 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
2449 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
2450) { 3402) {
2451 no strict 'refs';
2452 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
2453 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2454 for @funs; 3405 for @funs;
2455} 3406}
2456 3407
2471 3422
2472 my $qcode = $code; 3423 my $qcode = $code;
2473 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2474 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
2475 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
2476 local $_; 3430 local $_;
2477 local @safe::cf::_safe_eval_args = values %vars;
2478 3431
2479 my $eval = 3432 my $eval =
2480 "do {\n" 3433 "do {\n"
2481 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2482 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
2483 . $code 3436 . $code
2484 . "\n}" 3437 . "\n}"
2485 ; 3438 ;
2486 3439
3440 if ($CFG{safe_eval}) {
2487 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
2488 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2489 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
2490 3449
2491 if ($@) { 3450 if ($@) {
2492 warn "$@"; 3451 warn "$@",
2493 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
2494 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
2495 } 3454 }
2496 3455
2497 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
2498} 3457}
2499 3458
2513=cut 3472=cut
2514 3473
2515sub register_script_function { 3474sub register_script_function {
2516 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
2517 3476
2518 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
2519 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
2520} 3479}
2521 3480
2522=back 3481=back
2523 3482
2524=cut 3483=cut
2527# the server's init and main functions 3486# the server's init and main functions
2528 3487
2529sub load_facedata($) { 3488sub load_facedata($) {
2530 my ($path) = @_; 3489 my ($path) = @_;
2531 3490
3491 # HACK to clear player env face cache, we need some signal framework
3492 # for this (global event?)
3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3494
3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3496
2532 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
2533 3498
2534 my $facedata; 3499 my $facedata = decode_storable load_file $path;
2535 0 < aio_load $path, $facedata
2536 or die "$path: $!";
2537
2538 $facedata = Coro::Storable::thaw $facedata;
2539 3500
2540 $facedata->{version} == 2 3501 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3503
3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3506 $facedata->{resource}{"res/exp_table"} = {
3507 type => FT_RSRC,
3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3510 };
3511 cf::cede_to_tick;
3512
2543 { 3513 {
2544 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
2545 3515
2546 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3518
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3520 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2551 Coro::cede; 3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3524
3525 cf::cede_to_tick;
2552 } 3526 }
2553 3527
2554 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3529 next unless $info->{smooth};
3530
2556 my $idx = cf::face::find $face 3531 my $idx = cf::face::find $face
2557 or next; 3532 or next;
3533
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3535 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3537 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3539 }
2563 Coro::cede; 3540
3541 cf::cede_to_tick;
2564 } 3542 }
2565 } 3543 }
2566 3544
2567 { 3545 {
2568 my $anims = $facedata->{animinfo}; 3546 my $anims = $facedata->{animinfo};
2569 3547
2570 while (my ($anim, $info) = each %$anims) { 3548 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3549 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3550 cf::cede_to_tick;
2573 } 3551 }
2574 3552
2575 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
2576 } 3554 }
2577 3555
3556 {
3557 my $res = $facedata->{resource};
3558
3559 while (my ($name, $info) = each %$res) {
3560 if (defined $info->{type}) {
3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3562
3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3564 cf::face::set_type $idx, $info->{type};
3565 } else {
3566 $RESOURCE{$name} = $info; # unused
3567 }
3568
3569 cf::cede_to_tick;
3570 }
3571 }
3572
3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3574
2578 1 3575 1
2579} 3576}
2580 3577
3578register_exticmd fx_want => sub {
3579 my ($ns, $want) = @_;
3580
3581 while (my ($k, $v) = each %$want) {
3582 $ns->fx_want ($k, $v);
3583 }
3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3595
2581sub reload_regions { 3596sub reload_regions {
3597 # HACK to clear player env face cache, we need some signal framework
3598 # for this (global event?)
3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3600
2582 load_resource_file "$MAPDIR/regions" 3601 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3602 or die "unable to load regions file\n";
3603
3604 for (cf::region::list) {
3605 $_->{match} = qr/$_->{match}/
3606 if exists $_->{match};
3607 }
2584} 3608}
2585 3609
2586sub reload_facedata { 3610sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3611 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3612 or die "unable to load facedata\n";
2596sub reload_treasures { 3620sub reload_treasures {
2597 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
2598 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
2599} 3623}
2600 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
2601sub reload_resources { 3645sub reload_resources {
2602 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
2603 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
2604 reload_regions; 3653 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3654 reload_treasures;
2609 3655
2610 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
2611} 3657}
2612 3658
2613sub init { 3659sub reload_config {
2614 reload_resources; 3660 trace "reloading config file...\n";
2615}
2616 3661
2617sub cfg_load { 3662 my $config = load_file "$CONFDIR/config";
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3663 utf8::decode $config;
2619 or return; 3664 *CFG = decode_yaml $config;
2620 3665
2621 local $/;
2622 *CFG = YAML::Syck::Load <$fh>;
2623
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2625 3667
2626 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2627 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2628 3670
2629 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
2633 }; 3675 };
2634 warn $@ if $@; 3676 warn $@ if $@;
2635 } 3677 }
2636} 3678}
2637 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
2638sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
2639 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3721 (async {
2643 Event::one_event; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3723 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
2645 }; 3725 };
2646 3726
2647 cfg_load; 3727 evthread_start IO::AIO::poll_fileno;
3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3739 reload_config;
2648 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
2649 load_extensions; 3750 load_extensions;
2650 3751
2651 $TICK_WATCHER->start; 3752 utime time, time, $RUNTIMEFILE;
2652 Event::loop; 3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
2653} 3770}
2654 3771
2655############################################################################# 3772#############################################################################
2656# initialisation and cleanup 3773# initialisation and cleanup
2657 3774
2658# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
2659BEGIN { 3776BEGIN {
3777 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
2668 },
2669 ); 3781 };
2670 } 3782 }
2671} 3783}
2672 3784
2673sub write_runtime { 3785sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
2675 3787
2676 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
2678 3790
2679 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3792
2681 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
2682 3794
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2684 or return; 3796 or return;
2685 3797
2686 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
2698 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
2699 3811
2700 close $fh 3812 close $fh
2701 or return; 3813 or return;
2702 3814
2703 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3816 and return;
2705 3817
2706 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2707 3819
2708 1 3820 1
3821}
3822
3823our $uuid_lock;
3824our $uuid_skip;
3825
3826sub write_uuid_sync($) {
3827 $uuid_skip ||= $_[0];
3828
3829 return if $uuid_lock;
3830 local $uuid_lock = 1;
3831
3832 my $uuid = "$LOCALDIR/uuid";
3833
3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3835 or return;
3836
3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3845 $uuid_skip = 0;
3846
3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3848 and return;
3849
3850 # always fsync - this file is important
3851 aio_fsync $fh
3852 and return;
3853
3854 close $fh
3855 or return;
3856
3857 aio_rename "$uuid~", $uuid
3858 and return;
3859
3860 trace "uuid file written ($value).\n";
3861
3862 1
3863
3864}
3865
3866sub write_uuid($$) {
3867 my ($skip, $sync) = @_;
3868
3869 $sync ? write_uuid_sync $skip
3870 : async { write_uuid_sync $skip };
2709} 3871}
2710 3872
2711sub emergency_save() { 3873sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
2713 3875
2714 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
2715 3882
2716 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
2717 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
2718 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
2719 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
2721 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3892 $pl->valid or next;
3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3894 $pl->save;
2725 } 3895 }
2726 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
2727 3897
2728 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
2729 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
2730 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
2731 $map->valid or next; 3903 $map->valid or next;
2732 $map->save; 3904 $map->save;
2733 } 3905 }
2734 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
2735 3907
2736 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
2738 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3913
3914 info "emergency_perl_save: begin write uuid\n";
3915 write_uuid_sync 1;
3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
2739 }; 3936 };
2740 3937
2741 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
2742} 3939}
2743 3940
2744sub post_cleanup { 3941sub post_cleanup {
2745 my ($make_core) = @_; 3942 my ($make_core) = @_;
2746 3943
3944 IO::AIO::flush;
3945
2747 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
2748 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
2749} 3976}
2750 3977
2751sub do_reload_perl() { 3978sub do_reload_perl() {
2752 # can/must only be called in main 3979 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
2754 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
2755 return; 3982 return;
2756 } 3983 }
2757 3984
2758 warn "reloading..."; 3985 return if $RELOAD++;
2759 3986
2760 warn "entering sync_job"; 3987 my $t1 = AE::time;
2761 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
2762 cf::sync_job { 3995 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark
2764 cf::emergency_save; 3996 #cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark
2766 3997
2767 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV;
2769
2770 # if anything goes wrong in here, we should simply crash as we already saved
2771
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs;
2783 warn "iterate...";
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = (); 4000 %EXT_CORO = ();
2791 4001
2792 warn "removing commands"; 4002 trace "perl_reload: removing commands";
2793 %COMMAND = (); 4003 %COMMAND = ();
2794 4004
2795 warn "removing ext commands"; 4005 trace "perl_reload: removing ext/exti commands";
2796 %EXTCMD = (); 4006 %EXTCMD = ();
4007 %EXTICMD = ();
2797 4008
2798 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
2801 4012
2802 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
2803 eval { 4014 eval {
2804 $cb->($pkg); 4015 $cb->($pkg);
2805 1 4016 1
2806 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
2807 } 4022 }
2808 4023
2809 warn "... nuking $pkg";
2810 Symbol::delete_package $pkg;
2811 }
2812
2813 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2814 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 4027
2817 warn "... unloading $k"; 4028 trace "... unloading $k";
2818 delete $INC{$k}; 4029 delete $INC{$k};
2819 4030
2820 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
2822 4033
2823 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
2824 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
2825 } 4039 }
2826 4040
2827 Symbol::delete_package $k;
2828 }
2829
2830 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
2832 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2833 4044
2834 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2837 4048
2838 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
2839 # and global variables created in xs 4050 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
2841 4052
2842 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
2843 4054
2844 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
2845 require cf; 4056 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
2847 4058
2848 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
2849 cf::cfg_load; 4060 cf::reload_config;
2850 4061
2851 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
2852 cf::load_extensions; 4063 cf::load_extensions;
2853 4064
4065 if ($REATTACH_ON_RELOAD) {
2854 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
2857 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
2860 4073
2861 warn "leaving sync_job"; 4074 cf::_post_init 1;
2862 4075
4076 trace "perl_reload: leaving sync_job";
4077
2863 1 4078 1
2864 } or do { 4079 } or do {
2865 warn $@; 4080 error $@;
2866 warn "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
2867 exit 1; 4082 };
4083
4084 --$RELOAD;
2868 }; 4085 }
2869 4086
2870 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
2871}; 4089};
2872 4090
2873our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
2874 4092
2875sub reload_perl() { 4093sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
2878 4096
2879 $RELOAD_WATCHER ||= Event->timer ( 4097 $RELOAD_WATCHER ||= cf::async {
2880 reentrant => 0, 4098 Coro::AIO::aio_wait cache_extensions;
2881 after => 0, 4099
2882 data => WF_AUTOCANCEL, 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2883 cb => sub {
2884 do_reload_perl; 4101 do_reload_perl;
2885 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
2886 }, 4103 };
2887 ); 4104 };
2888} 4105}
2889 4106
2890register_command "reload" => sub { 4107register_command "reload" => sub {
2891 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
2892 4109
2893 if ($who->flag (FLAG_WIZ)) { 4110 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 4111 $who->message ("reloading server.");
4112 async {
4113 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 4114 reload_perl;
4115 };
2896 } 4116 }
2897}; 4117};
2898 4118
2899unshift @INC, $LIBDIR; 4119#############################################################################
2900 4120
2901my $bug_warning = 0; 4121my $bug_warning = 0;
2902 4122
2903our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN;
2905
2906sub wait_for_tick { 4123sub wait_for_tick() {
2907 return unless $TICK_WATCHER->is_active; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
2908 return if $Coro::current == $Coro::main;
2909 4125
2910 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
2911 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait;
2913} 4127}
2914 4128
2915sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
2916 return unless $TICK_WATCHER->is_active; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
2917 return if $Coro::current == $Coro::main;
2918 4131
2919 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 4134 $signal->wait;
2922} 4135}
2923 4136
2924 my $min = 1e6;#d# 4137sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 4138 if ($Coro::current != $Coro::main) {
2934 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2935 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
2936 return; 4141 return;
2937 } 4142 }
2938 4143
2939 $NOW = $tick_start = Event::time; 4144 cf::one_tick; # one server iteration
2940 4145
2941 cf::server_tick; # one server iteration 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2942 4147
2943 0 && sync_job {#d# 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 4150 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4151 $Coro::current->{desc} = "runtime saver";
2947 or die; 4152 write_runtime_sync
2948 4153 or error "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 4154 };
4155 }
2965 4156
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 4158 $sig->send;
2982 } 4159 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
2984 $sig->send;
2985 }
2986 4161
2987 $NOW = Event::time; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 4164
2998 _post_tick; 4165 if (0) {
2999 4166 if ($NEXT_TICK) {
3000 4167 my $jitter = $TICK_START - $NEXT_TICK;
4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4169 debug "jitter $JITTER\n";#d#
4170 }
3001 }, 4171 }
3002); 4172}
3003 4173
3004{ 4174{
3005 BDB::max_poll_time $TICK * 0.1; 4175 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 4176
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3015 4178 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 4179 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 4180
3031 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 4188
3034 cf::sync_job { 4189 cf::sync_job {
3035 eval { 4190 eval {
3036 BDB::db_env_open 4191 BDB::db_env_open
3037 $DB_ENV, 4192 $DB_ENV,
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4194 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4195 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 4196 0666;
3042 4197
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4198 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 4199 };
3048 4200
3049 cf::cleanup "db_env_open(db): $@" if $@; 4201 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 4202 };
3051 } 4203 }
4204
4205 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4206 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4207 };
4208 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4209 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4210 };
4211 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4212 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4213 };
3052} 4214}
3053 4215
3054{ 4216{
4217 # configure IO::AIO
4218
3055 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 4221 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 4222}
3068 4223
3069my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3070 4226
3071sub _log_backtrace { 4227sub _log_backtrace {
3072 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3073 4229
3074 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3075 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3076 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3078 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3079 async { 4240 async {
4241 $Coro::current->{desc} = "abt $msg";
4242
3080 my @bt = fork_call { 4243 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4245 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4246 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 4247 or die "addr2line: $!";
3092 } 4255 }
3093 4256
3094 @funcs 4257 @funcs
3095 }; 4258 };
3096 4259
3097 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 4263 --$_log_backtrace;
3100 }; 4264 };
3101 } else { 4265 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3103 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3104 } 4268 }
3105} 4269}
3106 4270
3107# load additional modules 4271# load additional modules
3108use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3109 4274
3110END { cf::emergency_save } 4275END { cf::emergency_save }
3111 4276
31121 42771
3113 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines