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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.601 by root, Sun Nov 11 05:53:12 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 les 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
412 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 603
414 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 608 $job->[2]->send;
418 Coro::cede; 609 Coro::cede;
419 goto next_job; 610 goto next_job;
420 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 613 }
422 } 614 }
423 615
424 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
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, 744 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 745 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 746 # TODO: investigate and fix (likely this will be rather laborious)
550 747
551 my @res = Coro::Util::fork_eval { 748 my @res = Coro::Util::fork_eval {
552 reset_signals; 749 cf::post_fork;
553 &$cb 750 &$cb
554 }, @args; 751 } @args;
555 752
556 wantarray ? @res : $res[-1] 753 wantarray ? @res : $res[-1]
754}
755
756sub objinfo {
757 (
758 "counter value" => cf::object::object_count,
759 "objects created" => cf::object::create_count,
760 "objects destroyed" => cf::object::destroy_count,
761 "freelist size" => cf::object::free_count,
762 "allocated objects" => cf::object::objects_size,
763 "active objects" => cf::object::actives_size,
764 )
557} 765}
558 766
559=item $coin = coin_from_name $name 767=item $coin = coin_from_name $name
560 768
561=cut 769=cut
598within each server. 806within each server.
599 807
600=cut 808=cut
601 809
602sub db_table($) { 810sub db_table($) {
811 cf::error "db_get called from main context"
812 if $Coro::current == $Coro::main;
813
603 my ($name) = @_; 814 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 815 my $db = BDB::db_create $DB_ENV;
605 816
606 eval { 817 eval {
607 $db->set_flags (BDB::CHKSUM); 818 $db->set_flags (BDB::CHKSUM);
617} 828}
618 829
619our $DB; 830our $DB;
620 831
621sub db_init { 832sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 833 $DB ||= db_table "db";
624 };
625} 834}
626 835
627sub db_get($$) { 836sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 837 my $key = "$_[0]/$_[1]";
629 838
630 cf::sync_job { 839 cf::error "db_get called from main context"
840 if $Coro::current == $Coro::main;
841
631 BDB::db_get $DB, undef, $key, my $data; 842 BDB::db_get $DB, undef, $key, my $data;
632 843
633 $! ? () 844 $! ? ()
634 : $data 845 : $data
635 }
636} 846}
637 847
638sub db_put($$$) { 848sub db_put($$$) {
639 BDB::dbreq_pri 4; 849 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 850 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 878
669 my @data; 879 my @data;
670 my $md5; 880 my $md5;
671 881
672 for (0 .. $#$src) { 882 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 883 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 884 }
676 885
677 # if processing is expensive, check 886 # if processing is expensive, check
678 # checksum first 887 # checksum first
679 if (1) { 888 if (1) {
692 901
693 return db_get cache => "$id/data"; 902 return db_get cache => "$id/data";
694 } 903 }
695 } 904 }
696 905
697 my $t1 = Time::HiRes::time; 906 my $t1 = EV::time;
698 my $data = $process->(\@data); 907 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 908 my $t2 = EV::time;
700 909
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 910 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 911
703 db_put cache => "$id/data", $data; 912 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 913 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 914 db_put cache => "$id/meta", $meta;
706 915
716 925
717=cut 926=cut
718 927
719sub datalog($@) { 928sub datalog($@) {
720 my ($type, %kv) = @_; 929 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 930 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 931}
723 932
724=back 933=back
725 934
726=cut 935=cut
921 1130
922 } elsif (exists $cb_id{$type}) { 1131 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1132 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1133
925 } elsif (ref $type) { 1134 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1135 error "attaching objects not supported, ignoring.\n";
927 1136
928 } else { 1137 } else {
929 shift @arg; 1138 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1139 error "attach argument '$type' not supported, ignoring.\n";
931 } 1140 }
932 } 1141 }
933} 1142}
934 1143
935sub _object_attach { 1144sub _object_attach {
945 _attach $registry, $klass, @attach; 1154 _attach $registry, $klass, @attach;
946 } 1155 }
947 1156
948 $obj->{$name} = \%arg; 1157 $obj->{$name} = \%arg;
949 } else { 1158 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1159 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1160 }
952 1161
953 $obj->{_attachment}{$name} = undef; 1162 $obj->{_attachment}{$name} = undef;
954} 1163}
955 1164
1014 1223
1015 for (@$callbacks) { 1224 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1225 eval { &{$_->[1]} };
1017 1226
1018 if ($@) { 1227 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1228 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1229 override;
1022 } 1230 }
1023 1231
1024 return 1 if $override; 1232 return 1 if $override;
1025 } 1233 }
1104 for (@$attach) { 1312 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1313 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1314 _attach $registry, $klass, @attach;
1107 } 1315 }
1108 } else { 1316 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1317 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1318 }
1111 } 1319 }
1112} 1320}
1113 1321
1114cf::attachable->attach ( 1322cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1349 my ($filename, $rdata, $objs) = @_;
1142 1350
1143 sync_job { 1351 sync_job {
1144 if (length $$rdata) { 1352 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1353 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1354 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1355 $decname, length $$rdata, scalar @$objs
1356 if $VERBOSE_IO;
1148 1357
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1358 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1359 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1360 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1361 if ($cf::USE_FSYNC) {
1362 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;
1363 aio_fsync $fh;
1364 }
1153 aio_close $fh; 1365 aio_close $fh;
1154 1366
1155 if (@$objs) { 1367 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1368 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1369 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1370 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1371 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 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;
1374 aio_fsync $fh;
1375 }
1161 aio_close $fh; 1376 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1377 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1378 }
1164 } else { 1379 } else {
1165 aio_unlink "$filename.pst"; 1380 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1383 aio_rename "$filename~", $filename;
1169 1384
1170 $filename =~ s%/[^/]+$%%; 1385 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1386 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1387 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1388 error "unable to save objects: $filename~: $!\n";
1174 } 1389 }
1175 } else { 1390 } else {
1176 aio_unlink $filename; 1391 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1392 aio_unlink "$filename.pst";
1178 } 1393 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1417 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1418 $av = $st->{objs};
1204 } 1419 }
1205 1420
1206 utf8::decode (my $decname = $filename); 1421 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1422 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1423 $decname, length $data, scalar @{$av || []}
1424 if $VERBOSE_IO;
1209 1425
1210 ($data, $av) 1426 ($data, $av)
1211} 1427}
1212 1428
1213=head2 COMMAND CALLBACKS 1429=head2 COMMAND CALLBACKS
1217=cut 1433=cut
1218 1434
1219############################################################################# 1435#############################################################################
1220# command handling &c 1436# command handling &c
1221 1437
1222=item cf::register_command $name => \&callback($ob,$args); 1438=item cf::register_command $name => \&callback($ob,$args)
1223 1439
1224Register a callback for execution when the client sends the user command 1440Register a callback for execution when the client sends the user command
1225$name. 1441$name.
1226 1442
1227=cut 1443=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1449 #warn "registering command '$name/$time' to '$caller'";
1234 1450
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1451 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1452}
1237 1453
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1454=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1455
1240Register a callback for execution when the client sends an (synchronous) 1456Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1457extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1458received by the server, like other user commands. The first argument is
1243the logged-in player. Ext commands can only be processed after a player 1459the logged-in player. Ext commands can only be processed after a player
1244has logged in successfully. 1460has logged in successfully.
1245 1461
1246If the callback returns something, it is sent back as if reply was being 1462The values will be sent back to the client.
1247called.
1248 1463
1464=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1465
1466Same as C<cf::register_extcmd>, but instead of returning values, the
1467callback needs to clal the C<$reply> function.
1468
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1469=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1470
1251Register a callback for execution when the client sends an (asynchronous) 1471Register a callback for execution when the client sends an (asynchronous)
1252exticmd packet. Exti commands are processed by the server as soon as they 1472exticmd 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 1473are 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 1474is a client socket. Exti commands can be received anytime, even before
1255log-in. 1475log-in.
1256 1476
1257If the callback returns something, it is sent back as if reply was being 1477The values will be sent back to the client.
1258called.
1259 1478
1260=cut 1479=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 1480
1481Same as C<cf::register_extcmd>, but instead of returning values, the
1482callback needs to clal the C<$reply> function.
1483
1484=cut
1485
1262sub register_extcmd { 1486sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1487 my ($name, $cb) = @_;
1264 1488
1265 $EXTCMD{$name} = $cb; 1489 $EXTCMD{$name} = $cb;
1266} 1490}
1267 1491
1268sub register_exticmd { 1492sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1493 my ($name, $cb) = @_;
1270 1494
1495 $EXTACMD{$name} = $cb;
1496}
1497
1498sub register_exticmd($$) {
1499 my ($name, $cb) = @_;
1500
1271 $EXTICMD{$name} = $cb; 1501 $EXTICMD{$name} = $cb;
1272} 1502}
1273 1503
1504sub register_async_exticmd($$) {
1505 my ($name, $cb) = @_;
1506
1507 $EXTIACMD{$name} = $cb;
1508}
1509
1274use File::Glob (); 1510use File::Glob ();
1275 1511
1276cf::player->attach ( 1512cf::player->attach (
1277 on_command => sub { 1513 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1514 my ($pl, $name, $params) = @_;
1279 1515
1280 my $cb = $COMMAND{$name} 1516 my $cb = $COMMAND{$name}
1281 or return; 1517 or return;
1282 1518
1290 my ($pl, $buf) = @_; 1526 my ($pl, $buf) = @_;
1291 1527
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1528 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1529
1294 if (ref $msg) { 1530 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1531 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 1532
1300 my @reply;
1301
1302 if (my $cb = $EXTCMD{$type}) { 1533 if (my $cb = $EXTACMD{$type}) {
1534 $cb->(
1535 $pl,
1536 sub {
1537 $pl->ext_msg ("reply-$reply", @_)
1538 if $reply;
1539 },
1540 @payload
1541 );
1542 } else {
1543 my @reply;
1544
1545 if (my $cb = $EXTCMD{$type}) {
1303 @reply = $cb->($pl, @payload); 1546 @reply = $cb->($pl, @payload);
1547 }
1548
1549 $pl->ext_msg ("reply-$reply", @reply)
1550 if $reply;
1304 } 1551 }
1305 1552
1306 $pl->ext_reply ($reply, @reply)
1307 if $reply;
1308
1309 } else { 1553 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1554 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1555 }
1312 1556
1313 cf::override; 1557 cf::override;
1314 }, 1558 },
1315); 1559);
1316 1560
1317# "readahead" all extensions 1561# "readahead" all extensions
1318sub cache_extensions { 1562sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1563 my $grp = IO::AIO::aio_group;
1320 1564
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1565 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1566 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1567 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1568 }
1325 }; 1569 };
1326 1570
1327 $grp 1571 $grp
1328} 1572}
1329 1573
1574sub _ext_cfg_reg($$$$) {
1575 my ($rvar, $varname, $cfgname, $default) = @_;
1576
1577 $cfgname = lc $varname
1578 unless length $cfgname;
1579
1580 $EXT_CFG{$cfgname} = [$rvar, $default];
1581
1582 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1583}
1584
1330sub load_extensions { 1585sub load_extensions {
1586 info "loading extensions...";
1587
1588 %EXT_CFG = ();
1589
1331 cf::sync_job { 1590 cf::sync_job {
1332 my %todo; 1591 my %todo;
1333 1592
1334 for my $path (<$LIBDIR/*.ext>) { 1593 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1594 next unless -r $path;
1353 1612
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1613 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1614 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1615
1357 $ext{source} = 1616 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1617 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1618 . "#line 1 \"$path\"\n{\n"
1360 . $source 1619 . $source
1361 . "\n};\n1"; 1620 . "\n};\n1";
1362 1621
1363 $todo{$base} = \%ext; 1622 $todo{$base} = \%ext;
1364 } 1623 }
1365 1624
1625 my $pass = 0;
1366 my %done; 1626 my %done;
1367 while (%todo) { 1627 while (%todo) {
1368 my $progress; 1628 my $progress;
1369 1629
1630 ++$pass;
1631
1632 ext:
1370 while (my ($k, $v) = each %todo) { 1633 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1634 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1635 next ext
1373 unless exists $done{$_}; 1636 unless exists $done{$_};
1374 } 1637 }
1375 1638
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1639 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1640
1378 unless (eval $v->{source}) { 1641 my $source = $v->{source};
1642
1643 # support "CONF varname :confname = default" pseudo-statements
1644 $source =~ s{
1645 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1646 }{
1647 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1648 }gmxe;
1649
1650 my $active = eval $source;
1651
1652 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1653 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1654
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1655 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1656 if exists $v->{meta}{mandatory};
1386 1657
1387 warn $msg; 1658 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1659 delete $todo{$k};
1660 } else {
1661 $done{$k} = delete $todo{$k};
1662 push @EXTS, $v->{pkg};
1663 $progress = 1;
1664
1665 info "$v->{base}: extension inactive.\n"
1666 unless $active;
1388 } 1667 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1668 }
1394 1669
1395 skip: 1670 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1671 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1672
1673 while (my ($k, $v) = each %todo) {
1674 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1675 if exists $v->{meta}{mandatory};
1676 }
1677
1678 last;
1679 }
1398 } 1680 }
1399 }; 1681 };
1400} 1682}
1401 1683
1402############################################################################# 1684#############################################################################
1486 $cf::PLAYER{$login} = $pl 1768 $cf::PLAYER{$login} = $pl
1487 } 1769 }
1488 } 1770 }
1489} 1771}
1490 1772
1773cf::player->attach (
1774 on_load => sub {
1775 my ($pl, $path) = @_;
1776
1777 # restore slots saved in save, below
1778 my $slots = delete $pl->{_slots};
1779
1780 $pl->ob->current_weapon ($slots->[0]);
1781 $pl->combat_ob ($slots->[1]);
1782 $pl->ranged_ob ($slots->[2]);
1783 },
1784);
1785
1491sub save($) { 1786sub save($) {
1492 my ($pl) = @_; 1787 my ($pl) = @_;
1493 1788
1494 return if $pl->{deny_save}; 1789 return if $pl->{deny_save};
1495 1790
1500 1795
1501 aio_mkdir playerdir $pl, 0770; 1796 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1797 $pl->{last_save} = $cf::RUNTIME;
1503 1798
1504 cf::get_slot 0.01; 1799 cf::get_slot 0.01;
1800
1801 # save slots, to be restored later
1802 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1803
1506 $pl->save_pl ($path); 1804 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1805 cf::cede_to_tick;
1508} 1806}
1509 1807
1543 my $name = $pl->ob->name; 1841 my $name = $pl->ob->name;
1544 1842
1545 $pl->{deny_save} = 1; 1843 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1844 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1845
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1846 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1847 $pl->deactivate;
1848
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1849 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1850 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1851 ext::highscore::check ($pl->ob);
1852
1553 $pl->ns->destroy if $pl->ns; 1853 $pl->ns->destroy if $pl->ns;
1554 1854
1555 my $path = playerdir $pl; 1855 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1856 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1857 aio_rename $path, $temp;
1611 \@logins 1911 \@logins
1612} 1912}
1613 1913
1614=item $player->maps 1914=item $player->maps
1615 1915
1916=item cf::player::maps $login
1917
1616Returns an arrayref of map paths that are private for this 1918Returns an arrayref of map paths that are private for this
1617player. May block. 1919player. May block.
1618 1920
1619=cut 1921=cut
1620 1922
1641 1943
1642=item $protocol_xml = $player->expand_cfpod ($cfpod) 1944=item $protocol_xml = $player->expand_cfpod ($cfpod)
1643 1945
1644Expand deliantra pod fragments into protocol xml. 1946Expand deliantra pod fragments into protocol xml.
1645 1947
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) 1948=item $player->ext_msg ($type, @msg)
1659 1949
1660Sends an ext event to the client. 1950Sends an ext event to the client.
1661 1951
1662=cut 1952=cut
1681 1971
1682=cut 1972=cut
1683 1973
1684sub find_by_path($) { 1974sub find_by_path($) {
1685 my ($path) = @_; 1975 my ($path) = @_;
1976
1977 $path =~ s/^~[^\/]*//; # skip ~login
1686 1978
1687 my ($match, $specificity); 1979 my ($match, $specificity);
1688 1980
1689 for my $region (list) { 1981 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1982 if ($region->{match} && $path =~ $region->{match}) {
1719sub generate_random_map { 2011sub generate_random_map {
1720 my ($self, $rmp) = @_; 2012 my ($self, $rmp) = @_;
1721 2013
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2014 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 2015
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 2016 $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} 2017}
1739 2018
1740=item cf::map->register ($regex, $prio) 2019=item cf::map->register ($regex, $prio)
1741 2020
1742Register a handler for the map path matching the given regex at the 2021Register a handler for the map path matching the given regex at the
1747 2026
1748sub register { 2027sub register {
1749 my (undef, $regex, $prio) = @_; 2028 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 2029 my $pkg = caller;
1751 2030
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 2031 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 2032
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2033 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 2034}
1757 2035
1758# also paths starting with '/' 2036# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2037$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 2038
1761sub thawer_merge { 2039sub thawer_merge {
1762 my ($self, $merge) = @_; 2040 my ($self, $merge) = @_;
1763 2041
1764 # we have to keep some variables in memory intact 2042 # we have to keep some variables in memory intact
1769} 2047}
1770 2048
1771sub normalise { 2049sub normalise {
1772 my ($path, $base) = @_; 2050 my ($path, $base) = @_;
1773 2051
1774 $path = "$path"; # make sure its a string 2052 $path = "$path"; # make sure it's a string
1775 2053
1776 $path =~ s/\.map$//; 2054 $path =~ s/\.map$//;
1777 2055
1778 # map plan: 2056 # map plan:
1779 # 2057 #
1794 $base =~ s{[^/]+/?$}{}; 2072 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2073 $path = "$base/$path";
1796 } 2074 }
1797 2075
1798 for ($path) { 2076 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2077 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2078 redo if s{/[^/]+/\.\./}{/};
1802 } 2079 }
1803 2080
1804 $path 2081 $path
1818 $self->init; # pass $1 etc. 2095 $self->init; # pass $1 etc.
1819 return $self; 2096 return $self;
1820 } 2097 }
1821 } 2098 }
1822 2099
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2100 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2101 ()
1825} 2102}
1826 2103
2104# may re-bless or do other evil things
1827sub init { 2105sub init {
1828 my ($self) = @_; 2106 my ($self) = @_;
1829 2107
1830 $self 2108 $self
1831} 2109}
1862 2140
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2141 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2142 "$UNIQUEDIR/$path"
1865} 2143}
1866 2144
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 2145sub decay_objects {
1877 my ($self) = @_; 2146 my ($self) = @_;
1878 2147
1879 return if $self->{deny_reset}; 2148 return if $self->{deny_reset};
1880 2149
1905 $self->{load_path} = $path; 2174 $self->{load_path} = $path;
1906 2175
1907 1 2176 1
1908} 2177}
1909 2178
2179# used to laod the header of an original map
1910sub load_header_orig { 2180sub load_header_orig {
1911 my ($self) = @_; 2181 my ($self) = @_;
1912 2182
1913 $self->load_header_from ($self->load_path) 2183 $self->load_header_from ($self->load_path)
1914} 2184}
1915 2185
2186# used to laod the header of an instantiated map
1916sub load_header_temp { 2187sub load_header_temp {
1917 my ($self) = @_; 2188 my ($self) = @_;
1918 2189
1919 $self->load_header_from ($self->save_path) 2190 $self->load_header_from ($self->save_path)
1920} 2191}
1921 2192
2193# called after loading the header from an instantiated map
1922sub prepare_temp { 2194sub prepare_temp {
1923 my ($self) = @_; 2195 my ($self) = @_;
1924 2196
1925 $self->last_access ((delete $self->{last_access}) 2197 $self->last_access ((delete $self->{last_access})
1926 || $cf::RUNTIME); #d# 2198 || $cf::RUNTIME); #d#
1927 # safety 2199 # safety
1928 $self->{instantiate_time} = $cf::RUNTIME 2200 $self->{instantiate_time} = $cf::RUNTIME
1929 if $self->{instantiate_time} > $cf::RUNTIME; 2201 if $self->{instantiate_time} > $cf::RUNTIME;
1930} 2202}
1931 2203
2204# called after loading the header from an original map
1932sub prepare_orig { 2205sub prepare_orig {
1933 my ($self) = @_; 2206 my ($self) = @_;
1934 2207
1935 $self->{load_original} = 1; 2208 $self->{load_original} = 1;
1936 $self->{instantiate_time} = $cf::RUNTIME; 2209 $self->{instantiate_time} = $cf::RUNTIME;
1960 2233
1961sub find; 2234sub find;
1962sub find { 2235sub find {
1963 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
1964 2237
2238 cf::cede_to_tick;
2239
1965 $path = normalise $path, $origin && $origin->path; 2240 $path = normalise $path, $origin;
1966 2241
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2242 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2243 my $guard2 = cf::lock_acquire "map_find:$path";
1969 2244
1970 $cf::MAP{$path} || do { 2245 $cf::MAP{$path} || do {
1987 2262
1988 $cf::MAP{$path} = $map 2263 $cf::MAP{$path} = $map
1989 } 2264 }
1990} 2265}
1991 2266
1992sub pre_load { } 2267sub pre_load { }
1993sub post_load { } 2268#sub post_load { } # XS
1994 2269
1995sub load { 2270sub load {
1996 my ($self) = @_; 2271 my ($self) = @_;
1997 2272
1998 local $self->{deny_reset} = 1; # loading can take a long time 2273 local $self->{deny_reset} = 1; # loading can take a long time
2001 2276
2002 { 2277 {
2003 my $guard = cf::lock_acquire "map_data:$path"; 2278 my $guard = cf::lock_acquire "map_data:$path";
2004 2279
2005 return unless $self->valid; 2280 return unless $self->valid;
2006 return unless $self->in_memory == cf::MAP_SWAPPED; 2281 return unless $self->state == cf::MAP_SWAPPED;
2007
2008 $self->in_memory (cf::MAP_LOADING);
2009 2282
2010 $self->alloc; 2283 $self->alloc;
2011 2284
2012 $self->pre_load; 2285 $self->pre_load;
2013 cf::cede_to_tick; 2286 cf::cede_to_tick;
2014 2287
2288 if (exists $self->{load_path}) {
2015 my $f = new_from_file cf::object::thawer $self->{load_path}; 2289 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block; 2290 $f->skip_block;
2017 $self->_load_objects ($f) 2291 $self->_load_objects ($f)
2018 or return; 2292 or return;
2019 2293
2020 $self->post_load_original 2294 $self->post_load_original
2021 if delete $self->{load_original}; 2295 if delete $self->{load_original};
2022 2296
2023 if (my $uniq = $self->uniq_path) { 2297 if (my $uniq = $self->uniq_path) {
2024 utf8::encode $uniq; 2298 utf8::encode $uniq;
2025 unless (aio_stat $uniq) { 2299 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) { 2300 if (my $f = new_from_file cf::object::thawer $uniq) {
2027 $self->clear_unique_items; 2301 $self->clear_unique_items;
2028 $self->_load_objects ($f); 2302 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs; 2303 $f->resolve_delayed_derefs;
2304 }
2030 } 2305 }
2031 } 2306 }
2032 }
2033 2307
2034 $f->resolve_delayed_derefs; 2308 $f->resolve_delayed_derefs;
2309 } else {
2310 $self->post_load_original
2311 if delete $self->{load_original};
2312 }
2313
2314 $self->state (cf::MAP_INACTIVE);
2035 2315
2036 cf::cede_to_tick; 2316 cf::cede_to_tick;
2037 # now do the right thing for maps 2317 # now do the right thing for maps
2038 $self->link_multipart_objects; 2318 $self->link_multipart_objects;
2039 $self->difficulty ($self->estimate_difficulty) 2319 $self->difficulty ($self->estimate_difficulty)
2043 unless ($self->{deny_activate}) { 2323 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2324 $self->decay_objects;
2045 $self->fix_auto_apply; 2325 $self->fix_auto_apply;
2046 $self->update_buttons; 2326 $self->update_buttons;
2047 cf::cede_to_tick; 2327 cf::cede_to_tick;
2048 $self->set_darkness_map; 2328 #$self->activate; # no longer activate maps automatically
2049 cf::cede_to_tick;
2050 $self->activate;
2051 } 2329 }
2052 2330
2053 $self->{last_save} = $cf::RUNTIME; 2331 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2332 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2333 }
2058 2334
2059 $self->post_load; 2335 $self->post_load;
2060}
2061 2336
2337 1
2338}
2339
2340# customize the map for a given player, i.e.
2341# return the _real_ map. used by e.g. per-player
2342# maps to change the path to ~playername/mappath
2062sub customise_for { 2343sub customise_for {
2063 my ($self, $ob) = @_; 2344 my ($self, $ob) = @_;
2064 2345
2065 return find "~" . $ob->name . "/" . $self->{path} 2346 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2347 if $self->per_player;
2069# if $self->per_party; 2350# if $self->per_party;
2070 2351
2071 $self 2352 $self
2072} 2353}
2073 2354
2074# find and load all maps in the 3x3 area around a map
2075sub load_neighbours {
2076 my ($map) = @_;
2077
2078 my @neigh; # diagonal neighbours
2079
2080 for (0 .. 3) {
2081 my $neigh = $map->tile_path ($_)
2082 or next;
2083 $neigh = find $neigh, $map
2084 or next;
2085 $neigh->load;
2086
2087 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 }
2091
2092 for (grep defined $_->[0], @neigh) {
2093 my ($path, $origin) = @$_;
2094 my $neigh = find $path, $origin
2095 or next;
2096 $neigh->load;
2097 }
2098}
2099
2100sub find_sync { 2355sub find_sync {
2101 my ($path, $origin) = @_; 2356 my ($path, $origin) = @_;
2102 2357
2103 cf::sync_job { find $path, $origin } 2358 # it's a bug to call this from the main context
2359 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2360 if $Coro::current == $Coro::main;
2361
2362 find $path, $origin
2104} 2363}
2105 2364
2106sub do_load_sync { 2365sub do_load_sync {
2107 my ($map) = @_; 2366 my ($map) = @_;
2108 2367
2368 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2369 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2370 if $Coro::current == $Coro::main;
2111 2371
2112 cf::sync_job { $map->load }; 2372 $map->load;
2113} 2373}
2114 2374
2115our %MAP_PREFETCH; 2375our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2376our $MAP_PREFETCHER = undef;
2117 2377
2118sub find_async { 2378sub find_async {
2119 my ($path, $origin, $load) = @_; 2379 my ($path, $origin, $load) = @_;
2120 2380
2121 $path = normalise $path, $origin && $origin->{path}; 2381 $path = normalise $path, $origin;
2122 2382
2123 if (my $map = $cf::MAP{$path}) { 2383 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2384 return $map if !$load || $map->linkable;
2125 } 2385 }
2126 2386
2127 $MAP_PREFETCH{$path} |= $load; 2387 $MAP_PREFETCH{$path} |= $load;
2128 2388
2129 $MAP_PREFETCHER ||= cf::async { 2389 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2403 $MAP_PREFETCHER->prio (6);
2144 2404
2145 () 2405 ()
2146} 2406}
2147 2407
2408# common code, used by both ->save and ->swapout
2148sub save { 2409sub _save {
2149 my ($self) = @_; 2410 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2411
2153 $self->{last_save} = $cf::RUNTIME; 2412 $self->{last_save} = $cf::RUNTIME;
2154 2413
2155 return unless $self->dirty; 2414 return unless $self->dirty;
2156 2415
2176 } else { 2435 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2436 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2437 }
2179} 2438}
2180 2439
2440sub save {
2441 my ($self) = @_;
2442
2443 my $lock = cf::lock_acquire "map_data:$self->{path}";
2444
2445 $self->_save;
2446}
2447
2181sub swap_out { 2448sub swap_out {
2182 my ($self) = @_; 2449 my ($self) = @_;
2183 2450
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2451 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2452
2453 return if !$self->linkable;
2454 return if $self->{deny_save};
2189 return if $self->players; 2455 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2456
2457 # first deactivate the map and "unlink" it from the core
2458 $self->deactivate;
2459 $_->clear_links_to ($self) for values %cf::MAP;
2460 $self->state (cf::MAP_SWAPPED);
2461
2462 # then atomically save
2463 $self->_save;
2464
2465 # then free the map
2466 $self->clear;
2467}
2468
2469sub reset_at {
2470 my ($self) = @_;
2471
2472 # TODO: safety, remove and allow resettable per-player maps
2191 return if $self->{deny_save}; 2473 return 1e99 if $self->{deny_reset};
2192 2474
2475 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2476 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2477
2478 $time + $to
2479}
2480
2481sub should_reset {
2482 my ($self) = @_;
2483
2484 $self->reset_at <= $cf::RUNTIME
2485}
2486
2487sub reset {
2488 my ($self) = @_;
2489
2490 my $lock = cf::lock_acquire "map_data:$self->{path}";
2491
2492 return if $self->players;
2493
2494 cf::trace "resetting map ", $self->path, "\n";
2495
2193 $self->in_memory (cf::MAP_SWAPPED); 2496 $self->state (cf::MAP_SWAPPED);
2497
2498 # need to save uniques path
2499 unless ($self->{deny_save}) {
2500 my $uniq = $self->uniq_path; utf8::encode $uniq;
2501
2502 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2503 if $uniq;
2504 }
2505
2506 delete $cf::MAP{$self->path};
2194 2507
2195 $self->deactivate; 2508 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2509 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2510 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2511
2243 $self->unlink_save; 2512 $self->unlink_save;
2244 $self->destroy; 2513 $self->destroy;
2245} 2514}
2246 2515
2254 2523
2255 delete $cf::MAP{$self->path}; 2524 delete $cf::MAP{$self->path};
2256 2525
2257 $self->unlink_save; 2526 $self->unlink_save;
2258 2527
2259 bless $self, "cf::map"; 2528 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2529 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2530 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2531 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2532 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2533
2321 : normalise $_ 2590 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2591 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2592 ]
2324} 2593}
2325 2594
2595=item cf::map::static_maps
2596
2597Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2598file in the shared directory excluding F</styles> and F</editor>). May
2599block.
2600
2601=cut
2602
2603sub static_maps() {
2604 my @dirs = "";
2605 my @maps;
2606
2607 while (@dirs) {
2608 my $dir = shift @dirs;
2609
2610 next if $dir eq "/styles" || $dir eq "/editor";
2611
2612 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2613 or return;
2614
2615 for (@$files) {
2616 s/\.map$// or next;
2617 utf8::decode $_;
2618 push @maps, "$dir/$_";
2619 }
2620
2621 push @dirs, map "$dir/$_", @$dirs;
2622 }
2623
2624 \@maps
2625}
2626
2326=back 2627=back
2327 2628
2328=head3 cf::object 2629=head3 cf::object
2329 2630
2330=cut 2631=cut
2353 2654
2354Creates and returns a persistent reference to an object that can be stored as a string. 2655Creates and returns a persistent reference to an object that can be stored as a string.
2355 2656
2356=item $ob = cf::object::deref ($refstring) 2657=item $ob = cf::object::deref ($refstring)
2357 2658
2358returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2659returns the objetc referenced by refstring. may return undef when it cannot find the object,
2359even if the object actually exists. May block. 2660even if the object actually exists. May block.
2360 2661
2361=cut 2662=cut
2362 2663
2363sub deref { 2664sub deref {
2395 2696
2396our $SAY_CHANNEL = { 2697our $SAY_CHANNEL = {
2397 id => "say", 2698 id => "say",
2398 title => "Map", 2699 title => "Map",
2399 reply => "say ", 2700 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2701 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2702};
2402 2703
2403our $CHAT_CHANNEL = { 2704our $CHAT_CHANNEL = {
2404 id => "chat", 2705 id => "chat",
2405 title => "Chat", 2706 title => "Chat",
2462 2763
2463Freezes the player and moves him/her to a special map (C<{link}>). 2764Freezes the player and moves him/her to a special map (C<{link}>).
2464 2765
2465The player should be reasonably safe there for short amounts of time (e.g. 2766The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2767for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2768though, as the player cannot control the character while it is on the link
2468map. 2769map.
2469 2770
2470Will never block. 2771Will never block.
2471 2772
2472=item $player_object->leave_link ($map, $x, $y) 2773=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2794sub cf::object::player::enter_link {
2494 my ($self) = @_; 2795 my ($self) = @_;
2495 2796
2496 $self->deactivate_recursive; 2797 $self->deactivate_recursive;
2497 2798
2799 ++$self->{_link_recursion};
2800
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2801 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2802
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2803 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2804 if $self->map && $self->map->{path} ne "{link}";
2502 2805
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2806 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2807}
2505 2808
2506sub cf::object::player::leave_link { 2809sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2810 my ($self, $map, $x, $y) = @_;
2508 2811
2525 ($x, $y) = (-1, -1) 2828 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2829 unless (defined $x) && (defined $y);
2527 2830
2528 # use -1 or undef as default coordinates, not 0, 0 2831 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2832 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2833 if $x <= 0 && $y <= 0;
2531 2834
2532 $map->load; 2835 $map->load;
2533 $map->load_neighbours;
2534 2836
2535 return unless $self->contr->active; 2837 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2838
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2839 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2840 if ($self->enter_map ($map, $x, $y)) {
2541} 2841 # entering was successful
2842 delete $self->{_link_recursion};
2843 # only activate afterwards, to support waiting in hooks
2844 $self->activate_recursive;
2845 }
2542 2846
2847}
2848
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2849=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2850
2545Moves the player to the given map-path and coordinates by first freezing 2851Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2852her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2853that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2854the new (success) or old (failed) map position. In either case, $done will
2555 2861
2556our $GOTOGEN; 2862our $GOTOGEN;
2557 2863
2558sub cf::object::player::goto { 2864sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2865 my ($self, $path, $x, $y, $check, $done) = @_;
2866
2867 if ($self->{_link_recursion} >= $MAX_LINKS) {
2868 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2869 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2870 ($path, $x, $y) = @$EMERGENCY_POSITION;
2871 }
2560 2872
2561 # do generation counting so two concurrent goto's will be executed in-order 2873 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2874 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2875
2564 $self->enter_link; 2876 $self->enter_link;
2584 ($path, $x, $y) = (undef, undef, undef); 2896 ($path, $x, $y) = (undef, undef, undef);
2585 } 2897 }
2586 } 2898 }
2587 2899
2588 my $map = eval { 2900 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2901 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590 2902
2591 if ($map) { 2903 if ($map) {
2592 $map = $map->customise_for ($self); 2904 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2905 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2906 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2907 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2908 }
2597 2909
2598 $map 2910 $map
2606 if ($gen == $self->{_goto_generation}) { 2918 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2919 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2920 $self->leave_link ($map, $x, $y);
2609 } 2921 }
2610 2922
2611 $done->() if $done; 2923 $done->($self) if $done;
2612 })->prio (1); 2924 })->prio (1);
2613} 2925}
2614 2926
2615=item $player_object->enter_exit ($exit_object) 2927=item $player_object->enter_exit ($exit_object)
2616 2928
2684 $Coro::current->{desc} = "enter_exit"; 2996 $Coro::current->{desc} = "enter_exit";
2685 2997
2686 unless (eval { 2998 unless (eval {
2687 $self->deactivate_recursive; # just to be sure 2999 $self->deactivate_recursive; # just to be sure
2688 3000
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3001 my $map = cf::map::normalise $exit->slaying, $exit->map;
2698 my $x = $exit->stats->hp; 3002 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp; 3003 my $y = $exit->stats->sp;
3004
3005 # special map handling
3006 my $slaying = $exit->slaying;
3007
3008 # special map handling
3009 if ($slaying eq "/!") {
3010 my $guard = cf::lock_acquire "exit_prepare:$exit";
3011
3012 prepare_random_map $exit
3013 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3014
3015 $map = $exit->slaying;
3016
3017 } elsif ($slaying eq '!up') {
3018 $map = $exit->map->tile_path (cf::TILE_UP);
3019 $x = $exit->x;
3020 $y = $exit->y;
3021
3022 } elsif ($slaying eq '!down') {
3023 $map = $exit->map->tile_path (cf::TILE_DOWN);
3024 $x = $exit->x;
3025 $y = $exit->y;
3026 }
2700 3027
2701 $self->goto ($map, $x, $y); 3028 $self->goto ($map, $x, $y);
2702 3029
2703 # if exit is damned, update players death & WoR home-position 3030 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y) 3031 $self->contr->savebed ($map, $x, $y)
2709 $self->message ("Something went wrong deep within the deliantra server. " 3036 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 3037 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 3038 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 3039 cf::NDI_UNIQUE | cf::NDI_RED);
2713 3040
2714 warn "ERROR in enter_exit: $@"; 3041 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 3042 $self->leave_link;
2716 } 3043 }
2717 })->prio (1); 3044 })->prio (1);
2718} 3045}
2719 3046
2731sub cf::client::send_drawinfo { 3058sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 3059 my ($self, $text, $flags) = @_;
2733 3060
2734 utf8::encode $text; 3061 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3062 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3063}
3064
3065=item $client->send_big_packet ($pkt)
3066
3067Like C<send_packet>, but tries to compress large packets, and fragments
3068them as required.
3069
3070=cut
3071
3072our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3073
3074sub cf::client::send_big_packet {
3075 my ($self, $pkt) = @_;
3076
3077 # try lzf for large packets
3078 $pkt = "lzf " . Compress::LZF::compress $pkt
3079 if 1024 <= length $pkt and $self->{can_lzf};
3080
3081 # split very large packets
3082 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3083 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3084 $pkt = "frag";
3085 }
3086
3087 $self->send_packet ($pkt);
2736} 3088}
2737 3089
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 3090=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 3091
2740Send a drawinfo or msg packet to the client, formatting the msg for the 3092Send a drawinfo or msg packet to the client, formatting the msg for the
2744 3096
2745=cut 3097=cut
2746 3098
2747# non-persistent channels (usually the info channel) 3099# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 3100our %CHANNEL = (
3101 "c/motd" => {
3102 id => "infobox",
3103 title => "MOTD",
3104 reply => undef,
3105 tooltip => "The message of the day",
3106 },
2749 "c/identify" => { 3107 "c/identify" => {
2750 id => "infobox", 3108 id => "infobox",
2751 title => "Identify", 3109 title => "Identify",
2752 reply => undef, 3110 reply => undef,
2753 tooltip => "Items recently identified", 3111 tooltip => "Items recently identified",
2755 "c/examine" => { 3113 "c/examine" => {
2756 id => "infobox", 3114 id => "infobox",
2757 title => "Examine", 3115 title => "Examine",
2758 reply => undef, 3116 reply => undef,
2759 tooltip => "Signs and other items you examined", 3117 tooltip => "Signs and other items you examined",
3118 },
3119 "c/shopinfo" => {
3120 id => "infobox",
3121 title => "Shop Info",
3122 reply => undef,
3123 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3124 },
2761 "c/book" => { 3125 "c/book" => {
2762 id => "infobox", 3126 id => "infobox",
2763 title => "Book", 3127 title => "Book",
2764 reply => undef, 3128 reply => undef,
2780 id => "infobox", 3144 id => "infobox",
2781 title => "Body Parts", 3145 title => "Body Parts",
2782 reply => undef, 3146 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3147 tooltip => "Shows which body parts you posess and are available",
2784 }, 3148 },
3149 "c/statistics" => {
3150 id => "infobox",
3151 title => "Statistics",
3152 reply => undef,
3153 tooltip => "Shows your primary statistics",
3154 },
2785 "c/skills" => { 3155 "c/skills" => {
2786 id => "infobox", 3156 id => "infobox",
2787 title => "Skills", 3157 title => "Skills",
2788 reply => undef, 3158 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3159 tooltip => "Shows your experience per skill and item power",
3160 },
3161 "c/shopitems" => {
3162 id => "infobox",
3163 title => "Shop Items",
3164 reply => undef,
3165 tooltip => "Shows the items currently for sale in this shop",
3166 },
3167 "c/resistances" => {
3168 id => "infobox",
3169 title => "Resistances",
3170 reply => undef,
3171 tooltip => "Shows your resistances",
3172 },
3173 "c/pets" => {
3174 id => "infobox",
3175 title => "Pets",
3176 reply => undef,
3177 tooltip => "Shows information abotu your pets/a specific pet",
3178 },
3179 "c/perceiveself" => {
3180 id => "infobox",
3181 title => "Perceive Self",
3182 reply => undef,
3183 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3184 },
2791 "c/uptime" => { 3185 "c/uptime" => {
2792 id => "infobox", 3186 id => "infobox",
2793 title => "Uptime", 3187 title => "Uptime",
2794 reply => undef, 3188 reply => undef,
2804 id => "party", 3198 id => "party",
2805 title => "Party", 3199 title => "Party",
2806 reply => "gsay ", 3200 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3201 tooltip => "Messages and chat related to your party",
2808 }, 3202 },
3203 "c/death" => {
3204 id => "death",
3205 title => "Death",
3206 reply => undef,
3207 tooltip => "Reason for and more info about your most recent death",
3208 },
3209 "c/say" => $SAY_CHANNEL,
3210 "c/chat" => $CHAT_CHANNEL,
2809); 3211);
2810 3212
2811sub cf::client::send_msg { 3213sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3214 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3215
2818 3220
2819 # check predefined channels, for the benefit of C 3221 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3222 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3223 $channel = $CHANNEL{$channel};
2822 3224
2823 $self->ext_msg (channel_info => $channel) 3225 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3226 $channel = $channel->{id};
2827 3227
2828 } elsif (ref $channel) { 3228 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3229 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3230 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3231 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3232 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3233 }
2835 3234
2836 $channel = $channel->{id}; 3235 $channel = $channel->{id};
2837 } 3236 }
2838 3237
2839 return unless @extra || length $msg; 3238 return unless @extra || length $msg;
2840 3239
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3240 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3241 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3242 if $color & cf::NDI_DEF;
2845 3243
2846 my $pkt = "msg " 3244 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3245 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3246 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3247 );
2850 3248
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3249 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3250}
2888 3251
2889=item $client->ext_msg ($type, @msg) 3252=item $client->ext_msg ($type, @msg)
2890 3253
2891Sends an ext event to the client. 3254Sends an ext event to the client.
2893=cut 3256=cut
2894 3257
2895sub cf::client::ext_msg($$@) { 3258sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3259 my ($self, $type, @msg) = @_;
2897 3260
2898 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3261 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904}
2905
2906=item $client->ext_reply ($msgid, @msg)
2907
2908Sends an ext reply to the client.
2909
2910=cut
2911
2912sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_;
2914
2915 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 }
2922} 3262}
2923 3263
2924=item $success = $client->query ($flags, "text", \&cb) 3264=item $success = $client->query ($flags, "text", \&cb)
2925 3265
2926Queues a query to the client, calling the given callback with 3266Queues a query to the client, calling the given callback with
2981 my ($ns, $buf) = @_; 3321 my ($ns, $buf) = @_;
2982 3322
2983 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3323 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2984 3324
2985 if (ref $msg) { 3325 if (ref $msg) {
2986 my ($type, $reply, @payload) = 3326 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2987 "ARRAY" eq ref $msg
2988 ? @$msg
2989 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2990 3327
2991 my @reply;
2992
2993 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTIACMD{$type}) {
3329 $cb->(
3330 $ns,
3331 sub {
3332 $ns->ext_msg ("reply-$reply", @_)
3333 if $reply;
3334 },
3335 @payload
3336 );
3337 } else {
3338 my @reply;
3339
3340 if (my $cb = $EXTICMD{$type}) {
2994 @reply = $cb->($ns, @payload); 3341 @reply = $cb->($ns, @payload);
3342 }
3343
3344 $ns->ext_msg ("reply-$reply", @reply)
3345 if $reply;
2995 } 3346 }
2996
2997 $ns->ext_reply ($reply, @reply)
2998 if $reply;
2999
3000 } else { 3347 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3348 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3349 }
3003 3350
3004 cf::override; 3351 cf::override;
3005 }, 3352 },
3006); 3353);
3026 3373
3027 $coro 3374 $coro
3028} 3375}
3029 3376
3030cf::client->attach ( 3377cf::client->attach (
3031 on_destroy => sub { 3378 on_client_destroy => sub {
3032 my ($ns) = @_; 3379 my ($ns) = @_;
3033 3380
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3381 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3382 },
3036); 3383);
3052our $safe_hole = new Safe::Hole; 3399our $safe_hole = new Safe::Hole;
3053 3400
3054$SIG{FPE} = 'IGNORE'; 3401$SIG{FPE} = 'IGNORE';
3055 3402
3056$safe->permit_only (Opcode::opset qw( 3403$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3404 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3405 grepstart grepwhile mapstart mapwhile
3059 sort time 3406 sort time
3060)); 3407));
3061 3408
3062# here we export the classes and methods available to script code 3409# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3413The following functions and methods are available within a safe environment:
3067 3414
3068 cf::object 3415 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3416 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3417 insert remove name archname title slaying race decrease split
3418 value
3071 3419
3072 cf::object::player 3420 cf::object::player
3073 player 3421 player
3074 3422
3075 cf::player 3423 cf::player
3081=cut 3429=cut
3082 3430
3083for ( 3431for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3432 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3433 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3434 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3435 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3436 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3437 ["cf::map" => qw(trigger)],
3090) { 3438) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3439 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3440 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3441 for @funs;
3095} 3442}
3096 3443
3111 3458
3112 my $qcode = $code; 3459 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3460 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3461 $qcode =~ s/\n/\\n/g;
3115 3462
3463 %vars = (_dummy => 0) unless %vars;
3464
3465 my @res;
3116 local $_; 3466 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3467
3119 my $eval = 3468 my $eval =
3120 "do {\n" 3469 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3470 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3471 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3472 . $code
3124 . "\n}" 3473 . "\n}"
3125 ; 3474 ;
3126 3475
3476 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3477 sub_generation_inc;
3478 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3479 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3480 sub_generation_inc;
3481 } else {
3482 local @cf::_safe_eval_args = values %vars;
3483 @res = wantarray ? eval eval : scalar eval $eval;
3484 }
3130 3485
3131 if ($@) { 3486 if ($@) {
3132 warn "$@"; 3487 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3488 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3489 "with arguments " . (join " ", %vars) . "\n";
3135 } 3490 }
3136 3491
3137 wantarray ? @res : $res[0] 3492 wantarray ? @res : $res[0]
3138} 3493}
3139 3494
3153=cut 3508=cut
3154 3509
3155sub register_script_function { 3510sub register_script_function {
3156 my ($fun, $cb) = @_; 3511 my ($fun, $cb) = @_;
3157 3512
3158 no strict 'refs'; 3513 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3514 *$fun = $safe_hole->wrap ($cb);
3160} 3515}
3161 3516
3162=back 3517=back
3163 3518
3164=cut 3519=cut
3165 3520
3166############################################################################# 3521#############################################################################
3167# the server's init and main functions 3522# the server's init and main functions
3168 3523
3524{
3525 package cf::face;
3526
3527 our %HASH; # hash => idx
3528 our @DATA; # dynamically-created facedata, only faceste 0 used
3529 our @FOFS; # file offset, if > 0
3530 our @SIZE; # size of face, in octets
3531 our @META; # meta hash of face, if any
3532 our $DATAFH; # facedata filehandle
3533
3534 # internal api, not finalised
3535 sub set {
3536 my ($name, $type, $data) = @_;
3537
3538 my $idx = cf::face::find $name;
3539
3540 if ($idx) {
3541 delete $HASH{cf::face::get_chksum $idx};
3542 } else {
3543 $idx = cf::face::alloc $name;
3544 }
3545
3546 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3547
3548 cf::face::set_type $idx, $type;
3549 cf::face::set_csum $idx, 0, $hash;
3550
3551 # we need to destroy the SV itself, not just modify it, as a running ix
3552 # might hold a reference to it: "delete" achieves that.
3553 delete $FOFS[0][$idx];
3554 delete $DATA[0][$idx];
3555 $DATA[0][$idx] = $data;
3556 $SIZE[0][$idx] = length $data;
3557 delete $META[$idx];
3558 $HASH{$hash} = $idx;#d#
3559
3560 $idx
3561 }
3562
3563 sub _get_data($$$) {
3564 my ($idx, $set, $cb) = @_;
3565
3566 if (defined $DATA[$set][$idx]) {
3567 $cb->($DATA[$set][$idx]);
3568 } elsif (my $fofs = $FOFS[$set][$idx]) {
3569 my $size = $SIZE[$set][$idx];
3570 my $buf;
3571 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3572 if ($_[0] == $size) {
3573 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3574 $cb->($buf);
3575 } else {
3576 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3577 }
3578 };
3579 } else {
3580 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3581 }
3582 }
3583
3584 # rather ineffient
3585 sub cf::face::get_data($;$) {
3586 my ($idx, $set) = @_;
3587
3588 _get_data $idx, $set, Coro::rouse_cb;
3589 Coro::rouse_wait
3590 }
3591
3592 sub cf::face::ix {
3593 my ($ns, $set, $idx, $pri) = @_;
3594
3595 _get_data $idx, $set, sub {
3596 $ns->ix_send ($idx, $pri, $_[0]);
3597 };
3598 }
3599}
3600
3169sub load_facedata($) { 3601sub load_facedata($) {
3170 my ($path) = @_; 3602 my ($path) = @_;
3171 3603
3172 # HACK to clear player env face cache, we need some signal framework
3173 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = ();
3175
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3604 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3605
3178 warn "loading facedata from $path\n"; 3606 trace "loading facedata from $path\n";
3179 3607
3180 my $facedata; 3608 my $facedata = decode_storable load_file "$path/faceinfo";
3181 0 < aio_load $path, $facedata
3182 or die "$path: $!";
3183
3184 $facedata = Coro::Storable::thaw $facedata;
3185 3609
3186 $facedata->{version} == 2 3610 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3611 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3188 3612
3189 # patch in the exptable 3613 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3190 $facedata->{resource}{"res/exp_table"} = { 3614 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3191 type => FT_RSRC, 3615
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3616 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3193 }; 3617
3194 cf::cede_to_tick; 3618 # BEGIN ATOMIC
3619 # from here on, everything must be atomic - no thread switch allowed
3620 my $t1 = EV::time;
3195 3621
3196 { 3622 {
3197 my $faces = $facedata->{faceinfo}; 3623 my $faces = $facedata->{faceinfo};
3198 3624
3199 while (my ($face, $info) = each %$faces) { 3625 for my $face (sort keys %$faces) {
3626 my $info = $faces->{$face};
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3627 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3628
3202 cf::face::set_visibility $idx, $info->{visibility}; 3629 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3630 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3631 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3632 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3206 3633 #cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph}; # glyphs no longer downloadable via ix
3207 cf::cede_to_tick; 3634 $cf::face::HASH{$info->{hash64}} = $idx;
3635 delete $cf::face::META[$idx];
3208 } 3636 }
3209 3637
3210 while (my ($face, $info) = each %$faces) { 3638 while (my ($face, $info) = each %$faces) {
3211 next unless $info->{smooth}; 3639 next unless $info->{smooth};
3212 3640
3215 3643
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3644 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3645 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3646 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3647 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3648 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3649 }
3222
3223 cf::cede_to_tick;
3224 } 3650 }
3225 } 3651 }
3226 3652
3227 { 3653 {
3228 my $anims = $facedata->{animinfo}; 3654 my $anims = $facedata->{animinfo};
3229 3655
3230 while (my ($anim, $info) = each %$anims) { 3656 while (my ($anim, $info) = each %$anims) {
3231 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3657 cf::anim::set $anim, $info->{frames}, $info->{facings};
3232 cf::cede_to_tick;
3233 } 3658 }
3234 3659
3235 cf::anim::invalidate_all; # d'oh 3660 cf::anim::invalidate_all; # d'oh
3236 } 3661 }
3237 3662
3238 { 3663 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3664 my $res = $facedata->{resource};
3242 3665
3243 while (my ($name, $info) = each %$res) { 3666 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3667 if (defined (my $type = $info->{type})) {
3668 # TODO: different hash - must free and use new index, or cache ixface data queue
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3669 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3670
3248 if ($info->{type} & 1) {
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3671 cf::face::set_type $idx, $type;
3672 cf::face::set_csum $idx, 0, $info->{hash};
3673 $cf::face::SIZE[0][$idx] = $info->{size};
3674 $cf::face::FOFS[0][$idx] = $info->{fofs};
3675 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3676 $cf::face::HASH{$info->{hash}} = $idx;
3263 } else { 3677 } else {
3264 $RESOURCE{$name} = $info; 3678# $RESOURCE{$name} = $info; # unused
3265 } 3679 }
3266
3267 cf::cede_to_tick;
3268 } 3680 }
3269 } 3681 }
3682
3683 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3684
3685 # HACK to clear player env face cache, we need some signal framework
3686 # for this (global event?)
3687 %ext::player_env::MUSIC_FACE_CACHE = ();
3688
3689 # END ATOMIC
3690
3691 cf::debug "facedata atomic update time ", EV::time - $t1;
3270 3692
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3693 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3694
3695 aio_close $fh if $fh; # close old facedata
3696
3273 1 3697 1
3274} 3698}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3699
3296register_exticmd fx_want => sub { 3700register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3701 my ($ns, $want) = @_;
3298 3702
3299 while (my ($k, $v) = each %$want) { 3703 while (my ($k, $v) = each %$want) {
3307 my $status = load_resource_file_ $_[0]; 3711 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100; 3712 get_slot 0.1, 100;
3309 cf::arch::commit_load; 3713 cf::arch::commit_load;
3310 3714
3311 $status 3715 $status
3716}
3717
3718sub reload_exp_table {
3719 _reload_exp_table;
3720
3721 cf::face::set
3722 "res/exp_table" => FT_RSRC,
3723 JSON::XS->new->utf8->canonical->encode (
3724 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3725 );
3726}
3727
3728sub reload_materials {
3729 _reload_materials;
3312} 3730}
3313 3731
3314sub reload_regions { 3732sub reload_regions {
3315 # HACK to clear player env face cache, we need some signal framework 3733 # HACK to clear player env face cache, we need some signal framework
3316 # for this (global event?) 3734 # for this (global event?)
3324 if exists $_->{match}; 3742 if exists $_->{match};
3325 } 3743 }
3326} 3744}
3327 3745
3328sub reload_facedata { 3746sub reload_facedata {
3329 load_facedata "$DATADIR/facedata" 3747 load_facedata $DATADIR
3330 or die "unable to load facedata\n"; 3748 or die "unable to load facedata\n";
3331} 3749}
3332 3750
3333sub reload_archetypes { 3751sub reload_archetypes {
3334 load_resource_file "$DATADIR/archetypes" 3752 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n"; 3753 or die "unable to load archetypes\n";
3754
3755 cf::face::set
3756 "res/skill_info" => FT_RSRC,
3757 JSON::XS->new->utf8->canonical->encode (
3758 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3759 );
3760
3761 cf::face::set
3762 "res/spell_paths" => FT_RSRC,
3763 JSON::XS->new->utf8->canonical->encode (
3764 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3765 );
3336} 3766}
3337 3767
3338sub reload_treasures { 3768sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3769 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3770 or die "unable to load treasurelists\n";
3341} 3771}
3342 3772
3773sub reload_sound {
3774 trace "loading sound config from $DATADIR/sound\n";
3775
3776 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3777
3778 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3779 my $sound = $soundconf->{compat}[$_]
3780 or next;
3781
3782 my $face = cf::face::find "sound/$sound->[1]";
3783 cf::sound::set $sound->[0] => $face;
3784 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3785 }
3786
3787 while (my ($k, $v) = each %{$soundconf->{event}}) {
3788 my $face = cf::face::find "sound/$v";
3789 cf::sound::set $k => $face;
3790 }
3791}
3792
3343sub reload_resources { 3793sub reload_resources {
3344 warn "reloading resource files...\n"; 3794 trace "reloading resource files...\n";
3345 3795
3796 reload_materials;
3346 reload_facedata; 3797 reload_facedata;
3798 reload_exp_table;
3799 reload_sound;
3347 reload_archetypes; 3800 reload_archetypes;
3348 reload_regions; 3801 reload_regions;
3349 reload_treasures; 3802 reload_treasures;
3350 3803
3351 warn "finished reloading resource files\n"; 3804 trace "finished reloading resource files\n";
3352} 3805}
3353 3806
3354sub reload_config { 3807sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3808 trace "reloading config file...\n";
3356 or return;
3357 3809
3358 local $/; 3810 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3811 utf8::decode $config;
3812 *CFG = decode_yaml $config;
3360 3813
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3814 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3815
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3816 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3817 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3818
3366 if (exists $CFG{mlockall}) { 3819 if (exists $CFG{mlockall}) {
3389 3842
3390 seek $fh, 0, 0; 3843 seek $fh, 0, 0;
3391 print $fh $$; 3844 print $fh $$;
3392} 3845}
3393 3846
3847sub main_loop {
3848 trace "EV::loop starting\n";
3849 if (1) {
3850 EV::loop;
3851 }
3852 trace "EV::loop returned\n";
3853 goto &main_loop unless $REALLY_UNLOOP;
3854}
3855
3394sub main { 3856sub main {
3395 cf::init_globals; # initialise logging 3857 cf::init_globals; # initialise logging
3396 3858
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3859 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3860 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3861 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3862 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401 3863
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3864 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3865
3410 # we must not ever block the main coroutine 3866 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3867 $Coro::idle = sub {
3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3868 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3413 (async { 3869 (async {
3414 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3870 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT; 3871 EV::loop EV::LOOP_ONESHOT;
3416 })->prio (Coro::PRIO_MAX); 3872 })->prio (Coro::PRIO_MAX);
3417 }; 3873 };
3418 3874
3419 evthread_start IO::AIO::poll_fileno; 3875 evthread_start IO::AIO::poll_fileno;
3420 3876
3421 cf::sync_job { 3877 cf::sync_job {
3878 cf::incloader::init ();
3879
3880 db_init;
3881
3882 cf::init_anim;
3883 cf::init_attackmess;
3884 cf::init_dynamic;
3885
3886 cf::load_settings;
3887
3422 reload_resources; 3888 reload_resources;
3423 reload_config; 3889 reload_config;
3424 db_init;
3425 3890
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3891 cf::init_uuid;
3429 cf::init_signals; 3892 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3893 cf::init_skills;
3432 3894
3433 cf::init_beforeplay; 3895 cf::init_beforeplay;
3434 3896
3435 atomic; 3897 atomic;
3437 load_extensions; 3899 load_extensions;
3438 3900
3439 utime time, time, $RUNTIMEFILE; 3901 utime time, time, $RUNTIMEFILE;
3440 3902
3441 # no (long-running) fork's whatsoever before this point(!) 3903 # no (long-running) fork's whatsoever before this point(!)
3904 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3905 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3906
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3907 cf::_post_init 0;
3445 }; 3908 };
3446 3909
3447 EV::loop; 3910 cf::object::thawer::errors_are_fatal 0;
3911 info "parse errors in files are no longer fatal from this point on.\n";
3912
3913 AE::postpone {
3914 undef &main; # free gobs of memory :)
3915 };
3916
3917 goto &main_loop;
3448} 3918}
3449 3919
3450############################################################################# 3920#############################################################################
3451# initialisation and cleanup 3921# initialisation and cleanup
3452 3922
3453# install some emergency cleanup handlers 3923# install some emergency cleanup handlers
3454BEGIN { 3924BEGIN {
3455 our %SIGWATCHER = (); 3925 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3926 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3927 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3928 cf::cleanup "SIG$signal";
3459 }; 3929 };
3460 } 3930 }
3461} 3931}
3462 3932
3463sub write_runtime_sync { 3933sub write_runtime_sync {
3934 my $t0 = AE::time;
3935
3464 # first touch the runtime file to show we are still running: 3936 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3937 # the fsync below can take a very very long time.
3466 3938
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3939 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3940
3469 my $guard = cf::lock_acquire "write_runtime"; 3941 my $guard = cf::lock_acquire "write_runtime";
3470 3942
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3943 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3944 or return;
3473 3945
3474 my $value = $cf::RUNTIME + 90 + 10; 3946 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3947 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3948 # 60 allows for the watchdog to kill the server.
3489 or return; 3961 or return;
3490 3962
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3963 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3964 and return;
3493 3965
3494 warn "runtime file written.\n"; 3966 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3967
3496 1 3968 1
3497} 3969}
3498 3970
3499our $uuid_lock; 3971our $uuid_lock;
3511 or return; 3983 or return;
3512 3984
3513 my $value = uuid_seq uuid_cur; 3985 my $value = uuid_seq uuid_cur;
3514 3986
3515 unless ($value) { 3987 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3988 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3989 return;
3518 } 3990 }
3519 3991
3520 my $value = uuid_str $value + $uuid_skip; 3992 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3993 $uuid_skip = 0;
3531 or return; 4003 or return;
3532 4004
3533 aio_rename "$uuid~", $uuid 4005 aio_rename "$uuid~", $uuid
3534 and return; 4006 and return;
3535 4007
3536 warn "uuid file written ($value).\n"; 4008 trace "uuid file written ($value).\n";
3537 4009
3538 1 4010 1
3539 4011
3540} 4012}
3541 4013
3547} 4019}
3548 4020
3549sub emergency_save() { 4021sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 4022 my $freeze_guard = cf::freeze_mainloop;
3551 4023
3552 warn "emergency_perl_save: enter\n"; 4024 info "emergency_perl_save: enter\n";
4025
4026 # this is a trade-off: we want to be very quick here, so
4027 # save all maps without fsync, and later call a global sync
4028 # (which in turn might be very very slow)
4029 local $USE_FSYNC = 0;
3553 4030
3554 cf::sync_job { 4031 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 4032 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 4033
3560 # use a peculiar iteration method to avoid tripping on perl 4034 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 4035 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 4036 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 4037 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 4038 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 4039 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 4040 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4041 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 4042 $pl->save;
3569 } 4043 }
3570 warn "emergency_perl_save: end player save\n"; 4044 info "emergency_perl_save: end player save\n";
3571 4045
4046 cf::write_runtime_sync; # external watchdog should not bark
4047
3572 warn "emergency_perl_save: begin map save\n"; 4048 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 4049 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 4050 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 4051 $map->valid or next;
3576 $map->save; 4052 $map->save;
3577 } 4053 }
3578 warn "emergency_perl_save: end map save\n"; 4054 info "emergency_perl_save: end map save\n";
3579 4055
4056 cf::write_runtime_sync; # external watchdog should not bark
4057
3580 warn "emergency_perl_save: begin database checkpoint\n"; 4058 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 4059 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 4060 info "emergency_perl_save: end database checkpoint\n";
3583 4061
3584 warn "emergency_perl_save: begin write uuid\n"; 4062 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 4063 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 4064 info "emergency_perl_save: end write uuid\n";
4065
4066 cf::write_runtime_sync; # external watchdog should not bark
4067
4068 trace "emergency_perl_save: syncing database to disk";
4069 BDB::db_env_txn_checkpoint $DB_ENV;
4070
4071 info "emergency_perl_save: starting sync\n";
4072 IO::AIO::aio_sync sub {
4073 info "emergency_perl_save: finished sync\n";
4074 };
4075
4076 cf::write_runtime_sync; # external watchdog should not bark
4077
4078 trace "emergency_perl_save: flushing outstanding aio requests";
4079 while (IO::AIO::nreqs || BDB::nreqs) {
4080 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4081 }
4082
4083 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 4084 };
3588 4085
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 4086 info "emergency_perl_save: leave\n";
3595} 4087}
3596 4088
3597sub post_cleanup { 4089sub post_cleanup {
3598 my ($make_core) = @_; 4090 my ($make_core) = @_;
3599 4091
4092 IO::AIO::flush;
4093
3600 warn Carp::longmess "post_cleanup backtrace" 4094 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 4095 if $make_core;
3602 4096
3603 my $fh = pidfile; 4097 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 4098 unlink $PIDFILE if <$fh> == $$;
3605} 4099}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4119 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 4120 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 4121 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4122# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 4123 }
3630 warn "cleared package $pkg\n";#d#
3631} 4124}
3632 4125
3633sub do_reload_perl() { 4126sub do_reload_perl() {
3634 # can/must only be called in main 4127 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 4128 unless (in_main) {
3636 warn "can only reload from main coroutine"; 4129 error "can only reload from main coroutine";
3637 return; 4130 return;
3638 } 4131 }
3639 4132
3640 return if $RELOAD++; 4133 return if $RELOAD++;
3641 4134
3642 my $t1 = EV::time; 4135 my $t1 = AE::time;
3643 4136
3644 while ($RELOAD) { 4137 while ($RELOAD) {
3645 warn "reloading..."; 4138 cf::get_slot 0.1, -1, "reload_perl";
4139 info "perl_reload: reloading...";
3646 4140
3647 warn "entering sync_job"; 4141 trace "perl_reload: entering sync_job";
3648 4142
3649 cf::sync_job { 4143 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 4144 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 4145
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 4146 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 4147 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 4148 %EXT_CORO = ();
3667 4149
3668 warn "removing commands"; 4150 trace "perl_reload: removing commands";
3669 %COMMAND = (); 4151 %COMMAND = ();
3670 4152
3671 warn "removing ext/exti commands"; 4153 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 4154 %EXTCMD = ();
3673 %EXTICMD = (); 4155 %EXTICMD = ();
3674 4156
3675 warn "unloading/nuking all extensions"; 4157 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 4158 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 4159 trace "... unloading $pkg";
3678 4160
3679 if (my $cb = $pkg->can ("unload")) { 4161 if (my $cb = $pkg->can ("unload")) {
3680 eval { 4162 eval {
3681 $cb->($pkg); 4163 $cb->($pkg);
3682 1 4164 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 4165 } or error "$pkg unloaded, but with errors: $@";
3684 } 4166 }
3685 4167
3686 warn "... clearing $pkg"; 4168 trace "... clearing $pkg";
3687 clear_package $pkg; 4169 clear_package $pkg;
3688 } 4170 }
3689 4171
3690 warn "unloading all perl modules loaded from $LIBDIR"; 4172 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 4173 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4174 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 4175
3694 warn "... unloading $k"; 4176 trace "... unloading $k";
3695 delete $INC{$k}; 4177 delete $INC{$k};
3696 4178
3697 $k =~ s/\.pm$//; 4179 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 4180 $k =~ s/\//::/g;
3699 4181
3702 } 4184 }
3703 4185
3704 clear_package $k; 4186 clear_package $k;
3705 } 4187 }
3706 4188
3707 warn "getting rid of safe::, as good as possible"; 4189 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 4190 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4191 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 4192
3711 warn "unloading cf.pm \"a bit\""; 4193 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 4194 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 4195 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 4196
3715 # don't, removes xs symbols, too, 4197 # don't, removes xs symbols, too,
3716 # and global variables created in xs 4198 # and global variables created in xs
3717 #clear_package __PACKAGE__; 4199 #clear_package __PACKAGE__;
3718 4200
3719 warn "unload completed, starting to reload now"; 4201 info "perl_reload: unload completed, starting to reload now";
3720 4202
3721 warn "reloading cf.pm"; 4203 trace "perl_reload: reloading cf.pm";
3722 require cf; 4204 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4205 cf::_connect_to_perl_1;
3724 4206
3725 warn "loading config and database again"; 4207 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 4208 cf::reload_config;
3727 4209
3728 warn "loading extensions"; 4210 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 4211 cf::load_extensions;
3730 4212
3731 if ($REATTACH_ON_RELOAD) { 4213 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 4214 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 4215 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 4216 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 4217 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 4218 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 4219 reattach $_ for values %PLAYER;
3738 } 4220 }
3739 4221
3740 warn "running post_init jobs"; 4222 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4223
3743 warn "leaving sync_job"; 4224 trace "perl_reload: leaving sync_job";
3744 4225
3745 1 4226 1
3746 } or do { 4227 } or do {
3747 warn $@; 4228 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4229 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4230 };
3750 4231
3751 warn "reloaded";
3752 --$RELOAD; 4232 --$RELOAD;
3753 } 4233 }
3754 4234
3755 $t1 = EV::time - $t1; 4235 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4236 info "perl_reload: completed in ${t1}s\n";
3757}; 4237};
3758 4238
3759our $RELOAD_WATCHER; # used only during reload 4239our $RELOAD_WATCHER; # used only during reload
3760 4240
3761sub reload_perl() { 4241sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4243 # coro crashes during coro_state_free->destroy here.
3764 4244
3765 $RELOAD_WATCHER ||= cf::async { 4245 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4246 Coro::AIO::aio_wait cache_extensions;
3767 4247
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4248 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4249 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4250 undef $RELOAD_WATCHER;
3771 }; 4251 };
3772 }; 4252 };
3773} 4253}
3782 reload_perl; 4262 reload_perl;
3783 }; 4263 };
3784 } 4264 }
3785}; 4265};
3786 4266
3787unshift @INC, $LIBDIR; 4267#############################################################################
3788 4268
3789my $bug_warning = 0; 4269my $bug_warning = 0;
3790 4270
3791our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN;
3793
3794sub wait_for_tick { 4271sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4272 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3796 4273
3797 my $signal = new Coro::Signal; 4274 $WAIT_FOR_TICK->wait;
3798 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait;
3800} 4275}
3801 4276
3802sub wait_for_tick_begin { 4277sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4278 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3804 4279
3805 my $signal = new Coro::Signal; 4280 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4281 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4282 $signal->wait;
3808} 4283}
3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4287 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3813 unless ++$bug_warning > 10; 4288 unless ++$bug_warning > 10;
3814 return; 4289 return;
3815 } 4290 }
3816 4291
3817 cf::server_tick; # one server iteration 4292 cf::one_tick; # one server iteration
4293
4294 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3818 4295
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4296 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4297 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4298 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4299 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4300 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4301 or error "ERROR: unable to write runtime file: $!";
3825 }; 4302 };
3826 } 4303 }
3827 4304
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4305 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4306 $sig->send;
3830 } 4307 }
3831 while (my $sig = shift @WAIT_FOR_TICK) { 4308 $WAIT_FOR_TICK->broadcast;
3832 $sig->send;
3833 }
3834 4309
3835 $LOAD = ($NOW - $TICK_START) / $TICK; 4310 $LOAD = ($NOW - $TICK_START) / $TICK;
3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4311 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3837 4312
3838 if (0) { 4313 if (0) {
3839 if ($NEXT_TICK) { 4314 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4315 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4316 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4317 debug "jitter $JITTER\n";#d#
3843 } 4318 }
3844 } 4319 }
3845} 4320}
3846 4321
3847{ 4322{
3848 # configure BDB 4323 # configure BDB
4324 info "initialising database";
3849 4325
3850 BDB::min_parallel 8; 4326 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4327 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4328 #$AnyEvent::BDB::WATCHER->priority (1);
3853 4329
3854 unless ($DB_ENV) { 4330 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4331 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4332 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4333 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4358 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3883 }; 4359 };
3884 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4360 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3885 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4361 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3886 }; 4362 };
4363
4364 info "database initialised";
3887} 4365}
3888 4366
3889{ 4367{
3890 # configure IO::AIO 4368 # configure IO::AIO
3891 4369
4370 info "initialising aio";
3892 IO::AIO::min_parallel 8; 4371 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4372 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4373 undef $AnyEvent::AIO::WATCHER;
4374 info "aio initialised";
3895} 4375}
3896 4376
3897my $_log_backtrace; 4377our $_log_backtrace;
4378our $_log_backtrace_last;
3898 4379
3899sub _log_backtrace { 4380sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4381 my ($msg, @addr) = @_;
3901 4382
3902 $msg =~ s/\n//; 4383 $msg =~ s/\n$//;
3903 4384
4385 if ($_log_backtrace_last eq $msg) {
4386 LOG llevInfo, "[ABT] $msg\n";
4387 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4388 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4389 } elsif ($_log_backtrace < 2) {
4390 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4391 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4392 my $perl_bt = Carp::longmess $msg;
3908 async { 4393 async {
3909 $Coro::current->{desc} = "abt $msg"; 4394 $Coro::current->{desc} = "abt $msg";
3910 4395
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4415 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4416 --$_log_backtrace;
3932 }; 4417 };
3933 } else { 4418 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4419 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4420 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4421 }
3937} 4422}
3938 4423
3939# load additional modules 4424# load additional modules
3940use cf::pod; 4425require "cf/$_.pm" for @EXTRA_MODULES;
4426cf::_connect_to_perl_2;
3941 4427
3942END { cf::emergency_save } 4428END { cf::emergency_save }
3943 4429
39441 44301
3945 4431

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines