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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.585 by root, Tue Oct 30 20:18:00 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines