ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines