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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines