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.454 by root, Thu Sep 25 12:14:32 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, non-zero while in reload 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
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
132 157
133our @POST_INIT; 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;
134 165
135binmode STDOUT; 166binmode STDOUT;
136binmode STDERR; 167binmode STDERR;
137 168
138# read virtual server time, if available 169# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
143} 174}
144 175
176eval "sub TICK() { $TICK } 1" or die;
177
145mkdir $_ 178mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 180
148our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
149 182
150sub cf::map::normalise; 183sub cf::map::normalise;
151 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
152############################################################################# 189#############################################################################
153 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
154=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
155 203
156=over 4 204=over 4
157 205
158=item $cf::UPTIME 206=item $cf::UPTIME
159 207
160The 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.
161 224
162=item $cf::RUNTIME 225=item $cf::RUNTIME
163 226
164The 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
165every server tick. 228every server tick.
166 229
167=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
168$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
169$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
170 233
171Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
174database environment. 237database environment.
175 238
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 239=item $cf::LOADAVG
185 240
186The 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
187(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
188objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
197from wherever your confdir points to. 252from wherever your confdir points to.
198 253
199=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
200 255
201These 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
202returns 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
203per 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.
204 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
205=item @cf::INVOKE_RESULTS 277=item @cf::INVOKE_RESULTS
206 278
207This array contains the results of the last C<invoke ()> call. When 279This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 281that call.
210 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
211=back 289=back
212 290
213=cut 291=cut
214 292
215BEGIN { 293sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 300 my $msg = join "", @_;
218 301
219 $msg .= "\n" 302 $msg .= "\n"
220 unless $msg =~ /\n$/; 303 unless $msg =~ /\n$/;
221 304
222 $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;
223 306
224 LOG llevError, $msg; 307 LOG llevWarn, $msg;
225 }; 308};
226}
227 309
228$Coro::State::DIEHOOK = sub { 310$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 311 return unless $^S eq 0; # "eq", not "=="
230 312
231 if ($Coro::current == $Coro::main) {#d# 313 error Carp::longmess $_[0];
314
315 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 316 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 317 return;#d#
234 }#d# 318 }#d#
235 319
236 # kill coroutine otherwise 320 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 321 Coro::terminate
239}; 322};
240
241$SIG{__DIE__} = sub { }; #d#?
242 323
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 324@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 325@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 326@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 327@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 341)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 342 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 343}
263 344
264$EV::DIED = sub { 345$EV::DIED = sub {
265 warn "error in event callback: @_"; 346 warn "error in event callback: $@";
266}; 347};
348
349#############################################################################
350
351sub fork_call(&@);
352sub get_slot($;$$);
267 353
268############################################################################# 354#############################################################################
269 355
270=head2 UTILITY FUNCTIONS 356=head2 UTILITY FUNCTIONS
271 357
292 $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;
293 $d 379 $d
294 } || "[unable to dump $_[0]: '$@']"; 380 } || "[unable to dump $_[0]: '$@']";
295} 381}
296 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
297=item $ref = cf::decode_json $json 435=item $ref = cf::decode_json $json
298 436
299Converts a JSON string into the corresponding perl data structure. 437Converts a JSON string into the corresponding perl data structure.
300 438
301=item $json = cf::encode_json $ref 439=item $json = cf::encode_json $ref
307our $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
308 446
309sub encode_json($) { $json_coder->encode ($_[0]) } 447sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 448sub decode_json($) { $json_coder->decode ($_[0]) }
311 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
312=item cf::post_init { BLOCK } 481=item cf::post_init { BLOCK }
313 482
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 483Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 484but I<before> the server starts ticking again.
316 485
317The cdoeblock will have a single boolean argument to indicate whether this 486The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 487is a reload or not.
319 488
320=cut 489=cut
321 490
322sub post_init(&) { 491sub post_init(&) {
323 push @POST_INIT, shift; 492 push @POST_INIT, shift;
324} 493}
325 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
326=item cf::lock_wait $string 512=item cf::lock_wait $string
327 513
328Wait until the given lock is available. See cf::lock_acquire. 514Wait until the given lock is available. See cf::lock_acquire.
329 515
330=item my $lock = cf::lock_acquire $string 516=item my $lock = cf::lock_acquire $string
331 517
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 520for example when the coroutine gets canceled), the lock is automatically
335returned. 521returned.
336 522
337Locks 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
338deadlocked coro. 524deadlocked coro.
344 530
345Return 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.
346 532
347=cut 533=cut
348 534
349our %LOCK; 535our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 536
352sub lock_wait($) { 537sub lock_wait($) {
353 my ($key) = @_; 538 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 539}
367 540
368sub lock_acquire($) { 541sub lock_acquire($) {
369 my ($key) = @_; 542 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 543}
383 544
384sub lock_active($) { 545sub lock_active($) {
385 my ($key) = @_; 546 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 547}
389 548
390sub freeze_mainloop { 549sub freeze_mainloop {
391 tick_inhibit_inc; 550 tick_inhibit_inc;
392 551
393 Coro::guard \&tick_inhibit_dec; 552 &Guard::guard (\&tick_inhibit_dec);
394} 553}
395 554
396=item cf::periodic $interval, $cb 555=item cf::periodic $interval, $cb
397 556
398Like 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
399get spread over timer. 558get spread over time.
400 559
401=cut 560=cut
402 561
403sub periodic($$) { 562sub periodic($$) {
404 my ($interval, $cb) = @_; 563 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 567 EV::periodic $start, $interval, 0, $cb
409} 568}
410 569
411=item cf::get_slot $time[, $priority[, $name]] 570=item cf::get_slot $time[, $priority[, $name]]
412 571
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 572Allocate $time seconds of blocking CPU time at priority C<$priority>
414This 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
415of 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.
416 579
417The 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
418used for statistical purposes and should identify the same time-class. 581used for statistical purposes and should identify the same time-class.
419 582
420Useful for short background jobs. 583Useful for short background jobs.
421 584
422=cut 585=cut
423 586
424our @SLOT_QUEUE; 587our @SLOT_QUEUE;
425our $SLOT_QUEUE; 588our $SLOT_QUEUE;
589our $SLOT_DECAY = 0.9;
426 590
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 591$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 592$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 593 $Coro::current->desc ("timeslot manager");
430 594
431 my $signal = new Coro::Signal; 595 my $signal = new Coro::Signal;
596 my $busy;
432 597
433 while () { 598 while () {
434 next_job: 599 next_job:
600
435 my $avail = cf::till_tick; 601 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 602
437 for (0 .. $#SLOT_QUEUE) { 603 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 604 if ($SLOT_QUEUE[$_][0] <= $avail) {
605 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 606 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 607 $job->[2]->send;
441 Coro::cede; 608 Coro::cede;
442 goto next_job; 609 goto next_job;
443 } 610 } else {
611 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 612 }
445 } 613 }
446 614
447 if (@SLOT_QUEUE) { 615 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 617 $WAIT_FOR_TICK->wait;
450 $signal->wait;
451 } else { 618 } else {
619 $busy = 0;
452 Coro::schedule; 620 Coro::schedule;
453 } 621 }
454 } 622 }
455}; 623};
456 624
457sub get_slot($;$$) { 625sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 626 return if tick_inhibit || $Coro::current == $Coro::main;
459 627
460 my ($time, $pri, $name) = @_; 628 my ($time, $pri, $name) = @_;
461 629
462 $time = $TICK * .6 if $time > $TICK * .6; 630 $time = clamp $time, 0.01, $TICK * .6;
631
463 my $sig = new Coro::Signal; 632 my $sig = new Coro::Signal;
464 633
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 634 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 635 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 636 $SLOT_QUEUE->ready;
493=cut 662=cut
494 663
495sub sync_job(&) { 664sub sync_job(&) {
496 my ($job) = @_; 665 my ($job) = @_;
497 666
498 if ($Coro::current == $Coro::main) { 667 if (in_main) {
499 my $time = EV::time; 668 my $time = AE::time;
500 669
501 # this is the main coro, too bad, we have to block 670 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 671 # till the operation succeeds, freezing the server :/
503 672
504 LOG llevError, Carp::longmess "sync job";#d# 673 #LOG llevError, Carp::longmess "sync job";#d#
505 674
506 my $freeze_guard = freeze_mainloop; 675 my $freeze_guard = freeze_mainloop;
507 676
508 my $busy = 1; 677 my $busy = 1;
509 my @res; 678 my @res;
510 679
511 (async { 680 (async {
512 $Coro::current->desc ("sync job coro"); 681 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 682 @res = eval { $job->() };
514 warn $@ if $@; 683 error $@ if $@;
515 undef $busy; 684 undef $busy;
516 })->prio (Coro::PRIO_MAX); 685 })->prio (Coro::PRIO_MAX);
517 686
518 while ($busy) { 687 while ($busy) {
519 if (Coro::nready) { 688 if (Coro::nready) {
521 } else { 690 } else {
522 EV::loop EV::LOOP_ONESHOT; 691 EV::loop EV::LOOP_ONESHOT;
523 } 692 }
524 } 693 }
525 694
526 my $time = EV::time - $time; 695 my $time = AE::time - $time;
527 696
528 $TICK_START += $time; # do not account sync jobs to server load 697 $TICK_START += $time; # do not account sync jobs to server load
529 698
530 wantarray ? @res : $res[0] 699 wantarray ? @res : $res[0]
531 } else { 700 } else {
553 $EXT_CORO{$coro+0} = $coro; 722 $EXT_CORO{$coro+0} = $coro;
554 723
555 $coro 724 $coro
556} 725}
557 726
558=item fork_call { }, $args 727=item fork_call { }, @args
559 728
560Executes the given code block with the given arguments in a seperate 729Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 730process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 731Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 732never block itself or use any form of event handling.
564 733
565=cut 734=cut
566 735
736sub post_fork {
737 reset_signals;
738}
739
567sub fork_call(&@) { 740sub fork_call(&@) {
568 my ($cb, @args) = @_; 741 my ($cb, @args) = @_;
569 742
570 # 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,
571 # otherwise perl prematurely frees the stuff :/ 744 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 745 # TODO: investigate and fix (likely this will be rather laborious)
573 746
574 my @res = Coro::Util::fork_eval { 747 my @res = Coro::Util::fork_eval {
575 reset_signals; 748 cf::post_fork;
576 &$cb 749 &$cb
577 }, @args; 750 } @args;
578 751
579 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 )
580} 764}
581 765
582=item $coin = coin_from_name $name 766=item $coin = coin_from_name $name
583 767
584=cut 768=cut
621within each server. 805within each server.
622 806
623=cut 807=cut
624 808
625sub db_table($) { 809sub db_table($) {
810 cf::error "db_get called from main context"
811 if $Coro::current == $Coro::main;
812
626 my ($name) = @_; 813 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 814 my $db = BDB::db_create $DB_ENV;
628 815
629 eval { 816 eval {
630 $db->set_flags (BDB::CHKSUM); 817 $db->set_flags (BDB::CHKSUM);
640} 827}
641 828
642our $DB; 829our $DB;
643 830
644sub db_init { 831sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 832 $DB ||= db_table "db";
647 };
648} 833}
649 834
650sub db_get($$) { 835sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 836 my $key = "$_[0]/$_[1]";
652 837
653 cf::sync_job { 838 cf::error "db_get called from main context"
839 if $Coro::current == $Coro::main;
840
654 BDB::db_get $DB, undef, $key, my $data; 841 BDB::db_get $DB, undef, $key, my $data;
655 842
656 $! ? () 843 $! ? ()
657 : $data 844 : $data
658 }
659} 845}
660 846
661sub db_put($$$) { 847sub db_put($$$) {
662 BDB::dbreq_pri 4; 848 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 849 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 877
692 my @data; 878 my @data;
693 my $md5; 879 my $md5;
694 880
695 for (0 .. $#$src) { 881 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 882 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 883 }
699 884
700 # if processing is expensive, check 885 # if processing is expensive, check
701 # checksum first 886 # checksum first
702 if (1) { 887 if (1) {
715 900
716 return db_get cache => "$id/data"; 901 return db_get cache => "$id/data";
717 } 902 }
718 } 903 }
719 904
720 my $t1 = Time::HiRes::time; 905 my $t1 = EV::time;
721 my $data = $process->(\@data); 906 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 907 my $t2 = EV::time;
723 908
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 909 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 910
726 db_put cache => "$id/data", $data; 911 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 912 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 913 db_put cache => "$id/meta", $meta;
729 914
739 924
740=cut 925=cut
741 926
742sub datalog($@) { 927sub datalog($@) {
743 my ($type, %kv) = @_; 928 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 929 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 930}
746 931
747=back 932=back
748 933
749=cut 934=cut
944 1129
945 } elsif (exists $cb_id{$type}) { 1130 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1131 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1132
948 } elsif (ref $type) { 1133 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1134 error "attaching objects not supported, ignoring.\n";
950 1135
951 } else { 1136 } else {
952 shift @arg; 1137 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1138 error "attach argument '$type' not supported, ignoring.\n";
954 } 1139 }
955 } 1140 }
956} 1141}
957 1142
958sub _object_attach { 1143sub _object_attach {
968 _attach $registry, $klass, @attach; 1153 _attach $registry, $klass, @attach;
969 } 1154 }
970 1155
971 $obj->{$name} = \%arg; 1156 $obj->{$name} = \%arg;
972 } else { 1157 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1158 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1159 }
975 1160
976 $obj->{_attachment}{$name} = undef; 1161 $obj->{_attachment}{$name} = undef;
977} 1162}
978 1163
1037 1222
1038 for (@$callbacks) { 1223 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1224 eval { &{$_->[1]} };
1040 1225
1041 if ($@) { 1226 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1227 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1228 override;
1045 } 1229 }
1046 1230
1047 return 1 if $override; 1231 return 1 if $override;
1048 } 1232 }
1127 for (@$attach) { 1311 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1312 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1313 _attach $registry, $klass, @attach;
1130 } 1314 }
1131 } else { 1315 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1316 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1317 }
1134 } 1318 }
1135} 1319}
1136 1320
1137cf::attachable->attach ( 1321cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1348 my ($filename, $rdata, $objs) = @_;
1165 1349
1166 sync_job { 1350 sync_job {
1167 if (length $$rdata) { 1351 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1352 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1353 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1354 $decname, length $$rdata, scalar @$objs
1355 if $VERBOSE_IO;
1171 1356
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1357 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1358 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1359 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1364 aio_close $fh;
1177 1365
1178 if (@$objs) { 1366 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1368 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1369 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1370 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1375 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1376 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1377 }
1187 } else { 1378 } else {
1188 aio_unlink "$filename.pst"; 1379 aio_unlink "$filename.pst";
1189 } 1380 }
1190 1381
1191 aio_rename "$filename~", $filename; 1382 aio_rename "$filename~", $filename;
1383
1384 $filename =~ s%/[^/]+$%%;
1385 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1386 } else {
1193 warn "FATAL: $filename~: $!\n"; 1387 error "unable to save objects: $filename~: $!\n";
1194 } 1388 }
1195 } else { 1389 } else {
1196 aio_unlink $filename; 1390 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1198 } 1392 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1416 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1417 $av = $st->{objs};
1224 } 1418 }
1225 1419
1226 utf8::decode (my $decname = $filename); 1420 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1421 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1422 $decname, length $data, scalar @{$av || []}
1423 if $VERBOSE_IO;
1229 1424
1230 ($data, $av) 1425 ($data, $av)
1231} 1426}
1232 1427
1233=head2 COMMAND CALLBACKS 1428=head2 COMMAND CALLBACKS
1237=cut 1432=cut
1238 1433
1239############################################################################# 1434#############################################################################
1240# command handling &c 1435# command handling &c
1241 1436
1242=item cf::register_command $name => \&callback($ob,$args); 1437=item cf::register_command $name => \&callback($ob,$args)
1243 1438
1244Register a callback for execution when the client sends the user command 1439Register a callback for execution when the client sends the user command
1245$name. 1440$name.
1246 1441
1247=cut 1442=cut
1253 #warn "registering command '$name/$time' to '$caller'"; 1448 #warn "registering command '$name/$time' to '$caller'";
1254 1449
1255 push @{ $COMMAND{$name} }, [$caller, $cb]; 1450 push @{ $COMMAND{$name} }, [$caller, $cb];
1256} 1451}
1257 1452
1258=item cf::register_extcmd $name => \&callback($pl,$packet); 1453=item cf::register_extcmd $name => \&callback($pl,@args)
1259 1454
1260Register a callback for execution when the client sends an (synchronous) 1455Register a callback for execution when the client sends an (synchronous)
1261extcmd packet. Ext commands will be processed in the order they are 1456extcmd packet. Ext commands will be processed in the order they are
1262received by the server, like other user commands. The first argument is 1457received by the server, like other user commands. The first argument is
1263the 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
1264has logged in successfully. 1459has logged in successfully.
1265 1460
1266If the callback returns something, it is sent back as if reply was being 1461The values will be sent back to the client.
1267called.
1268 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
1269=item cf::register_exticmd $name => \&callback($ns,$packet); 1468=item cf::register_exticmd $name => \&callback($ns,@args)
1270 1469
1271Register a callback for execution when the client sends an (asynchronous) 1470Register a callback for execution when the client sends an (asynchronous)
1272exticmd 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
1273are 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
1274is a client socket. Exti commands can be received anytime, even before 1473is a client socket. Exti commands can be received anytime, even before
1275log-in. 1474log-in.
1276 1475
1277If the callback returns something, it is sent back as if reply was being 1476The values will be sent back to the client.
1278called.
1279 1477
1280=cut 1478=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1281 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
1282sub register_extcmd { 1485sub register_extcmd($$) {
1283 my ($name, $cb) = @_; 1486 my ($name, $cb) = @_;
1284 1487
1285 $EXTCMD{$name} = $cb; 1488 $EXTCMD{$name} = $cb;
1286} 1489}
1287 1490
1288sub register_exticmd { 1491sub register_async_extcmd($$) {
1289 my ($name, $cb) = @_; 1492 my ($name, $cb) = @_;
1290 1493
1494 $EXTACMD{$name} = $cb;
1495}
1496
1497sub register_exticmd($$) {
1498 my ($name, $cb) = @_;
1499
1291 $EXTICMD{$name} = $cb; 1500 $EXTICMD{$name} = $cb;
1292} 1501}
1293 1502
1503sub register_async_exticmd($$) {
1504 my ($name, $cb) = @_;
1505
1506 $EXTIACMD{$name} = $cb;
1507}
1508
1509use File::Glob ();
1510
1294cf::player->attach ( 1511cf::player->attach (
1295 on_command => sub { 1512 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1513 my ($pl, $name, $params) = @_;
1297 1514
1298 my $cb = $COMMAND{$name} 1515 my $cb = $COMMAND{$name}
1299 or return; 1516 or return;
1300 1517
1308 my ($pl, $buf) = @_; 1525 my ($pl, $buf) = @_;
1309 1526
1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1527 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1311 1528
1312 if (ref $msg) { 1529 if (ref $msg) {
1313 my ($type, $reply, @payload) = 1530 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317 1531
1318 my @reply;
1319
1320 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}) {
1321 @reply = $cb->($pl, @payload); 1545 @reply = $cb->($pl, @payload);
1546 }
1547
1548 $pl->ext_msg ("reply-$reply", @reply)
1549 if $reply;
1322 } 1550 }
1323 1551
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1327 } else { 1552 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1553 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1554 }
1330 1555
1331 cf::override; 1556 cf::override;
1332 }, 1557 },
1333); 1558);
1334 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
1335sub load_extensions { 1584sub load_extensions {
1585 info "loading extensions...";
1586
1587 %EXT_CFG = ();
1588
1336 cf::sync_job { 1589 cf::sync_job {
1337 my %todo; 1590 my %todo;
1338 1591
1339 for my $path (<$LIBDIR/*.ext>) { 1592 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1593 next unless -r $path;
1358 1611
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1612 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1613 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1614
1362 $ext{source} = 1615 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1616 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1617 . "#line 1 \"$path\"\n{\n"
1365 . $source 1618 . $source
1366 . "\n};\n1"; 1619 . "\n};\n1";
1367 1620
1368 $todo{$base} = \%ext; 1621 $todo{$base} = \%ext;
1369 } 1622 }
1370 1623
1624 my $pass = 0;
1371 my %done; 1625 my %done;
1372 while (%todo) { 1626 while (%todo) {
1373 my $progress; 1627 my $progress;
1374 1628
1629 ++$pass;
1630
1631 ext:
1375 while (my ($k, $v) = each %todo) { 1632 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1633 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1634 next ext
1378 unless exists $done{$_}; 1635 unless exists $done{$_};
1379 } 1636 }
1380 1637
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1638 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1639
1383 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 $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1652 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1653
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1654 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1655 if exists $v->{meta}{mandatory};
1391 1656
1392 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;
1393 } 1666 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1667 }
1399 1668
1400 skip: 1669 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1670 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1679 }
1404 }; 1680 };
1405} 1681}
1406 1682
1407############################################################################# 1683#############################################################################
1491 $cf::PLAYER{$login} = $pl 1767 $cf::PLAYER{$login} = $pl
1492 } 1768 }
1493 } 1769 }
1494} 1770}
1495 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
1496sub save($) { 1785sub save($) {
1497 my ($pl) = @_; 1786 my ($pl) = @_;
1498 1787
1499 return if $pl->{deny_save}; 1788 return if $pl->{deny_save};
1500 1789
1505 1794
1506 aio_mkdir playerdir $pl, 0770; 1795 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1796 $pl->{last_save} = $cf::RUNTIME;
1508 1797
1509 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];
1510 1802
1511 $pl->save_pl ($path); 1803 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1804 cf::cede_to_tick;
1513} 1805}
1514 1806
1548 my $name = $pl->ob->name; 1840 my $name = $pl->ob->name;
1549 1841
1550 $pl->{deny_save} = 1; 1842 $pl->{deny_save} = 1;
1551 $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
1552 1844
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1845 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1846 $pl->deactivate;
1847
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1849 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1850 ext::highscore::check ($pl->ob);
1851
1558 $pl->ns->destroy if $pl->ns; 1852 $pl->ns->destroy if $pl->ns;
1559 1853
1560 my $path = playerdir $pl; 1854 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1855 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1856 aio_rename $path, $temp;
1616 \@logins 1910 \@logins
1617} 1911}
1618 1912
1619=item $player->maps 1913=item $player->maps
1620 1914
1915=item cf::player::maps $login
1916
1621Returns an arrayref of map paths that are private for this 1917Returns an arrayref of map paths that are private for this
1622player. May block. 1918player. May block.
1623 1919
1624=cut 1920=cut
1625 1921
1646 1942
1647=item $protocol_xml = $player->expand_cfpod ($cfpod) 1943=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648 1944
1649Expand deliantra pod fragments into protocol xml. 1945Expand deliantra pod fragments into protocol xml.
1650 1946
1651=item $player->ext_reply ($msgid, @msg)
1652
1653Sends an ext reply to the player.
1654
1655=cut
1656
1657sub ext_reply($$@) {
1658 my ($self, $id, @msg) = @_;
1659
1660 $self->ns->ext_reply ($id, @msg)
1661}
1662
1663=item $player->ext_msg ($type, @msg) 1947=item $player->ext_msg ($type, @msg)
1664 1948
1665Sends an ext event to the client. 1949Sends an ext event to the client.
1666 1950
1667=cut 1951=cut
1686 1970
1687=cut 1971=cut
1688 1972
1689sub find_by_path($) { 1973sub find_by_path($) {
1690 my ($path) = @_; 1974 my ($path) = @_;
1975
1976 $path =~ s/^~[^\/]*//; # skip ~login
1691 1977
1692 my ($match, $specificity); 1978 my ($match, $specificity);
1693 1979
1694 for my $region (list) { 1980 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1981 if ($region->{match} && $path =~ $region->{match}) {
1724sub generate_random_map { 2010sub generate_random_map {
1725 my ($self, $rmp) = @_; 2011 my ($self, $rmp) = @_;
1726 2012
1727 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
1728 2014
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 2015 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 2016}
1744 2017
1745=item cf::map->register ($regex, $prio) 2018=item cf::map->register ($regex, $prio)
1746 2019
1747Register 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
1752 2025
1753sub register { 2026sub register {
1754 my (undef, $regex, $prio) = @_; 2027 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 2028 my $pkg = caller;
1756 2029
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 2030 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 2031
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2032 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 2033}
1762 2034
1763# also paths starting with '/' 2035# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2036$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 2037
1766sub thawer_merge { 2038sub thawer_merge {
1767 my ($self, $merge) = @_; 2039 my ($self, $merge) = @_;
1768 2040
1769 # we have to keep some variables in memory intact 2041 # we have to keep some variables in memory intact
1774} 2046}
1775 2047
1776sub normalise { 2048sub normalise {
1777 my ($path, $base) = @_; 2049 my ($path, $base) = @_;
1778 2050
1779 $path = "$path"; # make sure its a string 2051 $path = "$path"; # make sure it's a string
1780 2052
1781 $path =~ s/\.map$//; 2053 $path =~ s/\.map$//;
1782 2054
1783 # map plan: 2055 # map plan:
1784 # 2056 #
1799 $base =~ s{[^/]+/?$}{}; 2071 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 2072 $path = "$base/$path";
1801 } 2073 }
1802 2074
1803 for ($path) { 2075 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 2076 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 2077 redo if s{/[^/]+/\.\./}{/};
1807 } 2078 }
1808 2079
1809 $path 2080 $path
1823 $self->init; # pass $1 etc. 2094 $self->init; # pass $1 etc.
1824 return $self; 2095 return $self;
1825 } 2096 }
1826 } 2097 }
1827 2098
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2099 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2100 ()
1830} 2101}
1831 2102
2103# may re-bless or do other evil things
1832sub init { 2104sub init {
1833 my ($self) = @_; 2105 my ($self) = @_;
1834 2106
1835 $self 2107 $self
1836} 2108}
1867 2139
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2140 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2141 "$UNIQUEDIR/$path"
1870} 2142}
1871 2143
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2144sub decay_objects {
1882 my ($self) = @_; 2145 my ($self) = @_;
1883 2146
1884 return if $self->{deny_reset}; 2147 return if $self->{deny_reset};
1885 2148
1910 $self->{load_path} = $path; 2173 $self->{load_path} = $path;
1911 2174
1912 1 2175 1
1913} 2176}
1914 2177
2178# used to laod the header of an original map
1915sub load_header_orig { 2179sub load_header_orig {
1916 my ($self) = @_; 2180 my ($self) = @_;
1917 2181
1918 $self->load_header_from ($self->load_path) 2182 $self->load_header_from ($self->load_path)
1919} 2183}
1920 2184
2185# used to laod the header of an instantiated map
1921sub load_header_temp { 2186sub load_header_temp {
1922 my ($self) = @_; 2187 my ($self) = @_;
1923 2188
1924 $self->load_header_from ($self->save_path) 2189 $self->load_header_from ($self->save_path)
1925} 2190}
1926 2191
2192# called after loading the header from an instantiated map
1927sub prepare_temp { 2193sub prepare_temp {
1928 my ($self) = @_; 2194 my ($self) = @_;
1929 2195
1930 $self->last_access ((delete $self->{last_access}) 2196 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2197 || $cf::RUNTIME); #d#
1932 # safety 2198 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2199 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2200 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2201}
1936 2202
2203# called after loading the header from an original map
1937sub prepare_orig { 2204sub prepare_orig {
1938 my ($self) = @_; 2205 my ($self) = @_;
1939 2206
1940 $self->{load_original} = 1; 2207 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2208 $self->{instantiate_time} = $cf::RUNTIME;
1965 2232
1966sub find; 2233sub find;
1967sub find { 2234sub find {
1968 my ($path, $origin) = @_; 2235 my ($path, $origin) = @_;
1969 2236
2237 cf::cede_to_tick;
2238
1970 $path = normalise $path, $origin && $origin->path; 2239 $path = normalise $path, $origin;
1971 2240
1972 cf::lock_wait "map_data:$path";#d#remove 2241 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2242 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2243
1975 $cf::MAP{$path} || do { 2244 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2245 my $map = new_from_path cf::map $path
1980 or return; 2246 or return;
1981 2247
1982 $map->{last_save} = $cf::RUNTIME; 2248 $map->{last_save} = $cf::RUNTIME;
1983 2249
1995 2261
1996 $cf::MAP{$path} = $map 2262 $cf::MAP{$path} = $map
1997 } 2263 }
1998} 2264}
1999 2265
2000sub pre_load { } 2266sub pre_load { }
2001sub post_load { } 2267#sub post_load { } # XS
2002 2268
2003sub load { 2269sub load {
2004 my ($self) = @_; 2270 my ($self) = @_;
2005 2271
2006 local $self->{deny_reset} = 1; # loading can take a long time 2272 local $self->{deny_reset} = 1; # loading can take a long time
2009 2275
2010 { 2276 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2277 my $guard = cf::lock_acquire "map_data:$path";
2012 2278
2013 return unless $self->valid; 2279 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2280 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2281
2018 $self->alloc; 2282 $self->alloc;
2019 2283
2020 $self->pre_load; 2284 $self->pre_load;
2021 cf::cede_to_tick; 2285 cf::cede_to_tick;
2022 2286
2287 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2288 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2289 $f->skip_block;
2025 $self->_load_objects ($f) 2290 $self->_load_objects ($f)
2026 or return; 2291 or return;
2027 2292
2028 $self->post_load_original 2293 $self->post_load_original
2029 if delete $self->{load_original}; 2294 if delete $self->{load_original};
2030 2295
2031 if (my $uniq = $self->uniq_path) { 2296 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2297 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2298 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2299 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2300 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2301 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2302 $f->resolve_delayed_derefs;
2303 }
2038 } 2304 }
2039 } 2305 }
2040 }
2041 2306
2042 $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);
2043 2314
2044 cf::cede_to_tick; 2315 cf::cede_to_tick;
2045 # now do the right thing for maps 2316 # now do the right thing for maps
2046 $self->link_multipart_objects; 2317 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2318 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2322 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2323 $self->decay_objects;
2053 $self->fix_auto_apply; 2324 $self->fix_auto_apply;
2054 $self->update_buttons; 2325 $self->update_buttons;
2055 cf::cede_to_tick; 2326 cf::cede_to_tick;
2056 $self->set_darkness_map; 2327 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2328 }
2060 2329
2061 $self->{last_save} = $cf::RUNTIME; 2330 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2331 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2332 }
2066 2333
2067 $self->post_load; 2334 $self->post_load;
2068}
2069 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
2070sub customise_for { 2342sub customise_for {
2071 my ($self, $ob) = @_; 2343 my ($self, $ob) = @_;
2072 2344
2073 return find "~" . $ob->name . "/" . $self->{path} 2345 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2346 if $self->per_player;
2077# if $self->per_party; 2349# if $self->per_party;
2078 2350
2079 $self 2351 $self
2080} 2352}
2081 2353
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2354sub find_sync {
2109 my ($path, $origin) = @_; 2355 my ($path, $origin) = @_;
2110 2356
2111 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
2112} 2362}
2113 2363
2114sub do_load_sync { 2364sub do_load_sync {
2115 my ($map) = @_; 2365 my ($map) = @_;
2116 2366
2367 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2368 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2369 if $Coro::current == $Coro::main;
2119 2370
2120 cf::sync_job { $map->load }; 2371 $map->load;
2121} 2372}
2122 2373
2123our %MAP_PREFETCH; 2374our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2375our $MAP_PREFETCHER = undef;
2125 2376
2126sub find_async { 2377sub find_async {
2127 my ($path, $origin, $load) = @_; 2378 my ($path, $origin, $load) = @_;
2128 2379
2129 $path = normalise $path, $origin && $origin->{path}; 2380 $path = normalise $path, $origin;
2130 2381
2131 if (my $map = $cf::MAP{$path}) { 2382 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2383 return $map if !$load || $map->linkable;
2133 } 2384 }
2134 2385
2135 $MAP_PREFETCH{$path} |= $load; 2386 $MAP_PREFETCH{$path} |= $load;
2136 2387
2137 $MAP_PREFETCHER ||= cf::async { 2388 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2402 $MAP_PREFETCHER->prio (6);
2152 2403
2153 () 2404 ()
2154} 2405}
2155 2406
2407# common code, used by both ->save and ->swapout
2156sub save { 2408sub _save {
2157 my ($self) = @_; 2409 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2410
2161 $self->{last_save} = $cf::RUNTIME; 2411 $self->{last_save} = $cf::RUNTIME;
2162 2412
2163 return unless $self->dirty; 2413 return unless $self->dirty;
2164 2414
2184 } else { 2434 } else {
2185 $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);
2186 } 2436 }
2187} 2437}
2188 2438
2439sub save {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 $self->_save;
2445}
2446
2189sub swap_out { 2447sub swap_out {
2190 my ($self) = @_; 2448 my ($self) = @_;
2191 2449
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2450 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2451
2452 return if !$self->linkable;
2453 return if $self->{deny_save};
2197 return if $self->players; 2454 return if $self->players;
2198 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
2199 return if $self->{deny_save}; 2472 return 1e99 if $self->{deny_reset};
2200 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
2201 $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};
2202 2506
2203 $self->deactivate; 2507 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2508 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2509 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2510
2251 $self->unlink_save; 2511 $self->unlink_save;
2252 $self->destroy; 2512 $self->destroy;
2253} 2513}
2254 2514
2262 2522
2263 delete $cf::MAP{$self->path}; 2523 delete $cf::MAP{$self->path};
2264 2524
2265 $self->unlink_save; 2525 $self->unlink_save;
2266 2526
2267 bless $self, "cf::map"; 2527 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2528 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2529 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2530 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2531 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2532
2329 : normalise $_ 2589 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2590 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2591 ]
2332} 2592}
2333 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
2334=back 2626=back
2335 2627
2336=head3 cf::object 2628=head3 cf::object
2337 2629
2338=cut 2630=cut
2403 2695
2404our $SAY_CHANNEL = { 2696our $SAY_CHANNEL = {
2405 id => "say", 2697 id => "say",
2406 title => "Map", 2698 title => "Map",
2407 reply => "say ", 2699 reply => "say ",
2408 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.",
2409}; 2701};
2410 2702
2411our $CHAT_CHANNEL = { 2703our $CHAT_CHANNEL = {
2412 id => "chat", 2704 id => "chat",
2413 title => "Chat", 2705 title => "Chat",
2470 2762
2471Freezes 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}>).
2472 2764
2473The 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.
2474for 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,
2475though, 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
2476map. 2768map.
2477 2769
2478Will never block. 2770Will never block.
2479 2771
2480=item $player_object->leave_link ($map, $x, $y) 2772=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2793sub cf::object::player::enter_link {
2502 my ($self) = @_; 2794 my ($self) = @_;
2503 2795
2504 $self->deactivate_recursive; 2796 $self->deactivate_recursive;
2505 2797
2798 ++$self->{_link_recursion};
2799
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2800 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2801
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2802 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2803 if $self->map && $self->map->{path} ne "{link}";
2510 2804
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2805 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2806}
2513 2807
2514sub cf::object::player::leave_link { 2808sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2809 my ($self, $map, $x, $y) = @_;
2516 2810
2533 ($x, $y) = (-1, -1) 2827 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2828 unless (defined $x) && (defined $y);
2535 2829
2536 # use -1 or undef as default coordinates, not 0, 0 2830 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2831 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2832 if $x <= 0 && $y <= 0;
2539 2833
2540 $map->load; 2834 $map->load;
2541 $map->load_neighbours;
2542 2835
2543 return unless $self->contr->active; 2836 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2837
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2838 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2839 if ($self->enter_map ($map, $x, $y)) {
2549} 2840 # entering was successful
2841 delete $self->{_link_recursion};
2842 # only activate afterwards, to support waiting in hooks
2843 $self->activate_recursive;
2844 }
2550 2845
2846}
2847
2551=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)]])
2552 2849
2553Moves 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
2554her, loading and preparing them map, calling the provided $check callback 2851her, loading and preparing them map, calling the provided $check callback
2555that 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
2556the 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
2563 2860
2564our $GOTOGEN; 2861our $GOTOGEN;
2565 2862
2566sub cf::object::player::goto { 2863sub cf::object::player::goto {
2567 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 }
2568 2871
2569 # 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
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2873 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2874
2572 $self->enter_link; 2875 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2895 ($path, $x, $y) = (undef, undef, undef);
2593 } 2896 }
2594 } 2897 }
2595 2898
2596 my $map = eval { 2899 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2900 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2901
2599 if ($map) { 2902 if ($map) {
2600 $map = $map->customise_for ($self); 2903 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2904 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2905 } else {
2603 $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);
2604 } 2907 }
2605 2908
2606 $map 2909 $map
2614 if ($gen == $self->{_goto_generation}) { 2917 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2918 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2919 $self->leave_link ($map, $x, $y);
2617 } 2920 }
2618 2921
2619 $done->() if $done; 2922 $done->($self) if $done;
2620 })->prio (1); 2923 })->prio (1);
2621} 2924}
2622 2925
2623=item $player_object->enter_exit ($exit_object) 2926=item $player_object->enter_exit ($exit_object)
2624 2927
2692 $Coro::current->{desc} = "enter_exit"; 2995 $Coro::current->{desc} = "enter_exit";
2693 2996
2694 unless (eval { 2997 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 2998 $self->deactivate_recursive; # just to be sure
2696 2999
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3000 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 3001 my $x = $exit->stats->hp;
2707 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 }
2708 3026
2709 $self->goto ($map, $x, $y); 3027 $self->goto ($map, $x, $y);
2710 3028
2711 # if exit is damned, update players death & WoR home-position 3029 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 3030 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 3035 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "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. "
2719 . "Please report this to the dungeon master!", 3037 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 3038 cf::NDI_UNIQUE | cf::NDI_RED);
2721 3039
2722 warn "ERROR in enter_exit: $@"; 3040 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 3041 $self->leave_link;
2724 } 3042 }
2725 })->prio (1); 3043 })->prio (1);
2726} 3044}
2727 3045
2739sub cf::client::send_drawinfo { 3057sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 3058 my ($self, $text, $flags) = @_;
2741 3059
2742 utf8::encode $text; 3060 utf8::encode $text;
2743 $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);
2744} 3087}
2745 3088
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3089=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3090
2748Send 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
2752 3095
2753=cut 3096=cut
2754 3097
2755# non-persistent channels (usually the info channel) 3098# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3099our %CHANNEL = (
3100 "c/motd" => {
3101 id => "infobox",
3102 title => "MOTD",
3103 reply => undef,
3104 tooltip => "The message of the day",
3105 },
2757 "c/identify" => { 3106 "c/identify" => {
2758 id => "infobox", 3107 id => "infobox",
2759 title => "Identify", 3108 title => "Identify",
2760 reply => undef, 3109 reply => undef,
2761 tooltip => "Items recently identified", 3110 tooltip => "Items recently identified",
2763 "c/examine" => { 3112 "c/examine" => {
2764 id => "infobox", 3113 id => "infobox",
2765 title => "Examine", 3114 title => "Examine",
2766 reply => undef, 3115 reply => undef,
2767 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",
2768 }, 3123 },
2769 "c/book" => { 3124 "c/book" => {
2770 id => "infobox", 3125 id => "infobox",
2771 title => "Book", 3126 title => "Book",
2772 reply => undef, 3127 reply => undef,
2788 id => "infobox", 3143 id => "infobox",
2789 title => "Body Parts", 3144 title => "Body Parts",
2790 reply => undef, 3145 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3146 tooltip => "Shows which body parts you posess and are available",
2792 }, 3147 },
3148 "c/statistics" => {
3149 id => "infobox",
3150 title => "Statistics",
3151 reply => undef,
3152 tooltip => "Shows your primary statistics",
3153 },
2793 "c/skills" => { 3154 "c/skills" => {
2794 id => "infobox", 3155 id => "infobox",
2795 title => "Skills", 3156 title => "Skills",
2796 reply => undef, 3157 reply => undef,
2797 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",
2798 }, 3183 },
2799 "c/uptime" => { 3184 "c/uptime" => {
2800 id => "infobox", 3185 id => "infobox",
2801 title => "Uptime", 3186 title => "Uptime",
2802 reply => undef, 3187 reply => undef,
2812 id => "party", 3197 id => "party",
2813 title => "Party", 3198 title => "Party",
2814 reply => "gsay ", 3199 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3200 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 3210);
2818 3211
2819sub cf::client::send_msg { 3212sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3213 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3214
2826 3219
2827 # check predefined channels, for the benefit of C 3220 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3221 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3222 $channel = $CHANNEL{$channel};
2830 3223
2831 $self->ext_msg (channel_info => $channel) 3224 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3225 $channel = $channel->{id};
2835 3226
2836 } elsif (ref $channel) { 3227 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3228 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3229 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3230 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3231 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3232 }
2843 3233
2844 $channel = $channel->{id}; 3234 $channel = $channel->{id};
2845 } 3235 }
2846 3236
2847 return unless @extra || length $msg; 3237 return unless @extra || length $msg;
2848 3238
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3239 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3240 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3241 if $color & cf::NDI_DEF;
2853 3242
2854 my $pkt = "msg " 3243 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3244 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3245 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3246 );
2858 3247
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3248 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3249}
2896 3250
2897=item $client->ext_msg ($type, @msg) 3251=item $client->ext_msg ($type, @msg)
2898 3252
2899Sends an ext event to the client. 3253Sends an ext event to the client.
2901=cut 3255=cut
2902 3256
2903sub cf::client::ext_msg($$@) { 3257sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3258 my ($self, $type, @msg) = @_;
2905 3259
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3260 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3261}
2931 3262
2932=item $success = $client->query ($flags, "text", \&cb) 3263=item $success = $client->query ($flags, "text", \&cb)
2933 3264
2934Queues a query to the client, calling the given callback with 3265Queues a query to the client, calling the given callback with
2989 my ($ns, $buf) = @_; 3320 my ($ns, $buf) = @_;
2990 3321
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3322 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3323
2993 if (ref $msg) { 3324 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3325 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3326
2999 my @reply;
3000
3001 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}) {
3002 @reply = $cb->($ns, @payload); 3340 @reply = $cb->($ns, @payload);
3341 }
3342
3343 $ns->ext_msg ("reply-$reply", @reply)
3344 if $reply;
3003 } 3345 }
3004
3005 $ns->ext_reply ($reply, @reply)
3006 if $reply;
3007
3008 } else { 3346 } else {
3009 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";
3010 } 3348 }
3011 3349
3012 cf::override; 3350 cf::override;
3013 }, 3351 },
3014); 3352);
3034 3372
3035 $coro 3373 $coro
3036} 3374}
3037 3375
3038cf::client->attach ( 3376cf::client->attach (
3039 on_destroy => sub { 3377 on_client_destroy => sub {
3040 my ($ns) = @_; 3378 my ($ns) = @_;
3041 3379
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3380 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3381 },
3044); 3382);
3060our $safe_hole = new Safe::Hole; 3398our $safe_hole = new Safe::Hole;
3061 3399
3062$SIG{FPE} = 'IGNORE'; 3400$SIG{FPE} = 'IGNORE';
3063 3401
3064$safe->permit_only (Opcode::opset qw( 3402$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3403 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3404 grepstart grepwhile mapstart mapwhile
3067 sort time 3405 sort time
3068)); 3406));
3069 3407
3070# here we export the classes and methods available to script code 3408# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3412The following functions and methods are available within a safe environment:
3075 3413
3076 cf::object 3414 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3416 insert remove name archname title slaying race decrease split
3417 value
3079 3418
3080 cf::object::player 3419 cf::object::player
3081 player 3420 player
3082 3421
3083 cf::player 3422 cf::player
3089=cut 3428=cut
3090 3429
3091for ( 3430for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3432 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3433 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3434 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3435 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3436 ["cf::map" => qw(trigger)],
3098) { 3437) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3438 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3439 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3440 for @funs;
3103} 3441}
3104 3442
3119 3457
3120 my $qcode = $code; 3458 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3459 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3460 $qcode =~ s/\n/\\n/g;
3123 3461
3462 %vars = (_dummy => 0) unless %vars;
3463
3464 my @res;
3124 local $_; 3465 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3466
3127 my $eval = 3467 my $eval =
3128 "do {\n" 3468 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3469 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3470 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3471 . $code
3132 . "\n}" 3472 . "\n}"
3133 ; 3473 ;
3134 3474
3475 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3476 sub_generation_inc;
3477 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3478 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3484
3139 if ($@) { 3485 if ($@) {
3140 warn "$@"; 3486 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3487 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3488 "with arguments " . (join " ", %vars) . "\n";
3143 } 3489 }
3144 3490
3145 wantarray ? @res : $res[0] 3491 wantarray ? @res : $res[0]
3146} 3492}
3147 3493
3161=cut 3507=cut
3162 3508
3163sub register_script_function { 3509sub register_script_function {
3164 my ($fun, $cb) = @_; 3510 my ($fun, $cb) = @_;
3165 3511
3166 no strict 'refs'; 3512 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3513 *$fun = $safe_hole->wrap ($cb);
3168} 3514}
3169 3515
3170=back 3516=back
3171 3517
3172=cut 3518=cut
3173 3519
3174############################################################################# 3520#############################################################################
3175# 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}
3176 3546
3177sub load_facedata($) { 3547sub load_facedata($) {
3178 my ($path) = @_; 3548 my ($path) = @_;
3179 3549
3180 # 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
3181 # for this (global event?) 3551 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3553
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3554 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3555
3186 warn "loading facedata from $path\n"; 3556 trace "loading facedata from $path\n";
3187 3557
3188 my $facedata; 3558 my $facedata = decode_storable load_file $path;
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3559
3194 $facedata->{version} == 2 3560 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3561 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3562
3197 # patch in the exptable
3198 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3201 };
3202 cf::cede_to_tick; 3563 cf::cede_to_tick;
3203 3564
3204 { 3565 {
3205 my $faces = $facedata->{faceinfo}; 3566 my $faces = delete $facedata->{faceinfo};
3206 3567
3207 while (my ($face, $info) = each %$faces) { 3568 for my $face (sort keys %$faces) {
3569 my $info = $faces->{$face};
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3570 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3571
3210 cf::face::set_visibility $idx, $info->{visibility}; 3572 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3573 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3574 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3575 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3576 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3577 $FACEHASH{$info->{hash64}} = $idx;#d#
3578
3215 cf::cede_to_tick; 3579 cf::cede_to_tick;
3216 } 3580 }
3217 3581
3218 while (my ($face, $info) = each %$faces) { 3582 while (my ($face, $info) = each %$faces) {
3219 next unless $info->{smooth}; 3583 next unless $info->{smooth};
3223 3587
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3588 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3589 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3590 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3591 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3592 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3593 }
3230 3594
3231 cf::cede_to_tick; 3595 cf::cede_to_tick;
3232 } 3596 }
3233 } 3597 }
3234 3598
3235 { 3599 {
3236 my $anims = $facedata->{animinfo}; 3600 my $anims = delete $facedata->{animinfo};
3237 3601
3238 while (my ($anim, $info) = each %$anims) { 3602 while (my ($anim, $info) = each %$anims) {
3239 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3603 cf::anim::set $anim, $info->{frames}, $info->{facings};
3240 cf::cede_to_tick; 3604 cf::cede_to_tick;
3241 } 3605 }
3242 3606
3243 cf::anim::invalidate_all; # d'oh 3607 cf::anim::invalidate_all; # d'oh
3244 } 3608 }
3245 3609
3246 { 3610 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3611 my $res = delete $facedata->{resource};
3250 3612
3251 while (my ($name, $info) = each %$res) { 3613 while (my ($name, $info) = each %$res) {
3252 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
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3616 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3617
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 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#
3271 } else { 3622 } else {
3272 $RESOURCE{$name} = $info; 3623# $RESOURCE{$name} = $info; # unused
3273 } 3624 }
3274 3625
3275 cf::cede_to_tick; 3626 cf::cede_to_tick;
3276 } 3627 }
3277 } 3628 }
3278 3629
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3630 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3631
3281 1 3632 1
3282} 3633}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3634
3304register_exticmd fx_want => sub { 3635register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3636 my ($ns, $want) = @_;
3306 3637
3307 while (my ($k, $v) = each %$want) { 3638 while (my ($k, $v) = each %$want) {
3315 my $status = load_resource_file_ $_[0]; 3646 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100; 3647 get_slot 0.1, 100;
3317 cf::arch::commit_load; 3648 cf::arch::commit_load;
3318 3649
3319 $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;
3320} 3664}
3321 3665
3322sub reload_regions { 3666sub reload_regions {
3323 # 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
3324 # for this (global event?) 3668 # for this (global event?)
3339} 3683}
3340 3684
3341sub reload_archetypes { 3685sub reload_archetypes {
3342 load_resource_file "$DATADIR/archetypes" 3686 load_resource_file "$DATADIR/archetypes"
3343 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 );
3344} 3697}
3345 3698
3346sub reload_treasures { 3699sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3700 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3701 or die "unable to load treasurelists\n";
3349} 3702}
3350 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
3351sub reload_resources { 3724sub reload_resources {
3352 warn "reloading resource files...\n"; 3725 trace "reloading resource files...\n";
3353 3726
3727 reload_materials;
3354 reload_facedata; 3728 reload_facedata;
3729 reload_exp_table;
3730 reload_sound;
3355 reload_archetypes; 3731 reload_archetypes;
3356 reload_regions; 3732 reload_regions;
3357 reload_treasures; 3733 reload_treasures;
3358 3734
3359 warn "finished reloading resource files\n"; 3735 trace "finished reloading resource files\n";
3360} 3736}
3361 3737
3362sub reload_config { 3738sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3739 trace "reloading config file...\n";
3364 or return;
3365 3740
3366 local $/; 3741 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3742 utf8::decode $config;
3743 *CFG = decode_yaml $config;
3368 3744
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3745 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3746
3371 $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};
3372 $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};
3373 3749
3374 if (exists $CFG{mlockall}) { 3750 if (exists $CFG{mlockall}) {
3397 3773
3398 seek $fh, 0, 0; 3774 seek $fh, 0, 0;
3399 print $fh $$; 3775 print $fh $$;
3400} 3776}
3401 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
3402sub main { 3787sub main {
3403 cf::init_globals; # initialise logging 3788 cf::init_globals; # initialise logging
3404 3789
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3790 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3791 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3792 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3793 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409 3794
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3795 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3796
3418 # we must not ever block the main coroutine 3797 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3798 $Coro::idle = sub {
3420 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#
3421 (async { 3800 (async {
3422 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3801 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT; 3802 EV::loop EV::LOOP_ONESHOT;
3424 })->prio (Coro::PRIO_MAX); 3803 })->prio (Coro::PRIO_MAX);
3425 }; 3804 };
3426 3805
3427 evthread_start IO::AIO::poll_fileno; 3806 evthread_start IO::AIO::poll_fileno;
3428 3807
3429 cf::sync_job { 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
3430 reload_resources; 3819 reload_resources;
3431 reload_config; 3820 reload_config;
3432 db_init;
3433 3821
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3822 cf::init_uuid;
3437 cf::init_signals; 3823 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3824 cf::init_skills;
3440 3825
3441 cf::init_beforeplay; 3826 cf::init_beforeplay;
3442 3827
3443 atomic; 3828 atomic;
3445 load_extensions; 3830 load_extensions;
3446 3831
3447 utime time, time, $RUNTIMEFILE; 3832 utime time, time, $RUNTIMEFILE;
3448 3833
3449 # no (long-running) fork's whatsoever before this point(!) 3834 # no (long-running) fork's whatsoever before this point(!)
3835 use POSIX ();
3450 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};
3451 3837
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3838 cf::_post_init 0;
3453 }; 3839 };
3454 3840
3455 EV::loop; 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;
3456} 3849}
3457 3850
3458############################################################################# 3851#############################################################################
3459# initialisation and cleanup 3852# initialisation and cleanup
3460 3853
3461# install some emergency cleanup handlers 3854# install some emergency cleanup handlers
3462BEGIN { 3855BEGIN {
3463 our %SIGWATCHER = (); 3856 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3857 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3858 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3859 cf::cleanup "SIG$signal";
3467 }; 3860 };
3468 } 3861 }
3469} 3862}
3470 3863
3471sub write_runtime_sync { 3864sub write_runtime_sync {
3865 my $t0 = AE::time;
3866
3472 # first touch the runtime file to show we are still running: 3867 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3868 # the fsync below can take a very very long time.
3474 3869
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3870 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3871
3477 my $guard = cf::lock_acquire "write_runtime"; 3872 my $guard = cf::lock_acquire "write_runtime";
3478 3873
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3874 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3875 or return;
3481 3876
3482 my $value = $cf::RUNTIME + 90 + 10; 3877 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3878 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3879 # 60 allows for the watchdog to kill the server.
3497 or return; 3892 or return;
3498 3893
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3894 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3895 and return;
3501 3896
3502 warn "runtime file written.\n"; 3897 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3898
3504 1 3899 1
3505} 3900}
3506 3901
3507our $uuid_lock; 3902our $uuid_lock;
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3913 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3914 or return;
3520 3915
3521 my $value = uuid_seq uuid_cur; 3916 my $value = uuid_seq uuid_cur;
3522 3917
3523 if ($value < 1024) { 3918 unless ($value) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n"; 3919 info "cowardly refusing to write zero uuid value!\n";
3525 return; 3920 return;
3526 } 3921 }
3527 3922
3528 my $value = uuid_str $value + $uuid_skip; 3923 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0; 3924 $uuid_skip = 0;
3539 or return; 3934 or return;
3540 3935
3541 aio_rename "$uuid~", $uuid 3936 aio_rename "$uuid~", $uuid
3542 and return; 3937 and return;
3543 3938
3544 warn "uuid file written ($value).\n"; 3939 trace "uuid file written ($value).\n";
3545 3940
3546 1 3941 1
3547 3942
3548} 3943}
3549 3944
3555} 3950}
3556 3951
3557sub emergency_save() { 3952sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3953 my $freeze_guard = cf::freeze_mainloop;
3559 3954
3560 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;
3561 3961
3562 cf::sync_job { 3962 cf::sync_job {
3963 cf::write_runtime_sync; # external watchdog should not bark
3964
3563 # use a peculiar iteration method to avoid tripping on perl 3965 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3966 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3967 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3968 info "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3969 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3970 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3971 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3972 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3973 $pl->save;
3572 } 3974 }
3573 warn "end emergency player save\n"; 3975 info "emergency_perl_save: end player save\n";
3574 3976
3575 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";
3576 for my $path (keys %cf::MAP) { 3980 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3981 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3982 $map->valid or next;
3579 $map->save; 3983 $map->save;
3580 } 3984 }
3581 warn "end emergency map save\n"; 3985 info "emergency_perl_save: end map save\n";
3582 3986
3583 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";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3990 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3991 info "emergency_perl_save: end database checkpoint\n";
3586 3992
3587 warn "begin write uuid\n"; 3993 info "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3994 write_uuid_sync 1;
3589 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
3590 }; 4015 };
3591 4016
3592 warn "leave emergency perl save\n"; 4017 info "emergency_perl_save: leave\n";
3593} 4018}
3594 4019
3595sub post_cleanup { 4020sub post_cleanup {
3596 my ($make_core) = @_; 4021 my ($make_core) = @_;
3597 4022
4023 IO::AIO::flush;
4024
3598 warn Carp::longmess "post_cleanup backtrace" 4025 error Carp::longmess "post_cleanup backtrace"
3599 if $make_core; 4026 if $make_core;
3600 4027
3601 my $fh = pidfile; 4028 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$; 4029 unlink $PIDFILE if <$fh> == $$;
3603} 4030}
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4050 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 4051 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 4052 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4053# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 4054 }
3628 warn "cleared package $pkg\n";#d#
3629} 4055}
3630 4056
3631sub do_reload_perl() { 4057sub do_reload_perl() {
3632 # can/must only be called in main 4058 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 4059 unless (in_main) {
3634 warn "can only reload from main coroutine"; 4060 error "can only reload from main coroutine";
3635 return; 4061 return;
3636 } 4062 }
3637 4063
3638 return if $RELOAD++; 4064 return if $RELOAD++;
3639 4065
4066 my $t1 = AE::time;
4067
3640 while ($RELOAD) { 4068 while ($RELOAD) {
3641 warn "reloading..."; 4069 cf::get_slot 0.1, -1, "reload_perl";
4070 info "perl_reload: reloading...";
3642 4071
3643 warn "entering sync_job"; 4072 trace "perl_reload: entering sync_job";
3644 4073
3645 cf::sync_job { 4074 cf::sync_job {
3646 cf::write_runtime_sync; # external watchdog should not bark
3647 cf::emergency_save; 4075 #cf::emergency_save;
3648 cf::write_runtime_sync; # external watchdog should not bark
3649 4076
3650 warn "syncing database to disk";
3651 BDB::db_env_txn_checkpoint $DB_ENV;
3652
3653 # if anything goes wrong in here, we should simply crash as we already saved
3654
3655 warn "flushing outstanding aio requests";
3656 while (IO::AIO::nreqs || BDB::nreqs) {
3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3658 }
3659
3660 warn "cancelling all extension coros"; 4077 trace "perl_reload: cancelling all extension coros";
3661 $_->cancel for values %EXT_CORO; 4078 $_->cancel for values %EXT_CORO;
3662 %EXT_CORO = (); 4079 %EXT_CORO = ();
3663 4080
3664 warn "removing commands"; 4081 trace "perl_reload: removing commands";
3665 %COMMAND = (); 4082 %COMMAND = ();
3666 4083
3667 warn "removing ext/exti commands"; 4084 trace "perl_reload: removing ext/exti commands";
3668 %EXTCMD = (); 4085 %EXTCMD = ();
3669 %EXTICMD = (); 4086 %EXTICMD = ();
3670 4087
3671 warn "unloading/nuking all extensions"; 4088 trace "perl_reload: unloading/nuking all extensions";
3672 for my $pkg (@EXTS) { 4089 for my $pkg (@EXTS) {
3673 warn "... unloading $pkg"; 4090 trace "... unloading $pkg";
3674 4091
3675 if (my $cb = $pkg->can ("unload")) { 4092 if (my $cb = $pkg->can ("unload")) {
3676 eval { 4093 eval {
3677 $cb->($pkg); 4094 $cb->($pkg);
3678 1 4095 1
3679 } or warn "$pkg unloaded, but with errors: $@"; 4096 } or error "$pkg unloaded, but with errors: $@";
3680 } 4097 }
3681 4098
3682 warn "... clearing $pkg"; 4099 trace "... clearing $pkg";
3683 clear_package $pkg; 4100 clear_package $pkg;
3684 } 4101 }
3685 4102
3686 warn "unloading all perl modules loaded from $LIBDIR"; 4103 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) { 4104 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4105 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689 4106
3690 warn "... unloading $k"; 4107 trace "... unloading $k";
3691 delete $INC{$k}; 4108 delete $INC{$k};
3692 4109
3693 $k =~ s/\.pm$//; 4110 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g; 4111 $k =~ s/\//::/g;
3695 4112
3698 } 4115 }
3699 4116
3700 clear_package $k; 4117 clear_package $k;
3701 } 4118 }
3702 4119
3703 warn "getting rid of safe::, as good as possible"; 4120 trace "perl_reload: getting rid of safe::, as good as possible";
3704 clear_package "safe::$_" 4121 clear_package "safe::$_"
3705 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);
3706 4123
3707 warn "unloading cf.pm \"a bit\""; 4124 trace "perl_reload: unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 4125 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 4126 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 4127
3711 # don't, removes xs symbols, too, 4128 # don't, removes xs symbols, too,
3712 # and global variables created in xs 4129 # and global variables created in xs
3713 #clear_package __PACKAGE__; 4130 #clear_package __PACKAGE__;
3714 4131
3715 warn "unload completed, starting to reload now"; 4132 info "perl_reload: unload completed, starting to reload now";
3716 4133
3717 warn "reloading cf.pm"; 4134 trace "perl_reload: reloading cf.pm";
3718 require cf; 4135 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4136 cf::_connect_to_perl_1;
3720 4137
3721 warn "loading config and database again"; 4138 trace "perl_reload: loading config and database again";
3722 cf::reload_config; 4139 cf::reload_config;
3723 4140
3724 warn "loading extensions"; 4141 trace "perl_reload: loading extensions";
3725 cf::load_extensions; 4142 cf::load_extensions;
3726 4143
4144 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 4145 trace "perl_reload: reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 4146 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 4147 trace "perl_reload: reattaching attachments to maps";
3730 reattach $_ for values %MAP; 4148 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 4149 trace "perl_reload: reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 4150 reattach $_ for values %PLAYER;
4151 }
3733 4152
3734 warn "running post_load"; 4153 cf::_post_init 1;
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736 4154
3737 warn "leaving sync_job"; 4155 trace "perl_reload: leaving sync_job";
3738 4156
3739 1 4157 1
3740 } or do { 4158 } or do {
3741 warn $@; 4159 error $@;
3742 cf::cleanup "error while reloading, exiting."; 4160 cf::cleanup "perl_reload: error, exiting.";
3743 }; 4161 };
3744 4162
3745 warn "reloaded";
3746 --$RELOAD; 4163 --$RELOAD;
3747 } 4164 }
4165
4166 $t1 = AE::time - $t1;
4167 info "perl_reload: completed in ${t1}s\n";
3748}; 4168};
3749 4169
3750our $RELOAD_WATCHER; # used only during reload 4170our $RELOAD_WATCHER; # used only during reload
3751 4171
3752sub reload_perl() { 4172sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 4173 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 4174 # coro crashes during coro_state_free->destroy here.
3755 4175
4176 $RELOAD_WATCHER ||= cf::async {
4177 Coro::AIO::aio_wait cache_extensions;
4178
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4179 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 4180 do_reload_perl;
3758 undef $RELOAD_WATCHER; 4181 undef $RELOAD_WATCHER;
4182 };
3759 }; 4183 };
3760} 4184}
3761 4185
3762register_command "reload" => sub { 4186register_command "reload" => sub {
3763 my ($who, $arg) = @_; 4187 my ($who, $arg) = @_;
3769 reload_perl; 4193 reload_perl;
3770 }; 4194 };
3771 } 4195 }
3772}; 4196};
3773 4197
3774unshift @INC, $LIBDIR; 4198#############################################################################
3775 4199
3776my $bug_warning = 0; 4200my $bug_warning = 0;
3777 4201
3778our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN;
3780
3781sub wait_for_tick { 4202sub wait_for_tick() {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 4203 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3783 4204
3784 my $signal = new Coro::Signal; 4205 $WAIT_FOR_TICK->wait;
3785 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait;
3787} 4206}
3788 4207
3789sub wait_for_tick_begin { 4208sub wait_for_tick_begin() {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 4209 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3791 4210
3792 my $signal = new Coro::Signal; 4211 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 4212 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 4213 $signal->wait;
3795} 4214}
3799 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"
3800 unless ++$bug_warning > 10; 4219 unless ++$bug_warning > 10;
3801 return; 4220 return;
3802 } 4221 }
3803 4222
3804 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#
3805 4226
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4227 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $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.;
3808 Coro::async_pool { 4229 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 4230 $Coro::current->{desc} = "runtime saver";
3810 write_runtime_sync 4231 write_runtime_sync
3811 or warn "ERROR: unable to write runtime file: $!"; 4232 or error "ERROR: unable to write runtime file: $!";
3812 }; 4233 };
3813 } 4234 }
3814 4235
3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3816 $sig->send; 4237 $sig->send;
3817 } 4238 }
3818 while (my $sig = shift @WAIT_FOR_TICK) { 4239 $WAIT_FOR_TICK->broadcast;
3819 $sig->send;
3820 }
3821 4240
3822 $LOAD = ($NOW - $TICK_START) / $TICK; 4241 $LOAD = ($NOW - $TICK_START) / $TICK;
3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4242 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3824 4243
3825 if (0) { 4244 if (0) {
3826 if ($NEXT_TICK) { 4245 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK; 4246 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4247 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d# 4248 debug "jitter $JITTER\n";#d#
3830 } 4249 }
3831 } 4250 }
3832} 4251}
3833 4252
3834{ 4253{
3835 # configure BDB 4254 # configure BDB
4255 info "initialising database";
3836 4256
3837 BDB::min_parallel 8; 4257 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4258 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4259 #$AnyEvent::BDB::WATCHER->priority (1);
3840 4260
3841 unless ($DB_ENV) { 4261 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4262 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4263 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $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;
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4289 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 }; 4290 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4291 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4292 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 }; 4293 };
4294
4295 info "database initialised";
3874} 4296}
3875 4297
3876{ 4298{
3877 # configure IO::AIO 4299 # configure IO::AIO
3878 4300
4301 info "initialising aio";
3879 IO::AIO::min_parallel 8; 4302 IO::AIO::min_parallel 8;
3880 IO::AIO::max_poll_time $TICK * 0.1; 4303 IO::AIO::max_poll_time $TICK * 0.1;
3881 undef $AnyEvent::AIO::WATCHER; 4304 undef $AnyEvent::AIO::WATCHER;
4305 info "aio initialised";
3882} 4306}
3883 4307
3884my $_log_backtrace; 4308our $_log_backtrace;
4309our $_log_backtrace_last;
3885 4310
3886sub _log_backtrace { 4311sub _log_backtrace {
3887 my ($msg, @addr) = @_; 4312 my ($msg, @addr) = @_;
3888 4313
3889 $msg =~ s/\n//; 4314 $msg =~ s/\n$//;
3890 4315
4316 if ($_log_backtrace_last eq $msg) {
4317 LOG llevInfo, "[ABT] $msg\n";
4318 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3891 # limit the # of concurrent backtraces 4319 # limit the # of concurrent backtraces
3892 if ($_log_backtrace < 2) { 4320 } elsif ($_log_backtrace < 2) {
4321 $_log_backtrace_last = $msg;
3893 ++$_log_backtrace; 4322 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg; 4323 my $perl_bt = Carp::longmess $msg;
3895 async { 4324 async {
3896 $Coro::current->{desc} = "abt $msg"; 4325 $Coro::current->{desc} = "abt $msg";
3897 4326
3917 LOG llevInfo, "[ABT] $_\n" for @bt; 4346 LOG llevInfo, "[ABT] $_\n" for @bt;
3918 --$_log_backtrace; 4347 --$_log_backtrace;
3919 }; 4348 };
3920 } else { 4349 } else {
3921 LOG llevInfo, "[ABT] $msg\n"; 4350 LOG llevInfo, "[ABT] $msg\n";
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4351 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3923 } 4352 }
3924} 4353}
3925 4354
3926# load additional modules 4355# load additional modules
3927use cf::pod; 4356require "cf/$_.pm" for @EXTRA_MODULES;
4357cf::_connect_to_perl_2;
3928 4358
3929END { cf::emergency_save } 4359END { cf::emergency_save }
3930 4360
39311 43611
3932 4362

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines