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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines