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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.585 by root, Tue Oct 30 20:18:00 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines