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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.579 by root, Wed Jan 4 03:22:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines