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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines