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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines