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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines