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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines