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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines