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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines