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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines