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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 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 3.2; 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.50 (); 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 warn "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($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
433 622
434 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
435 624
436 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
437 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
438 628
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
467=cut 657=cut
468 658
469sub sync_job(&) { 659sub sync_job(&) {
470 my ($job) = @_; 660 my ($job) = @_;
471 661
472 if ($Coro::current == $Coro::main) { 662 if (in_main) {
473 my $time = EV::time; 663 my $time = AE::time;
474 664
475 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
477 667
478 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
479 669
480 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
481 671
482 my $busy = 1; 672 my $busy = 1;
483 my @res; 673 my @res;
484 674
485 (async { 675 (async {
486 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 677 @res = eval { $job->() };
488 warn $@ if $@; 678 error $@ if $@;
489 undef $busy; 679 undef $busy;
490 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
491 681
492 while ($busy) { 682 while ($busy) {
493 if (Coro::nready) { 683 if (Coro::nready) {
495 } else { 685 } else {
496 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
497 } 687 }
498 } 688 }
499 689
500 my $time = EV::time - $time; 690 my $time = AE::time - $time;
501 691
502 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
503 693
504 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
505 } else { 695 } else {
527 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
528 718
529 $coro 719 $coro
530} 720}
531 721
532=item fork_call { }, $args 722=item fork_call { }, @args
533 723
534Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 727never block itself or use any form of event handling.
538 728
539=cut 729=cut
540 730
731sub post_fork {
732 reset_signals;
733}
734
541sub fork_call(&@) { 735sub fork_call(&@) {
542 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
543 737
544 # 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,
545 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
547 741
548 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
549 reset_signals; 743 cf::post_fork;
550 &$cb 744 &$cb
551 }, @args; 745 } @args;
552 746
553 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 )
554} 759}
555 760
556=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
557 762
558=cut 763=cut
595within each server. 800within each server.
596 801
597=cut 802=cut
598 803
599sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
600 my ($name) = @_; 808 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
602 810
603 eval { 811 eval {
604 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
614} 822}
615 823
616our $DB; 824our $DB;
617 825
618sub db_init { 826sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
621 };
622} 828}
623 829
624sub db_get($$) { 830sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
626 832
627 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
628 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
629 837
630 $! ? () 838 $! ? ()
631 : $data 839 : $data
632 }
633} 840}
634 841
635sub db_put($$$) { 842sub db_put($$$) {
636 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 872
666 my @data; 873 my @data;
667 my $md5; 874 my $md5;
668 875
669 for (0 .. $#$src) { 876 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 878 }
673 879
674 # if processing is expensive, check 880 # if processing is expensive, check
675 # checksum first 881 # checksum first
676 if (1) { 882 if (1) {
693 899
694 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 901 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
697 903
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 905
700 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
703 909
713 919
714=cut 920=cut
715 921
716sub datalog($@) { 922sub datalog($@) {
717 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 925}
720 926
721=back 927=back
722 928
723=cut 929=cut
724 930
725############################################################################# 931#############################################################################
726 932
727=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
728 934
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
732 938
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
785 991
786Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
788 994
789Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 997
792These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
793 999
794=over 4 1000=over 4
918 1124
919 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1127
922 } elsif (ref $type) { 1128 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
924 1130
925 } else { 1131 } else {
926 shift @arg; 1132 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
928 } 1134 }
929 } 1135 }
930} 1136}
931 1137
932sub _object_attach { 1138sub _object_attach {
942 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
943 } 1149 }
944 1150
945 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
946 } else { 1152 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1154 }
949 1155
950 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
951} 1157}
952 1158
1011 1217
1012 for (@$callbacks) { 1218 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1014 1220
1015 if ($@) { 1221 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1223 override;
1019 } 1224 }
1020 1225
1021 return 1 if $override; 1226 return 1 if $override;
1022 } 1227 }
1085 1290
1086sub reattach { 1291sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1293 my ($obj) = @_;
1089 1294
1295 # no longer needed after getting rid of delete_package?
1090 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
1091 1297
1092 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
1093 1299
1094 @$registry = (); 1300 @$registry = ();
1095 1301
1100 for (@$attach) { 1306 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1103 } 1309 }
1104 } else { 1310 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1312 }
1107 } 1313 }
1108} 1314}
1109 1315
1110cf::attachable->attach ( 1316cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1138 1344
1139 sync_job { 1345 sync_job {
1140 if (length $$rdata) { 1346 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1144 1351
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1353 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1359 aio_close $fh;
1150 1360
1151 if (@$objs) { 1361 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1363 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1370 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1372 }
1160 } else { 1373 } else {
1161 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1162 } 1375 }
1163 1376
1164 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1381 } else {
1166 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1167 } 1383 }
1168 } else { 1384 } else {
1169 aio_unlink $filename; 1385 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1171 } 1387 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1412 $av = $st->{objs};
1197 } 1413 }
1198 1414
1199 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1202 1419
1203 ($data, $av) 1420 ($data, $av)
1204} 1421}
1205 1422
1206=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1263 1480
1264 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1265} 1482}
1266 1483
1484use File::Glob ();
1485
1267cf::player->attach ( 1486cf::player->attach (
1268 on_command => sub { 1487 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1270 1489
1271 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1272 or return; 1491 or return;
1273 1492
1281 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1282 1501
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1503
1285 if (ref $msg) { 1504 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1506
1291 my @reply; 1507 my @reply;
1292 1508
1293 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1296 1512
1297 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1514 if $reply;
1299 1515
1300 } else { 1516 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1518 }
1303 1519
1304 cf::override; 1520 cf::override;
1305 }, 1521 },
1306); 1522);
1307 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
1308sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1309 cf::sync_job { 1553 cf::sync_job {
1310 my %todo; 1554 my %todo;
1311 1555
1312 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1557 next unless -r $path;
1331 1575
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1578
1335 $ext{source} = 1579 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1338 . $source 1582 . $source
1339 . "\n};\n1"; 1583 . "\n};\n1";
1340 1584
1341 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1342 } 1586 }
1343 1587
1588 my $pass = 0;
1344 my %done; 1589 my %done;
1345 while (%todo) { 1590 while (%todo) {
1346 my $progress; 1591 my $progress;
1347 1592
1593 ++$pass;
1594
1595 ext:
1348 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1598 next ext
1351 unless exists $done{$_}; 1599 unless exists $done{$_};
1352 } 1600 }
1353 1601
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1603
1356 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 $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1617
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1619 if exists $v->{meta}{mandatory};
1364 1620
1365 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;
1366 } 1630 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1631 }
1372 1632
1373 skip: 1633 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1643 }
1377 }; 1644 };
1378} 1645}
1379 1646
1380############################################################################# 1647#############################################################################
1381 1648
1382=back 1649=back
1383 1650
1384=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1385 1652
1386Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1387 1654
1388=cut 1655=cut
1389 1656
1390package cf::player; 1657package cf::player;
1391 1658
1434 1701
1435sub exists($) { 1702sub exists($) {
1436 my ($login) = @_; 1703 my ($login) = @_;
1437 1704
1438 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1440} 1707}
1441 1708
1442sub find($) { 1709sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1711 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1723 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1724 or return;
1458 1725
1459 my $pl = cf::player::load_pl $f 1726 my $pl = cf::player::load_pl $f
1460 or return; 1727 or return;
1728
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1729 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1730 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1464 } 1732 }
1465 } 1733 }
1466} 1734}
1467 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
1468sub save($) { 1749sub save($) {
1469 my ($pl) = @_; 1750 my ($pl) = @_;
1470 1751
1471 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1472 1753
1477 1758
1478 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1480 1761
1481 cf::get_slot 0.01; 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];
1482 1766
1483 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1768 cf::cede_to_tick;
1485} 1769}
1486 1770
1518 my ($pl) = @_; 1802 my ($pl) = @_;
1519 1803
1520 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1521 1805
1522 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1523 $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
1524 1808
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1528 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1529 1817
1530 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1570 1858
1571 for my $login (@$dirs) { 1859 for my $login (@$dirs) {
1572 my $path = path $login; 1860 my $path = path $login;
1573 1861
1574 # a .pst is a dead give-away for a valid player 1862 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1863 # if no pst file found, open and chekc for blocked users
1864 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1865 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1866 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1867 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1868 }
1580 1869
1584 1873
1585 \@logins 1874 \@logins
1586} 1875}
1587 1876
1588=item $player->maps 1877=item $player->maps
1878
1879=item cf::player::maps $login
1589 1880
1590Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1591player. May block. 1882player. May block.
1592 1883
1593=cut 1884=cut
1611 } 1902 }
1612 1903
1613 \@paths 1904 \@paths
1614} 1905}
1615 1906
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1908
1618Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1910
1709=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1710 1912
1711Sends an ext reply to the player. 1913Sends an ext reply to the player.
1712 1914
1744 1946
1745=cut 1947=cut
1746 1948
1747sub find_by_path($) { 1949sub find_by_path($) {
1748 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1749 1953
1750 my ($match, $specificity); 1954 my ($match, $specificity);
1751 1955
1752 for my $region (list) { 1956 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 1986sub generate_random_map {
1783 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1784 1988
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1990
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1992}
1802 1993
1803=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1804 1995
1805Register 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
1810 2001
1811sub register { 2002sub register {
1812 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2004 my $pkg = caller;
1814 2005
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2007
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2009}
1820 2010
1821# also paths starting with '/' 2011# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2013
1824sub thawer_merge { 2014sub thawer_merge {
1825 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1826 2016
1827 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1832} 2022}
1833 2023
1834sub normalise { 2024sub normalise {
1835 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1836 2026
1837 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1838 2028
1839 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1840 2030
1841 # map plan: 2031 # map plan:
1842 # 2032 #
1857 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2048 $path = "$base/$path";
1859 } 2049 }
1860 2050
1861 for ($path) { 2051 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1865 } 2054 }
1866 2055
1867 $path 2056 $path
1881 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1882 return $self; 2071 return $self;
1883 } 2072 }
1884 } 2073 }
1885 2074
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2076 ()
1888} 2077}
1889 2078
2079# may re-bless or do other evil things
1890sub init { 2080sub init {
1891 my ($self) = @_; 2081 my ($self) = @_;
1892 2082
1893 $self 2083 $self
1894} 2084}
1925 2115
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1928} 2118}
1929 2119
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 2120sub decay_objects {
1940 my ($self) = @_; 2121 my ($self) = @_;
1941 2122
1942 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1943 2124
1968 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1969 2150
1970 1 2151 1
1971} 2152}
1972 2153
2154# used to laod the header of an original map
1973sub load_header_orig { 2155sub load_header_orig {
1974 my ($self) = @_; 2156 my ($self) = @_;
1975 2157
1976 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1977} 2159}
1978 2160
2161# used to laod the header of an instantiated map
1979sub load_header_temp { 2162sub load_header_temp {
1980 my ($self) = @_; 2163 my ($self) = @_;
1981 2164
1982 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1983} 2166}
1984 2167
2168# called after loading the header from an instantiated map
1985sub prepare_temp { 2169sub prepare_temp {
1986 my ($self) = @_; 2170 my ($self) = @_;
1987 2171
1988 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1990 # safety 2174 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2177}
1994 2178
2179# called after loading the header from an original map
1995sub prepare_orig { 2180sub prepare_orig {
1996 my ($self) = @_; 2181 my ($self) = @_;
1997 2182
1998 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
2023 2208
2024sub find; 2209sub find;
2025sub find { 2210sub find {
2026 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2027 2212
2213 cf::cede_to_tick;
2214
2028 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2029 2216
2030 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2219
2033 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
2038 or return; 2222 or return;
2039 2223
2040 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
2041 2225
2043 or return; 2227 or return;
2044 2228
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
2048 undef $guard1; 2233 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2234 $map->reset;
2051 return find $path; 2235 return find $path;
2052 } 2236 }
2053 2237
2054 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2055 } 2239 }
2056} 2240}
2057 2241
2058sub pre_load { } 2242sub pre_load { }
2059sub post_load { } 2243#sub post_load { } # XS
2060 2244
2061sub load { 2245sub load {
2062 my ($self) = @_; 2246 my ($self) = @_;
2063 2247
2064 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2067 2251
2068 { 2252 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2070 2254
2071 return unless $self->valid; 2255 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2257
2076 $self->alloc; 2258 $self->alloc;
2077 2259
2078 $self->pre_load; 2260 $self->pre_load;
2079 cf::cede_to_tick; 2261 cf::cede_to_tick;
2080 2262
2263 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2265 $f->skip_block;
2083 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2084 or return; 2267 or return;
2085 2268
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
2087 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2088 2271
2089 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2273 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2276 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2096 } 2280 }
2097 } 2281 }
2098 }
2099 2282
2100 $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);
2101 2290
2102 cf::cede_to_tick; 2291 cf::cede_to_tick;
2103 # now do the right thing for maps 2292 # now do the right thing for maps
2104 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2109 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2299 $self->decay_objects;
2111 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2112 $self->update_buttons; 2301 $self->update_buttons;
2113 cf::cede_to_tick; 2302 cf::cede_to_tick;
2114 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2304 }
2118 2305
2119 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2308 }
2124 2309
2125 $self->post_load; 2310 $self->post_load;
2126}
2127 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
2128sub customise_for { 2318sub customise_for {
2129 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2130 2320
2131 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2322 if $self->per_player;
2135# if $self->per_party; 2325# if $self->per_party;
2136 2326
2137 $self 2327 $self
2138} 2328}
2139 2329
2140# find and load all maps in the 3x3 area around a map
2141sub load_neighbours {
2142 my ($map) = @_;
2143
2144 my @neigh; # diagonal neighbours
2145
2146 for (0 .. 3) {
2147 my $neigh = $map->tile_path ($_)
2148 or next;
2149 $neigh = find $neigh, $map
2150 or next;
2151 $neigh->load;
2152
2153 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 }
2157
2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
2160 my $neigh = find $path, $origin
2161 or next;
2162 $neigh->load;
2163 }
2164}
2165
2166sub find_sync { 2330sub find_sync {
2167 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2168 2332
2169 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
2170} 2338}
2171 2339
2172sub do_load_sync { 2340sub do_load_sync {
2173 my ($map) = @_; 2341 my ($map) = @_;
2174 2342
2343 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2177 2346
2178 cf::sync_job { $map->load }; 2347 $map->load;
2179} 2348}
2180 2349
2181our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2183 2352
2184sub find_async { 2353sub find_async {
2185 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2186 2355
2187 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2188 2357
2189 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2191 } 2360 }
2192 2361
2193 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2194 2363
2195 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2210 2379
2211 () 2380 ()
2212} 2381}
2213 2382
2383# common code, used by both ->save and ->swapout
2214sub save { 2384sub _save {
2215 my ($self) = @_; 2385 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2386
2219 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2220 2388
2221 return unless $self->dirty; 2389 return unless $self->dirty;
2222 2390
2242 } else { 2410 } else {
2243 $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);
2244 } 2412 }
2245} 2413}
2246 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2247sub swap_out { 2423sub swap_out {
2248 my ($self) = @_; 2424 my ($self) = @_;
2249 2425
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2255 return if $self->players; 2430 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 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
2257 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2258 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
2259 $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};
2260 2482
2261 $self->deactivate; 2483 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2485 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2486
2309 $self->unlink_save; 2487 $self->unlink_save;
2310 $self->destroy; 2488 $self->destroy;
2311} 2489}
2312 2490
2320 2498
2321 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2322 2500
2323 $self->unlink_save; 2501 $self->unlink_save;
2324 2502
2325 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2508
2387 : normalise $_ 2565 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2567 ]
2390} 2568}
2391 2569
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}
2601
2392=back 2602=back
2393 2603
2394=head3 cf::object 2604=head3 cf::object
2395 2605
2396=cut 2606=cut
2457can 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
2458dialogue with the given NPC character. 2668dialogue with the given NPC character.
2459 2669
2460=cut 2670=cut
2461 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
2462# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2687# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2703
2480 } else { 2704 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2707 }
2484 } 2708 }
2485} 2709}
2486 2710
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2736
2513=item $player_object->enter_link 2737=item $player_object->enter_link
2514 2738
2515Freezes 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}>).
2516 2740
2517The 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.
2518I<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.
2519 2745
2520Will never block. 2746Will never block.
2521 2747
2522=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2523 2749
2543sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2544 my ($self) = @_; 2770 my ($self) = @_;
2545 2771
2546 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2547 2773
2774 ++$self->{_link_recursion};
2775
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2777
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2552 2780
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2782}
2555 2783
2556sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2558 2786
2575 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2577 2805
2578 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2581 2809
2582 $map->load; 2810 $map->load;
2583 $map->load_neighbours;
2584 2811
2585 return unless $self->contr->active; 2812 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2813
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2590} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2591 2821
2822}
2823
2592=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)]])
2593 2825
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be called at the end of this process. 2830be called at the end of this process.
2599 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
2600=cut 2835=cut
2601 2836
2602our $GOTOGEN; 2837our $GOTOGEN;
2603 2838
2604sub cf::object::player::goto { 2839sub cf::object::player::goto {
2605 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 }
2606 2847
2607 # 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
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2850
2610 $self->enter_link; 2851 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2631 } 2872 }
2632 } 2873 }
2633 2874
2634 my $map = eval { 2875 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2877
2637 if ($map) { 2878 if ($map) {
2638 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2881 } else {
2641 $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);
2642 } 2883 }
2643 2884
2644 $map 2885 $map
2652 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2655 } 2896 }
2656 2897
2657 $done->() if $done; 2898 $done->($self) if $done;
2658 })->prio (1); 2899 })->prio (1);
2659} 2900}
2660 2901
2661=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2662 2903
2682} 2923}
2683 2924
2684sub prepare_random_map { 2925sub prepare_random_map {
2685 my ($exit) = @_; 2926 my ($exit) = @_;
2686 2927
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2930 # that depends on the exit object
2692 2931
2693 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2934 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2700 } 2941 }
2701 2942
2702 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2703 2944
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2951 undef $fh;
2711 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2712 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2715 } 2960 }
2716} 2961}
2717 2962
2718sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2720 2965
2721 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2722 2967
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2968 $self->enter_link;
2735 2969
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2970 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2971 $Coro::current->{desc} = "enter_exit";
2742 2972
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2746 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
2747 1; 3009 1
2748 }) { 3010 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2753 3015
2754 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 3017 $self->leave_link;
2756 } 3018 }
2757 })->prio (1); 3019 })->prio (1);
2758} 3020}
2759 3021
2771sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2773 3035
2774 utf8::encode $text; 3036 utf8::encode $text;
2775 $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);
2776} 3063}
2777 3064
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3066
2780Send 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
2784 3071
2785=cut 3072=cut
2786 3073
2787# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2789 "c/identify" => { 3082 "c/identify" => {
2790 id => "infobox", 3083 id => "infobox",
2791 title => "Identify", 3084 title => "Identify",
2792 reply => undef, 3085 reply => undef,
2793 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2795 "c/examine" => { 3088 "c/examine" => {
2796 id => "infobox", 3089 id => "infobox",
2797 title => "Examine", 3090 title => "Examine",
2798 reply => undef, 3091 reply => undef,
2799 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",
2800 }, 3099 },
2801 "c/book" => { 3100 "c/book" => {
2802 id => "infobox", 3101 id => "infobox",
2803 title => "Book", 3102 title => "Book",
2804 reply => undef, 3103 reply => undef,
2820 id => "infobox", 3119 id => "infobox",
2821 title => "Body Parts", 3120 title => "Body Parts",
2822 reply => undef, 3121 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 3160 "c/uptime" => {
2826 id => "infobox", 3161 id => "infobox",
2827 title => "Uptime", 3162 title => "Uptime",
2828 reply => undef, 3163 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3167 id => "infobox",
2833 title => "Map Info", 3168 title => "Map Info",
2834 reply => undef, 3169 reply => undef,
2835 tooltip => "Information related to the maps", 3170 tooltip => "Information related to the maps",
2836 }, 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,
2837); 3186);
2838 3187
2839sub cf::client::send_msg { 3188sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3190
2842 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2843 3193
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3195
2846 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2849 3199
2850 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2854 3202
2855 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3208 }
2862 3209
2863 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2864 } 3211 }
2865 3212
2866 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2867 3214
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3215 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2872 3218
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3222 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3223
2887 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3225}
2901 3226
2902=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2903 3228
2904Sends an ext event to the client. 3229Sends an ext event to the client.
2907 3232
2908sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2910 3235
2911 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3241 }
2917} 3242}
2918 3243
2919=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2920 3245
2923=cut 3248=cut
2924 3249
2925sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2927 3252
2928 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3256}
2936 3257
2937=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2938 3259
2939Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2995 3316
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3318
2998 if (ref $msg) { 3319 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3321
3004 my @reply; 3322 my @reply;
3005 3323
3006 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3009 3327
3010 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3329 if $reply;
3012 3330
3013 } else { 3331 } else {
3014 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";
3015 } 3333 }
3016 3334
3017 cf::override; 3335 cf::override;
3018 }, 3336 },
3019); 3337);
3039 3357
3040 $coro 3358 $coro
3041} 3359}
3042 3360
3043cf::client->attach ( 3361cf::client->attach (
3044 on_destroy => sub { 3362 on_client_destroy => sub {
3045 my ($ns) = @_; 3363 my ($ns) = @_;
3046 3364
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3366 },
3049); 3367);
3065our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3066 3384
3067$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3068 3386
3069$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3072 sort time 3390 sort time
3073)); 3391));
3074 3392
3075# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3078 3396
3079The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3080 3398
3081 cf::object 3399 cf::object
3082 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
3083 insert remove name archname title slaying race decrease_ob_nr 3401 insert remove name archname title slaying race decrease split
3402 value
3084 3403
3085 cf::object::player 3404 cf::object::player
3086 player 3405 player
3087 3406
3088 cf::player 3407 cf::player
3093 3412
3094=cut 3413=cut
3095 3414
3096for ( 3415for (
3097 ["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
3098 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3103) { 3422) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3425 for @funs;
3108} 3426}
3109 3427
3124 3442
3125 my $qcode = $code; 3443 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3128 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3129 local $_; 3450 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3451
3132 my $eval = 3452 my $eval =
3133 "do {\n" 3453 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3456 . $code
3137 . "\n}" 3457 . "\n}"
3138 ; 3458 ;
3139 3459
3460 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3469
3144 if ($@) { 3470 if ($@) {
3145 warn "$@"; 3471 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3148 } 3474 }
3149 3475
3150 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3151} 3477}
3152 3478
3166=cut 3492=cut
3167 3493
3168sub register_script_function { 3494sub register_script_function {
3169 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3170 3496
3171 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3173} 3499}
3174 3500
3175=back 3501=back
3176 3502
3177=cut 3503=cut
3178 3504
3179############################################################################# 3505#############################################################################
3180# 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
3181 3509
3182sub load_facedata($) { 3510sub load_facedata($) {
3183 my ($path) = @_; 3511 my ($path) = @_;
3184 3512
3185 # 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
3186 # for this (global event?) 3514 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3516
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3518
3191 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3192 3520
3193 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3522
3199 $facedata->{version} == 2 3523 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3525
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3529 type => FT_RSRC,
3205 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),
3206 }; 3532 };
3207 cf::cede_to_tick; 3533 cf::cede_to_tick;
3208 3534
3209 { 3535 {
3210 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3211 3537
3212 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3541
3215 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 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#
3219 3548
3220 cf::cede_to_tick; 3549 cf::cede_to_tick;
3221 } 3550 }
3222 3551
3223 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3228 3557
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3561 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3563 }
3235 3564
3236 cf::cede_to_tick; 3565 cf::cede_to_tick;
3237 } 3566 }
3238 } 3567 }
3247 3576
3248 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3249 } 3578 }
3250 3579
3251 { 3580 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3255 3582
3256 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3257 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
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3587
3261 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 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#
3276 } else { 3592 } else {
3277 $RESOURCE{$name} = $info; 3593# $RESOURCE{$name} = $info; # unused
3278 } 3594 }
3279 3595
3280 cf::cede_to_tick; 3596 cf::cede_to_tick;
3281 } 3597 }
3282 } 3598 }
3283 3599
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3601
3286 1 3602 1
3287} 3603}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3604
3309register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3606 my ($ns, $want) = @_;
3311 3607
3312 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3647sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3354} 3650}
3355 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
3356sub reload_resources { 3672sub reload_resources {
3357 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3358 3674
3675 reload_exp_table;
3676 reload_materials;
3359 reload_facedata; 3677 reload_facedata;
3678 reload_sound;
3360 reload_archetypes; 3679 reload_archetypes;
3361 reload_regions; 3680 reload_regions;
3362 reload_treasures; 3681 reload_treasures;
3363 3682
3364 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3365}
3366
3367sub init {
3368 my $guard = freeze_mainloop;
3369
3370 reload_resources;
3371} 3684}
3372 3685
3373sub reload_config { 3686sub reload_config {
3374 open my $fh, "<:utf8", "$CONFDIR/config" 3687 trace "reloading config file...\n";
3375 or return;
3376 3688
3377 local $/; 3689 my $config = load_file "$CONFDIR/config";
3378 *CFG = YAML::Load <$fh>; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3379 3692
3380 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3381 3694
3382 $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};
3383 $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};
3384 3697
3385 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3389 }; 3702 };
3390 warn $@ if $@; 3703 warn $@ if $@;
3391 } 3704 }
3392} 3705}
3393 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
3394sub 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
3395 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3397 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#
3398 (async { 3748 (async {
3399 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3749 $Coro::current->{desc} = "IDLE BUG HANDLER";
3400 EV::loop EV::LOOP_ONESHOT; 3750 EV::loop EV::LOOP_ONESHOT;
3401 })->prio (Coro::PRIO_MAX); 3751 })->prio (Coro::PRIO_MAX);
3402 }; 3752 };
3403 3753
3404 { 3754 evthread_start IO::AIO::poll_fileno;
3405 my $guard = freeze_mainloop; 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;
3406 reload_config; 3766 reload_config;
3407 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
3408 load_extensions; 3777 load_extensions;
3409 3778
3410 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3779 utime time, time, $RUNTIMEFILE;
3411 evthread_start IO::AIO::poll_fileno; 3780
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;
3412 } 3786 };
3413 3787
3414 EV::loop; 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;
3415} 3796}
3416 3797
3417############################################################################# 3798#############################################################################
3418# initialisation and cleanup 3799# initialisation and cleanup
3419 3800
3420# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3421BEGIN { 3802BEGIN {
3422 our %SIGWATCHER = (); 3803 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3426 }; 3807 };
3427 } 3808 }
3428} 3809}
3429 3810
3430sub write_runtime_sync { 3811sub write_runtime_sync {
3431 my $runtime = "$LOCALDIR/runtime"; 3812 my $t0 = AE::time;
3432 3813
3433 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3434 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3435 3816
3436 IO::AIO::aio_utime $runtime, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3437 3818
3438 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3439 3820
3440 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3441 or return; 3822 or return;
3442 3823
3443 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3444 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3445 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3455 aio_utime $fh, undef, undef; 3836 aio_utime $fh, undef, undef;
3456 3837
3457 close $fh 3838 close $fh
3458 or return; 3839 or return;
3459 3840
3460 aio_rename "$runtime~", $runtime 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3461 and return; 3842 and return;
3462 3843
3463 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3464 3845
3465 1 3846 1
3466} 3847}
3467 3848
3468our $uuid_lock; 3849our $uuid_lock;
3477 my $uuid = "$LOCALDIR/uuid"; 3858 my $uuid = "$LOCALDIR/uuid";
3478 3859
3479 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3860 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3480 or return; 3861 or return;
3481 3862
3482 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3483 $uuid_skip = 0; 3871 $uuid_skip = 0;
3484 3872
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3873 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return; 3874 and return;
3487 3875
3493 or return; 3881 or return;
3494 3882
3495 aio_rename "$uuid~", $uuid 3883 aio_rename "$uuid~", $uuid
3496 and return; 3884 and return;
3497 3885
3498 warn "uuid file written ($value).\n"; 3886 trace "uuid file written ($value).\n";
3499 3887
3500 1 3888 1
3501 3889
3502} 3890}
3503 3891
3509} 3897}
3510 3898
3511sub emergency_save() { 3899sub emergency_save() {
3512 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3513 3901
3514 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;
3515 3908
3516 cf::sync_job { 3909 cf::sync_job {
3910 cf::write_runtime_sync; # external watchdog should not bark
3911
3517 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3518 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3519 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3520 warn "begin emergency player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3521 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3522 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3523 $pl->valid or next; 3918 $pl->valid or next;
3524 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3525 $pl->save; 3920 $pl->save;
3526 } 3921 }
3527 warn "end emergency player save\n"; 3922 info "emergency_perl_save: end player save\n";
3528 3923
3529 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";
3530 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3531 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3532 $map->valid or next; 3929 $map->valid or next;
3533 $map->save; 3930 $map->save;
3534 } 3931 }
3535 warn "end emergency map save\n"; 3932 info "emergency_perl_save: end map save\n";
3536 3933
3537 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";
3538 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3539 warn "end emergency database checkpoint\n"; 3938 info "emergency_perl_save: end database checkpoint\n";
3540 3939
3541 warn "begin write uuid\n"; 3940 info "emergency_perl_save: begin write uuid\n";
3542 write_uuid_sync 1; 3941 write_uuid_sync 1;
3543 warn "end write uuid\n"; 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
3544 }; 3962 };
3545 3963
3546 warn "leave emergency perl save\n"; 3964 info "emergency_perl_save: leave\n";
3547} 3965}
3548 3966
3549sub post_cleanup { 3967sub post_cleanup {
3550 my ($make_core) = @_; 3968 my ($make_core) = @_;
3551 3969
3970 IO::AIO::flush;
3971
3552 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3553 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 }
3554} 4002}
3555 4003
3556sub do_reload_perl() { 4004sub do_reload_perl() {
3557 # can/must only be called in main 4005 # can/must only be called in main
3558 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3559 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3560 return; 4008 return;
3561 } 4009 }
3562 4010
3563 warn "reloading..."; 4011 return if $RELOAD++;
3564 4012
3565 warn "entering sync_job"; 4013 my $t1 = AE::time;
3566 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
3567 cf::sync_job { 4021 cf::sync_job {
3568 cf::write_runtime_sync; # external watchdog should not bark
3569 cf::emergency_save; 4022 #cf::emergency_save;
3570 cf::write_runtime_sync; # external watchdog should not bark
3571 4023
3572 warn "syncing database to disk";
3573 BDB::db_env_txn_checkpoint $DB_ENV;
3574
3575 # if anything goes wrong in here, we should simply crash as we already saved
3576
3577 warn "flushing outstanding aio requests";
3578 for (;;) {
3579 BDB::flush;
3580 IO::AIO::flush;
3581 Coro::cede_notself;
3582 last unless IO::AIO::nreqs || BDB::nreqs;
3583 warn "iterate...";
3584 }
3585
3586 ++$RELOAD;
3587
3588 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3589 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3590 %EXT_CORO = (); 4026 %EXT_CORO = ();
3591 4027
3592 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3593 %COMMAND = (); 4029 %COMMAND = ();
3594 4030
3595 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3596 %EXTCMD = (); 4032 %EXTCMD = ();
3597 %EXTICMD = (); 4033 %EXTICMD = ();
3598 4034
3599 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3600 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3601 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3602 4038
3603 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3604 eval { 4040 eval {
3605 $cb->($pkg); 4041 $cb->($pkg);
3606 1 4042 1
3607 } 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;
3608 } 4048 }
3609 4049
3610 warn "... nuking $pkg";
3611 Symbol::delete_package $pkg;
3612 }
3613
3614 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3615 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3616 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3617 4053
3618 warn "... unloading $k"; 4054 trace "... unloading $k";
3619 delete $INC{$k}; 4055 delete $INC{$k};
3620 4056
3621 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3622 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3623 4059
3624 if (my $cb = $k->can ("unload_module")) { 4060 if (my $cb = $k->can ("unload_module")) {
3625 $cb->(); 4061 $cb->();
4062 }
4063
4064 clear_package $k;
3626 } 4065 }
3627 4066
3628 Symbol::delete_package $k;
3629 }
3630
3631 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3632 Symbol::delete_package "safe::$_" 4068 clear_package "safe::$_"
3633 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);
3634 4070
3635 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3636 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3637 delete $INC{"cf/pod.pm"}; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3638 4074
3639 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3640 # and global variables created in xs 4076 # and global variables created in xs
3641 #Symbol::delete_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3642 4078
3643 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3644 4080
3645 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3646 require cf; 4082 require cf;
3647 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4083 cf::_connect_to_perl_1;
3648 4084
3649 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3650 cf::reload_config; 4086 cf::reload_config;
3651 4087
3652 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3653 cf::load_extensions; 4089 cf::load_extensions;
3654 4090
4091 if ($REATTACH_ON_RELOAD) {
3655 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3656 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3657 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3658 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3659 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3660 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
4098 }
3661 4099
3662 warn "leaving sync_job"; 4100 cf::_post_init 1;
3663 4101
4102 trace "perl_reload: leaving sync_job";
4103
3664 1 4104 1
3665 } or do { 4105 } or do {
3666 warn $@; 4106 error $@;
3667 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
4108 };
4109
4110 --$RELOAD;
3668 }; 4111 }
3669 4112
3670 warn "reloaded"; 4113 $t1 = AE::time - $t1;
4114 info "perl_reload: completed in ${t1}s\n";
3671}; 4115};
3672 4116
3673our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3674 4118
3675sub reload_perl() { 4119sub reload_perl() {
3676 # doing reload synchronously and two reloads happen back-to-back, 4120 # doing reload synchronously and two reloads happen back-to-back,
3677 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3678 4122
4123 $RELOAD_WATCHER ||= cf::async {
4124 Coro::AIO::aio_wait cache_extensions;
4125
3679 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3680 do_reload_perl; 4127 do_reload_perl;
3681 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
4129 };
3682 }; 4130 };
3683} 4131}
3684 4132
3685register_command "reload" => sub { 4133register_command "reload" => sub {
3686 my ($who, $arg) = @_; 4134 my ($who, $arg) = @_;
3692 reload_perl; 4140 reload_perl;
3693 }; 4141 };
3694 } 4142 }
3695}; 4143};
3696 4144
3697unshift @INC, $LIBDIR; 4145#############################################################################
3698 4146
3699my $bug_warning = 0; 4147my $bug_warning = 0;
3700 4148
3701our @WAIT_FOR_TICK;
3702our @WAIT_FOR_TICK_BEGIN;
3703
3704sub wait_for_tick { 4149sub wait_for_tick() {
3705 return if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3706 4151
3707 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3708 push @WAIT_FOR_TICK, $signal;
3709 $signal->wait;
3710} 4153}
3711 4154
3712sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3714 4157
3715 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3716 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3717 $signal->wait; 4160 $signal->wait;
3718} 4161}
3722 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"
3723 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3724 return; 4167 return;
3725 } 4168 }
3726 4169
3727 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#
3728 4173
3729 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3730 $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.;
3731 Coro::async_pool { 4176 Coro::async_pool {
3732 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3733 write_runtime_sync 4178 write_runtime_sync
3734 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3735 }; 4180 };
3736 } 4181 }
3737 4182
3738 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3739 $sig->send; 4184 $sig->send;
3740 } 4185 }
3741 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3742 $sig->send;
3743 }
3744 4187
3745 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3746 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3747 4190
3748 if (0) { 4191 if (0) {
3749 if ($NEXT_TICK) { 4192 if ($NEXT_TICK) {
3750 my $jitter = $TICK_START - $NEXT_TICK; 4193 my $jitter = $TICK_START - $NEXT_TICK;
3751 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4194 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3752 warn "jitter $JITTER\n";#d# 4195 debug "jitter $JITTER\n";#d#
3753 } 4196 }
3754 } 4197 }
3755} 4198}
3756 4199
3757{ 4200{
3758 # configure BDB 4201 # configure BDB
3759 4202
3760 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3761 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3762 $Coro::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3763 4206
3764 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3765 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3766 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3767 | 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;
3768 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4212 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3769 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4213 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3770 4214
3771 cf::sync_job { 4215 cf::sync_job {
3772 eval { 4216 eval {
3798{ 4242{
3799 # configure IO::AIO 4243 # configure IO::AIO
3800 4244
3801 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3802 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
3803 $Coro::AIO::WATCHER->priority (1); 4247 undef $AnyEvent::AIO::WATCHER;
3804} 4248}
3805 4249
3806my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
3807 4252
3808sub _log_backtrace { 4253sub _log_backtrace {
3809 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
3810 4255
3811 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
3812 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3813 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
3814 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
3815 ++$_log_backtrace; 4264 ++$_log_backtrace;
4265 my $perl_bt = Carp::longmess $msg;
3816 async { 4266 async {
3817 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
3818 4268
3819 my @bt = fork_call { 4269 my @bt = fork_call {
3820 @addr = map { sprintf "%x", $_ } @addr; 4270 @addr = map { sprintf "%x", $_ } @addr;
3831 } 4281 }
3832 4282
3833 @funcs 4283 @funcs
3834 }; 4284 };
3835 4285
3836 LOG llevInfo, "[ABT] $msg\n"; 4286 LOG llevInfo, "[ABT] $perl_bt\n";
4287 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3837 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
3838 --$_log_backtrace; 4289 --$_log_backtrace;
3839 }; 4290 };
3840 } else { 4291 } else {
3841 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
3842 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3843 } 4294 }
3844} 4295}
3845 4296
3846# load additional modules 4297# load additional modules
3847use cf::pod; 4298require "cf/$_.pm" for @EXTRA_MODULES;
4299cf::_connect_to_perl_2;
3848 4300
3849END { cf::emergency_save } 4301END { cf::emergency_save }
3850 4302
38511 43031
3852 4304

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines