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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines