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.473 by root, Fri Jun 26 16:32:10 2009 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 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 qw(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; 63use Time::HiRes;
61use Compress::LZF; 64use Compress::LZF;
62use Digest::MD5 (); 65use Digest::MD5 ();
63 66
72 75
73# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
78 86
79our %COMMAND = (); 87our %COMMAND = ();
80our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
81 89
82our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
87 95
88our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
90 100
91our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
92our $DATADIR = datadir; 103our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
96our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 116
105our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
106 124
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 127our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 133our $DB_ENV;
116 134
117our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 136
119our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
120 139
121our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
123our $NOW; 143our $NOW;
124 144
125our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 154our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
136 156
137our @POST_INIT; 157our @POST_INIT;
138 158
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
140 164
141binmode STDOUT; 165binmode STDOUT;
142binmode STDERR; 166binmode STDERR;
143 167
144# read virtual server time, if available 168# read virtual server time, if available
155 179
156our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
157 181
158sub cf::map::normalise; 182sub cf::map::normalise;
159 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
160############################################################################# 188#############################################################################
161 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
162=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
163 202
164=over 4 203=over 4
165 204
166=item $cf::UPTIME 205=item $cf::UPTIME
167 206
168The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
169 223
170=item $cf::RUNTIME 224=item $cf::RUNTIME
171 225
172The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
173every server tick. 227every server tick.
174 228
175=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
176$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
177$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
178 232
179Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
180directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
181unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
182database environment. 236database environment.
183 237
184=item $cf::NOW
185
186The time of the last (current) server tick.
187
188=item $cf::TICK
189
190The interval between server ticks, in seconds.
191
192=item $cf::LOADAVG 238=item $cf::LOADAVG
193 239
194The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
195(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
196objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
205from wherever your confdir points to. 251from wherever your confdir points to.
206 252
207=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
208 254
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
213=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
214 277
215This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 280that call.
218 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
219=back 288=back
220 289
221=cut 290=cut
222 291
223BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 299 my $msg = join "", @_;
226 300
227 $msg .= "\n" 301 $msg .= "\n"
228 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
229 303
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 305
232 LOG llevError, $msg; 306 LOG llevWarn, $msg;
233 }; 307};
234}
235 308
236$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
238 311
239 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 316 return;#d#
242 }#d# 317 }#d#
243 318
244 # kill coroutine otherwise 319 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 320 Coro::terminate
247}; 321};
248
249$SIG{__DIE__} = sub { }; #d#?
250 322
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 340)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 342}
271 343
272$EV::DIED = sub { 344$EV::DIED = sub {
273 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
274}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
275 352
276############################################################################# 353#############################################################################
277 354
278=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
279 356
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 378 $d
302 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
303} 380}
304 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
305=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
306 435
307Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
308 437
309=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 445
317sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
319 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
320=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
321 481
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
324 484
325The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 486is a reload or not.
327 487
328=cut 488=cut
329 489
330sub post_init(&) { 490sub post_init(&) {
331 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
332} 509}
333 510
334=item cf::lock_wait $string 511=item cf::lock_wait $string
335 512
336Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
375} 552}
376 553
377=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
378 555
379Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 557get spread over time.
381 558
382=cut 559=cut
383 560
384sub periodic($$) { 561sub periodic($$) {
385 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
390} 567}
391 568
392=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
393 570
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
396of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
397 578
398The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
400 581
401Useful for short background jobs. 582Useful for short background jobs.
402 583
403=cut 584=cut
404 585
405our @SLOT_QUEUE; 586our @SLOT_QUEUE;
406our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
407 589
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
411 593
412 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
413 596
414 while () { 597 while () {
415 next_job: 598 next_job:
599
416 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 601
418 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 606 $job->[2]->send;
422 Coro::cede; 607 Coro::cede;
423 goto next_job; 608 goto next_job;
424 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 611 }
426 } 612 }
427 613
428 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
431 $signal->wait;
432 } else { 617 } else {
618 $busy = 0;
433 Coro::schedule; 619 Coro::schedule;
434 } 620 }
435 } 621 }
436}; 622};
437 623
438sub get_slot($;$$) { 624sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
440 626
441 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
442 628
443 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
444 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
445 632
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
474=cut 661=cut
475 662
476sub sync_job(&) { 663sub sync_job(&) {
477 my ($job) = @_; 664 my ($job) = @_;
478 665
479 if ($Coro::current == $Coro::main) { 666 if (in_main) {
480 my $time = EV::time; 667 my $time = AE::time;
481 668
482 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
484 671
485 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
486 673
487 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
488 675
489 my $busy = 1; 676 my $busy = 1;
490 my @res; 677 my @res;
491 678
492 (async { 679 (async {
493 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 681 @res = eval { $job->() };
495 warn $@ if $@; 682 error $@ if $@;
496 undef $busy; 683 undef $busy;
497 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
498 685
499 while ($busy) { 686 while ($busy) {
500 if (Coro::nready) { 687 if (Coro::nready) {
502 } else { 689 } else {
503 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
504 } 691 }
505 } 692 }
506 693
507 my $time = EV::time - $time; 694 my $time = AE::time - $time;
508 695
509 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
510 697
511 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
512 } else { 699 } else {
534 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
535 722
536 $coro 723 $coro
537} 724}
538 725
539=item fork_call { }, $args 726=item fork_call { }, @args
540 727
541Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 731never block itself or use any form of event handling.
545 732
546=cut 733=cut
547 734
735sub post_fork {
736 reset_signals;
737}
738
548sub fork_call(&@) { 739sub fork_call(&@) {
549 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
550 741
551 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
554 745
555 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
556 reset_signals; 747 cf::post_fork;
557 &$cb 748 &$cb
558 }, @args; 749 } @args;
559 750
560 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
561} 763}
562 764
563=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
564 766
565=cut 767=cut
602within each server. 804within each server.
603 805
604=cut 806=cut
605 807
606sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
607 my ($name) = @_; 812 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
609 814
610 eval { 815 eval {
611 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
621} 826}
622 827
623our $DB; 828our $DB;
624 829
625sub db_init { 830sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
628 };
629} 832}
630 833
631sub db_get($$) { 834sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
633 836
634 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
635 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
636 841
637 $! ? () 842 $! ? ()
638 : $data 843 : $data
639 }
640} 844}
641 845
642sub db_put($$$) { 846sub db_put($$$) {
643 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 876
673 my @data; 877 my @data;
674 my $md5; 878 my $md5;
675 879
676 for (0 .. $#$src) { 880 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 882 }
680 883
681 # if processing is expensive, check 884 # if processing is expensive, check
682 # checksum first 885 # checksum first
683 if (1) { 886 if (1) {
700 903
701 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 905 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
704 907
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 909
707 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
710 913
720 923
721=cut 924=cut
722 925
723sub datalog($@) { 926sub datalog($@) {
724 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 929}
727 930
728=back 931=back
729 932
730=cut 933=cut
925 1128
926 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1131
929 } elsif (ref $type) { 1132 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
931 1134
932 } else { 1135 } else {
933 shift @arg; 1136 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
935 } 1138 }
936 } 1139 }
937} 1140}
938 1141
939sub _object_attach { 1142sub _object_attach {
949 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
950 } 1153 }
951 1154
952 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
953 } else { 1156 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1158 }
956 1159
957 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
958} 1161}
959 1162
1018 1221
1019 for (@$callbacks) { 1222 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1021 1224
1022 if ($@) { 1225 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1227 override;
1026 } 1228 }
1027 1229
1028 return 1 if $override; 1230 return 1 if $override;
1029 } 1231 }
1108 for (@$attach) { 1310 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1111 } 1313 }
1112 } else { 1314 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1316 }
1115 } 1317 }
1116} 1318}
1117 1319
1118cf::attachable->attach ( 1320cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1146 1348
1147 sync_job { 1349 sync_job {
1148 if (length $$rdata) { 1350 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1152 1355
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1179 1382
1180 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1385 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1184 } 1387 }
1185 } else { 1388 } else {
1186 aio_unlink $filename; 1389 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1188 } 1391 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1416 $av = $st->{objs};
1214 } 1417 }
1215 1418
1216 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1219 1423
1220 ($data, $av) 1424 ($data, $av)
1221} 1425}
1222 1426
1223=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1282} 1486}
1283 1487
1284use File::Glob (); 1488use File::Glob ();
1285 1489
1286cf::player->attach ( 1490cf::player->attach (
1287 on_command => sub { 1491 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1289 1493
1290 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1291 or return; 1495 or return;
1292 1496
1300 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1301 1505
1302 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1303 1507
1304 if (ref $msg) { 1508 if (ref $msg) {
1305 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1306 "ARRAY" eq ref $msg
1307 ? @$msg
1308 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1309 1510
1310 my @reply; 1511 my @reply;
1311 1512
1312 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1313 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1315 1516
1316 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1317 if $reply; 1518 if $reply;
1318 1519
1319 } else { 1520 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1522 }
1322 1523
1323 cf::override; 1524 cf::override;
1324 }, 1525 },
1325); 1526);
1335 }; 1536 };
1336 1537
1337 $grp 1538 $grp
1338} 1539}
1339 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1340sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1341 cf::sync_job { 1557 cf::sync_job {
1342 my %todo; 1558 my %todo;
1343 1559
1344 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1561 next unless -r $path;
1363 1579
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1582
1367 $ext{source} = 1583 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1370 . $source 1586 . $source
1371 . "\n};\n1"; 1587 . "\n};\n1";
1372 1588
1373 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1374 } 1590 }
1375 1591
1592 my $pass = 0;
1376 my %done; 1593 my %done;
1377 while (%todo) { 1594 while (%todo) {
1378 my $progress; 1595 my $progress;
1379 1596
1597 ++$pass;
1598
1599 ext:
1380 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1602 next ext
1383 unless exists $done{$_}; 1603 unless exists $done{$_};
1384 } 1604 }
1385 1605
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1607
1388 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1621
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1623 if exists $v->{meta}{mandatory};
1396 1624
1397 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1398 } 1634 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1635 }
1404 1636
1405 skip: 1637 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1408 } 1647 }
1409 }; 1648 };
1410} 1649}
1411 1650
1412############################################################################# 1651#############################################################################
1496 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1497 } 1736 }
1498 } 1737 }
1499} 1738}
1500 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1501sub save($) { 1753sub save($) {
1502 my ($pl) = @_; 1754 my ($pl) = @_;
1503 1755
1504 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1505 1757
1510 1762
1511 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1513 1765
1514 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1515 1770
1516 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1772 cf::cede_to_tick;
1518} 1773}
1519 1774
1553 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1554 1809
1555 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1557 1812
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1814 $pl->deactivate;
1815
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1563 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1564 1821
1565 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1621 \@logins 1878 \@logins
1622} 1879}
1623 1880
1624=item $player->maps 1881=item $player->maps
1625 1882
1883=item cf::player::maps $login
1884
1626Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1627player. May block. 1886player. May block.
1628 1887
1629=cut 1888=cut
1630 1889
1692=cut 1951=cut
1693 1952
1694sub find_by_path($) { 1953sub find_by_path($) {
1695 my ($path) = @_; 1954 my ($path) = @_;
1696 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1697 my ($match, $specificity); 1958 my ($match, $specificity);
1698 1959
1699 for my $region (list) { 1960 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1729sub generate_random_map { 1990sub generate_random_map {
1730 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1731 1992
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733 1994
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 1996}
1749 1997
1750=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1751 1999
1752Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1757 2005
1758sub register { 2006sub register {
1759 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 2008 my $pkg = caller;
1761 2009
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 2011
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 2013}
1767 2014
1768# also paths starting with '/' 2015# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 2017
1771sub thawer_merge { 2018sub thawer_merge {
1772 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1773 2020
1774 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1779} 2026}
1780 2027
1781sub normalise { 2028sub normalise {
1782 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1783 2030
1784 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1785 2032
1786 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1787 2034
1788 # map plan: 2035 # map plan:
1789 # 2036 #
1804 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 2052 $path = "$base/$path";
1806 } 2053 }
1807 2054
1808 for ($path) { 2055 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1812 } 2058 }
1813 2059
1814 $path 2060 $path
1828 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1829 return $self; 2075 return $self;
1830 } 2076 }
1831 } 2077 }
1832 2078
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 2080 ()
1835} 2081}
1836 2082
2083# may re-bless or do other evil things
1837sub init { 2084sub init {
1838 my ($self) = @_; 2085 my ($self) = @_;
1839 2086
1840 $self 2087 $self
1841} 2088}
1906 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1907 2154
1908 1 2155 1
1909} 2156}
1910 2157
2158# used to laod the header of an original map
1911sub load_header_orig { 2159sub load_header_orig {
1912 my ($self) = @_; 2160 my ($self) = @_;
1913 2161
1914 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1915} 2163}
1916 2164
2165# used to laod the header of an instantiated map
1917sub load_header_temp { 2166sub load_header_temp {
1918 my ($self) = @_; 2167 my ($self) = @_;
1919 2168
1920 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1921} 2170}
1922 2171
2172# called after loading the header from an instantiated map
1923sub prepare_temp { 2173sub prepare_temp {
1924 my ($self) = @_; 2174 my ($self) = @_;
1925 2175
1926 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1927 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1928 # safety 2178 # safety
1929 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1930 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1931} 2181}
1932 2182
2183# called after loading the header from an original map
1933sub prepare_orig { 2184sub prepare_orig {
1934 my ($self) = @_; 2185 my ($self) = @_;
1935 2186
1936 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1937 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1961 2212
1962sub find; 2213sub find;
1963sub find { 2214sub find {
1964 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1965 2216
2217 cf::cede_to_tick;
2218
1966 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1967 2220
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2223
1971 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1988 2241
1989 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1990 } 2243 }
1991} 2244}
1992 2245
1993sub pre_load { } 2246sub pre_load { }
1994sub post_load { } 2247#sub post_load { } # XS
1995 2248
1996sub load { 2249sub load {
1997 my ($self) = @_; 2250 my ($self) = @_;
1998 2251
1999 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2002 2255
2003 { 2256 {
2004 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2005 2258
2006 return unless $self->valid; 2259 return unless $self->valid;
2007 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2008
2009 $self->in_memory (cf::MAP_LOADING);
2010 2261
2011 $self->alloc; 2262 $self->alloc;
2012 2263
2013 $self->pre_load; 2264 $self->pre_load;
2014 cf::cede_to_tick; 2265 cf::cede_to_tick;
2015 2266
2267 if (exists $self->{load_path}) {
2016 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block; 2269 $f->skip_block;
2018 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2019 or return; 2271 or return;
2020 2272
2021 $self->post_load_original 2273 $self->post_load_original
2022 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2023 2275
2024 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2025 utf8::encode $uniq; 2277 utf8::encode $uniq;
2026 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2028 $self->clear_unique_items; 2280 $self->clear_unique_items;
2029 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2031 } 2284 }
2032 } 2285 }
2033 }
2034 2286
2035 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2036 2294
2037 cf::cede_to_tick; 2295 cf::cede_to_tick;
2038 # now do the right thing for maps 2296 # now do the right thing for maps
2039 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2040 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2044 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2045 $self->decay_objects; 2303 $self->decay_objects;
2046 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2047 $self->update_buttons; 2305 $self->update_buttons;
2048 cf::cede_to_tick; 2306 cf::cede_to_tick;
2049 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2050 } 2308 }
2051 2309
2052 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2054
2055 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2312 }
2057 2313
2058 $self->post_load; 2314 $self->post_load;
2059}
2060 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2061sub customise_for { 2322sub customise_for {
2062 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2063 2324
2064 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2326 if $self->per_player;
2068# if $self->per_party; 2329# if $self->per_party;
2069 2330
2070 $self 2331 $self
2071} 2332}
2072 2333
2073# find and load all maps in the 3x3 area around a map
2074sub load_neighbours {
2075 my ($map) = @_;
2076
2077 my @neigh; # diagonal neighbours
2078
2079 for (0 .. 3) {
2080 my $neigh = $map->tile_path ($_)
2081 or next;
2082 $neigh = find $neigh, $map
2083 or next;
2084 $neigh->load;
2085
2086 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 }
2090
2091 for (grep defined $_->[0], @neigh) {
2092 my ($path, $origin) = @$_;
2093 my $neigh = find $path, $origin
2094 or next;
2095 $neigh->load;
2096 }
2097}
2098
2099sub find_sync { 2334sub find_sync {
2100 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2101 2336
2102 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2103} 2342}
2104 2343
2105sub do_load_sync { 2344sub do_load_sync {
2106 my ($map) = @_; 2345 my ($map) = @_;
2107 2346
2347 # it's a bug to call this from the main context
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2110 2350
2111 cf::sync_job { $map->load }; 2351 $map->load;
2112} 2352}
2113 2353
2114our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2116 2356
2117sub find_async { 2357sub find_async {
2118 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2119 2359
2120 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2121 2361
2122 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2124 } 2364 }
2125 2365
2126 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2127 2367
2128 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2142 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2143 2383
2144 () 2384 ()
2145} 2385}
2146 2386
2387# common code, used by both ->save and ->swapout
2147sub save { 2388sub _save {
2148 my ($self) = @_; 2389 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2390
2152 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2153 2392
2154 return unless $self->dirty; 2393 return unless $self->dirty;
2155 2394
2175 } else { 2414 } else {
2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 } 2416 }
2178} 2417}
2179 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2180sub swap_out { 2427sub swap_out {
2181 my ($self) = @_; 2428 my ($self) = @_;
2182 2429
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2188 return if $self->players; 2434 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2190 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2191 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2192 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2193 2486
2194 $self->deactivate; 2487 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2489 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2490
2242 $self->unlink_save; 2491 $self->unlink_save;
2243 $self->destroy; 2492 $self->destroy;
2244} 2493}
2245 2494
2253 2502
2254 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2255 2504
2256 $self->unlink_save; 2505 $self->unlink_save;
2257 2506
2258 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2512
2320 : normalise $_ 2569 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2571 ]
2323} 2572}
2324 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2325=back 2606=back
2326 2607
2327=head3 cf::object 2608=head3 cf::object
2328 2609
2329=cut 2610=cut
2461 2742
2462Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2463 2744
2464The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2465for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2467map. 2748map.
2468 2749
2469Will never block. 2750Will never block.
2470 2751
2471=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2493 my ($self) = @_; 2774 my ($self) = @_;
2494 2775
2495 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2496 2777
2778 ++$self->{_link_recursion};
2779
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2781
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2501 2784
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2786}
2504 2787
2505sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2507 2790
2524 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2526 2809
2527 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2530 2813
2531 $map->load; 2814 $map->load;
2532 $map->load_neighbours;
2533 2815
2534 return unless $self->contr->active; 2816 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2817
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2540} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2541 2825
2826}
2827
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2543 2829
2544Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2545her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2546that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2547the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2554 2840
2555our $GOTOGEN; 2841our $GOTOGEN;
2556 2842
2557sub cf::object::player::goto { 2843sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2559 2851
2560 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2854
2563 $self->enter_link; 2855 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2584 } 2876 }
2585 } 2877 }
2586 2878
2587 my $map = eval { 2879 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2881
2590 if ($map) { 2882 if ($map) {
2591 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2885 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2887 }
2596 2888
2597 $map 2889 $map
2605 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2608 } 2900 }
2609 2901
2610 $done->() if $done; 2902 $done->($self) if $done;
2611 })->prio (1); 2903 })->prio (1);
2612} 2904}
2613 2905
2614=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2615 2907
2683 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2684 2976
2685 unless (eval { 2977 unless (eval {
2686 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2687 2979
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2697 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2699 3006
2700 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2701 3008
2702 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2708 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2710 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2712 3019
2713 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 3021 $self->leave_link;
2715 } 3022 }
2716 })->prio (1); 3023 })->prio (1);
2717} 3024}
2718 3025
2730sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2731 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2732 3039
2733 utf8::encode $text; 3040 utf8::encode $text;
2734 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2735} 3067}
2736 3068
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 3070
2739Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2743 3075
2744=cut 3076=cut
2745 3077
2746# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2748 "c/identify" => { 3086 "c/identify" => {
2749 id => "infobox", 3087 id => "infobox",
2750 title => "Identify", 3088 title => "Identify",
2751 reply => undef, 3089 reply => undef,
2752 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2754 "c/examine" => { 3092 "c/examine" => {
2755 id => "infobox", 3093 id => "infobox",
2756 title => "Examine", 3094 title => "Examine",
2757 reply => undef, 3095 reply => undef,
2758 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2759 }, 3103 },
2760 "c/book" => { 3104 "c/book" => {
2761 id => "infobox", 3105 id => "infobox",
2762 title => "Book", 3106 title => "Book",
2763 reply => undef, 3107 reply => undef,
2879 my $pkt = "msg " 3223 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3226 );
2883 3227
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2895} 3229}
2896 3230
2897=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2898 3232
2899Sends an ext event to the client. 3233Sends an ext event to the client.
2901=cut 3235=cut
2902 3236
2903sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2905 3239
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912} 3241}
2913 3242
2914=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
2915 3244
2916Sends an ext reply to the client. 3245Sends an ext reply to the client.
2918=cut 3247=cut
2919 3248
2920sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
2922 3251
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3253}
2931 3254
2932=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
2933 3256
2934Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
2989 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
2990 3313
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3315
2993 if (ref $msg) { 3316 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3318
2999 my @reply; 3319 my @reply;
3000 3320
3001 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3004 3324
3005 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3326 if $reply;
3007 3327
3008 } else { 3328 } else {
3009 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3010 } 3330 }
3011 3331
3012 cf::override; 3332 cf::override;
3013 }, 3333 },
3014); 3334);
3034 3354
3035 $coro 3355 $coro
3036} 3356}
3037 3357
3038cf::client->attach ( 3358cf::client->attach (
3039 on_destroy => sub { 3359 on_client_destroy => sub {
3040 my ($ns) = @_; 3360 my ($ns) = @_;
3041 3361
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3362 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3363 },
3044); 3364);
3060our $safe_hole = new Safe::Hole; 3380our $safe_hole = new Safe::Hole;
3061 3381
3062$SIG{FPE} = 'IGNORE'; 3382$SIG{FPE} = 'IGNORE';
3063 3383
3064$safe->permit_only (Opcode::opset qw( 3384$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3385 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3386 grepstart grepwhile mapstart mapwhile
3067 sort time 3387 sort time
3068)); 3388));
3069 3389
3070# here we export the classes and methods available to script code 3390# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3099) { 3419) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3422 for @funs;
3104} 3423}
3105 3424
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3441 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3442 $qcode =~ s/\n/\\n/g;
3124 3443
3125 %vars = (_dummy => 0) unless %vars; 3444 %vars = (_dummy => 0) unless %vars;
3126 3445
3446 my @res;
3127 local $_; 3447 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3448
3130 my $eval = 3449 my $eval =
3131 "do {\n" 3450 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3451 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3452 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3453 . $code
3135 . "\n}" 3454 . "\n}"
3136 ; 3455 ;
3137 3456
3457 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3458 sub_generation_inc;
3459 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3460 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3461 sub_generation_inc;
3462 } else {
3463 local @cf::_safe_eval_args = values %vars;
3464 @res = wantarray ? eval eval : scalar eval $eval;
3465 }
3141 3466
3142 if ($@) { 3467 if ($@) {
3143 warn "$@"; 3468 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3146 } 3471 }
3147 3472
3148 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3149} 3474}
3150 3475
3164=cut 3489=cut
3165 3490
3166sub register_script_function { 3491sub register_script_function {
3167 my ($fun, $cb) = @_; 3492 my ($fun, $cb) = @_;
3168 3493
3169 no strict 'refs'; 3494 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3495 *$fun = $safe_hole->wrap ($cb);
3171} 3496}
3172 3497
3173=back 3498=back
3174 3499
3175=cut 3500=cut
3176 3501
3177############################################################################# 3502#############################################################################
3178# the server's init and main functions 3503# the server's init and main functions
3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3179 3528
3180sub load_facedata($) { 3529sub load_facedata($) {
3181 my ($path) = @_; 3530 my ($path) = @_;
3182 3531
3183 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?) 3533 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3535
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3537
3189 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3190 3539
3191 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3541
3197 $facedata->{version} == 2 3542 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3544
3200 # patch in the exptable
3201 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3204 };
3205 cf::cede_to_tick; 3545 cf::cede_to_tick;
3206 3546
3207 { 3547 {
3208 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3209 3549
3210 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3553
3213 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3217 3560
3218 cf::cede_to_tick; 3561 cf::cede_to_tick;
3219 } 3562 }
3220 3563
3221 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3226 3569
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3573 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3575 }
3233 3576
3234 cf::cede_to_tick; 3577 cf::cede_to_tick;
3235 } 3578 }
3236 } 3579 }
3245 3588
3246 cf::anim::invalidate_all; # d'oh 3589 cf::anim::invalidate_all; # d'oh
3247 } 3590 }
3248 3591
3249 { 3592 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3253 3594
3254 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3599
3259 if ($info->{type} & 1) {
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3600 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3274 } else { 3604 } else {
3275 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3276 } 3606 }
3277 3607
3278 cf::cede_to_tick; 3608 cf::cede_to_tick;
3279 } 3609 }
3280 } 3610 }
3281 3611
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3613
3284 1 3614 1
3285} 3615}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3616
3307register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3309 3619
3310 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3318 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3630 cf::arch::commit_load;
3321 3631
3322 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3323} 3646}
3324 3647
3325sub reload_regions { 3648sub reload_regions {
3326 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3327 # for this (global event?) 3650 # for this (global event?)
3342} 3665}
3343 3666
3344sub reload_archetypes { 3667sub reload_archetypes {
3345 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3346 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3347} 3679}
3348 3680
3349sub reload_treasures { 3681sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3352} 3684}
3353 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3354sub reload_resources { 3768sub reload_resources {
3355 warn "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3356 3770
3771 reload_materials;
3357 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3774 reload_sound;
3358 reload_archetypes; 3775 reload_archetypes;
3359 reload_regions; 3776 reload_regions;
3360 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3361 3779
3362 warn "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3363} 3781}
3364 3782
3365sub reload_config { 3783sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3784 trace "reloading config file...\n";
3367 or return;
3368 3785
3369 local $/; 3786 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3787 utf8::decode $config;
3788 *CFG = decode_yaml $config;
3371 3789
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3790 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3791
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3792 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3793 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3794
3377 if (exists $CFG{mlockall}) { 3795 if (exists $CFG{mlockall}) {
3400 3818
3401 seek $fh, 0, 0; 3819 seek $fh, 0, 0;
3402 print $fh $$; 3820 print $fh $$;
3403} 3821}
3404 3822
3823sub main_loop {
3824 trace "EV::loop starting\n";
3825 if (1) {
3826 EV::loop;
3827 }
3828 trace "EV::loop returned\n";
3829 goto &main_loop unless $REALLY_UNLOOP;
3830}
3831
3405sub main { 3832sub main {
3406 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3407 3834
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412 3839
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 3841
3420 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3423 (async { 3845 (async {
3424 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3426 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
3427 }; 3849 };
3428 3850
3429 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3430 3852
3431 cf::sync_job { 3853 cf::sync_job {
3854 cf::incloader::init ();
3855
3856 db_init;
3857
3858 cf::init_anim;
3859 cf::init_attackmess;
3860 cf::init_dynamic;
3861
3862 cf::load_settings;
3863
3432 reload_resources; 3864 reload_resources;
3433 reload_config; 3865 reload_config;
3434 db_init;
3435 3866
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3867 cf::init_uuid;
3439 cf::init_signals; 3868 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3869 cf::init_skills;
3442 3870
3443 cf::init_beforeplay; 3871 cf::init_beforeplay;
3444 3872
3445 atomic; 3873 atomic;
3447 load_extensions; 3875 load_extensions;
3448 3876
3449 utime time, time, $RUNTIMEFILE; 3877 utime time, time, $RUNTIMEFILE;
3450 3878
3451 # no (long-running) fork's whatsoever before this point(!) 3879 # no (long-running) fork's whatsoever before this point(!)
3880 use POSIX ();
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3881 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453 3882
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3883 cf::_post_init 0;
3455 }; 3884 };
3456 3885
3457 EV::loop; 3886 cf::object::thawer::errors_are_fatal 0;
3887 info "parse errors in files are no longer fatal from this point on.\n";
3888
3889 AE::postpone {
3890 undef &main; # free gobs of memory :)
3891 };
3892
3893 goto &main_loop;
3458} 3894}
3459 3895
3460############################################################################# 3896#############################################################################
3461# initialisation and cleanup 3897# initialisation and cleanup
3462 3898
3463# install some emergency cleanup handlers 3899# install some emergency cleanup handlers
3464BEGIN { 3900BEGIN {
3465 our %SIGWATCHER = (); 3901 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3902 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3903 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3904 cf::cleanup "SIG$signal";
3469 }; 3905 };
3470 } 3906 }
3471} 3907}
3472 3908
3473sub write_runtime_sync { 3909sub write_runtime_sync {
3910 my $t0 = AE::time;
3911
3474 # first touch the runtime file to show we are still running: 3912 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3913 # the fsync below can take a very very long time.
3476 3914
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3915 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3916
3479 my $guard = cf::lock_acquire "write_runtime"; 3917 my $guard = cf::lock_acquire "write_runtime";
3480 3918
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3919 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3920 or return;
3483 3921
3484 my $value = $cf::RUNTIME + 90 + 10; 3922 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3923 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3924 # 60 allows for the watchdog to kill the server.
3499 or return; 3937 or return;
3500 3938
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3939 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3940 and return;
3503 3941
3504 warn "runtime file written.\n"; 3942 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3943
3506 1 3944 1
3507} 3945}
3508 3946
3509our $uuid_lock; 3947our $uuid_lock;
3521 or return; 3959 or return;
3522 3960
3523 my $value = uuid_seq uuid_cur; 3961 my $value = uuid_seq uuid_cur;
3524 3962
3525 unless ($value) { 3963 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 3964 info "cowardly refusing to write zero uuid value!\n";
3527 return; 3965 return;
3528 } 3966 }
3529 3967
3530 my $value = uuid_str $value + $uuid_skip; 3968 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 3969 $uuid_skip = 0;
3541 or return; 3979 or return;
3542 3980
3543 aio_rename "$uuid~", $uuid 3981 aio_rename "$uuid~", $uuid
3544 and return; 3982 and return;
3545 3983
3546 warn "uuid file written ($value).\n"; 3984 trace "uuid file written ($value).\n";
3547 3985
3548 1 3986 1
3549 3987
3550} 3988}
3551 3989
3557} 3995}
3558 3996
3559sub emergency_save() { 3997sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 3998 my $freeze_guard = cf::freeze_mainloop;
3561 3999
3562 warn "emergency_perl_save: enter\n"; 4000 info "emergency_perl_save: enter\n";
4001
4002 # this is a trade-off: we want to be very quick here, so
4003 # save all maps without fsync, and later call a global sync
4004 # (which in turn might be very very slow)
4005 local $USE_FSYNC = 0;
3563 4006
3564 cf::sync_job { 4007 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 4008 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 4009
3570 # use a peculiar iteration method to avoid tripping on perl 4010 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 4011 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 4012 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 4013 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 4014 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 4015 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 4016 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4017 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 4018 $pl->save;
3579 } 4019 }
3580 warn "emergency_perl_save: end player save\n"; 4020 info "emergency_perl_save: end player save\n";
3581 4021
4022 cf::write_runtime_sync; # external watchdog should not bark
4023
3582 warn "emergency_perl_save: begin map save\n"; 4024 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 4025 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 4026 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 4027 $map->valid or next;
3586 $map->save; 4028 $map->save;
3587 } 4029 }
3588 warn "emergency_perl_save: end map save\n"; 4030 info "emergency_perl_save: end map save\n";
3589 4031
4032 cf::write_runtime_sync; # external watchdog should not bark
4033
3590 warn "emergency_perl_save: begin database checkpoint\n"; 4034 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 4035 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 4036 info "emergency_perl_save: end database checkpoint\n";
3593 4037
3594 warn "emergency_perl_save: begin write uuid\n"; 4038 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 4039 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n"; 4040 info "emergency_perl_save: end write uuid\n";
4041
4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 trace "emergency_perl_save: syncing database to disk";
4045 BDB::db_env_txn_checkpoint $DB_ENV;
4046
4047 info "emergency_perl_save: starting sync\n";
4048 IO::AIO::aio_sync sub {
4049 info "emergency_perl_save: finished sync\n";
4050 };
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 trace "emergency_perl_save: flushing outstanding aio requests";
4055 while (IO::AIO::nreqs || BDB::nreqs) {
4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4057 }
4058
4059 cf::write_runtime_sync; # external watchdog should not bark
3597 }; 4060 };
3598 4061
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 4062 info "emergency_perl_save: leave\n";
3605} 4063}
3606 4064
3607sub post_cleanup { 4065sub post_cleanup {
3608 my ($make_core) = @_; 4066 my ($make_core) = @_;
3609 4067
4068 IO::AIO::flush;
4069
3610 warn Carp::longmess "post_cleanup backtrace" 4070 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 4071 if $make_core;
3612 4072
3613 my $fh = pidfile; 4073 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 4074 unlink $PIDFILE if <$fh> == $$;
3615} 4075}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4095 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 4096 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 4097 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4098# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 4099 }
3640 warn "cleared package $pkg\n";#d#
3641} 4100}
3642 4101
3643sub do_reload_perl() { 4102sub do_reload_perl() {
3644 # can/must only be called in main 4103 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 4104 unless (in_main) {
3646 warn "can only reload from main coroutine"; 4105 error "can only reload from main coroutine";
3647 return; 4106 return;
3648 } 4107 }
3649 4108
3650 return if $RELOAD++; 4109 return if $RELOAD++;
3651 4110
3652 my $t1 = EV::time; 4111 my $t1 = AE::time;
3653 4112
3654 while ($RELOAD) { 4113 while ($RELOAD) {
3655 warn "reloading..."; 4114 cf::get_slot 0.1, -1, "reload_perl";
4115 info "perl_reload: reloading...";
3656 4116
3657 warn "entering sync_job"; 4117 trace "perl_reload: entering sync_job";
3658 4118
3659 cf::sync_job { 4119 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 4120 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 4121
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 4122 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 4123 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 4124 %EXT_CORO = ();
3677 4125
3678 warn "removing commands"; 4126 trace "perl_reload: removing commands";
3679 %COMMAND = (); 4127 %COMMAND = ();
3680 4128
3681 warn "removing ext/exti commands"; 4129 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 4130 %EXTCMD = ();
3683 %EXTICMD = (); 4131 %EXTICMD = ();
3684 4132
3685 warn "unloading/nuking all extensions"; 4133 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 4134 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 4135 trace "... unloading $pkg";
3688 4136
3689 if (my $cb = $pkg->can ("unload")) { 4137 if (my $cb = $pkg->can ("unload")) {
3690 eval { 4138 eval {
3691 $cb->($pkg); 4139 $cb->($pkg);
3692 1 4140 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 4141 } or error "$pkg unloaded, but with errors: $@";
3694 } 4142 }
3695 4143
3696 warn "... clearing $pkg"; 4144 trace "... clearing $pkg";
3697 clear_package $pkg; 4145 clear_package $pkg;
3698 } 4146 }
3699 4147
3700 warn "unloading all perl modules loaded from $LIBDIR"; 4148 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 4149 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4150 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 4151
3704 warn "... unloading $k"; 4152 trace "... unloading $k";
3705 delete $INC{$k}; 4153 delete $INC{$k};
3706 4154
3707 $k =~ s/\.pm$//; 4155 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 4156 $k =~ s/\//::/g;
3709 4157
3712 } 4160 }
3713 4161
3714 clear_package $k; 4162 clear_package $k;
3715 } 4163 }
3716 4164
3717 warn "getting rid of safe::, as good as possible"; 4165 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 4166 clear_package "safe::$_"
3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4167 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3720 4168
3721 warn "unloading cf.pm \"a bit\""; 4169 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 4170 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4171 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 4172
3725 # don't, removes xs symbols, too, 4173 # don't, removes xs symbols, too,
3726 # and global variables created in xs 4174 # and global variables created in xs
3727 #clear_package __PACKAGE__; 4175 #clear_package __PACKAGE__;
3728 4176
3729 warn "unload completed, starting to reload now"; 4177 info "perl_reload: unload completed, starting to reload now";
3730 4178
3731 warn "reloading cf.pm"; 4179 trace "perl_reload: reloading cf.pm";
3732 require cf; 4180 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4181 cf::_connect_to_perl_1;
3734 4182
3735 warn "loading config and database again"; 4183 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 4184 cf::reload_config;
3737 4185
3738 warn "loading extensions"; 4186 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 4187 cf::load_extensions;
3740 4188
3741 if ($REATTACH_ON_RELOAD) { 4189 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 4190 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 4191 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 4192 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 4193 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 4194 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 4195 reattach $_ for values %PLAYER;
3748 } 4196 }
3749 4197
3750 warn "running post_init jobs"; 4198 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 4199
3753 warn "leaving sync_job"; 4200 trace "perl_reload: leaving sync_job";
3754 4201
3755 1 4202 1
3756 } or do { 4203 } or do {
3757 warn $@; 4204 error $@;
3758 cf::cleanup "error while reloading, exiting."; 4205 cf::cleanup "perl_reload: error, exiting.";
3759 }; 4206 };
3760 4207
3761 warn "reloaded";
3762 --$RELOAD; 4208 --$RELOAD;
3763 } 4209 }
3764 4210
3765 $t1 = EV::time - $t1; 4211 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4212 info "perl_reload: completed in ${t1}s\n";
3767}; 4213};
3768 4214
3769our $RELOAD_WATCHER; # used only during reload 4215our $RELOAD_WATCHER; # used only during reload
3770 4216
3771sub reload_perl() { 4217sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4219 # coro crashes during coro_state_free->destroy here.
3774 4220
3775 $RELOAD_WATCHER ||= cf::async { 4221 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4222 Coro::AIO::aio_wait cache_extensions;
3777 4223
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4224 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4225 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4226 undef $RELOAD_WATCHER;
3781 }; 4227 };
3782 }; 4228 };
3783} 4229}
3792 reload_perl; 4238 reload_perl;
3793 }; 4239 };
3794 } 4240 }
3795}; 4241};
3796 4242
3797unshift @INC, $LIBDIR; 4243#############################################################################
3798 4244
3799my $bug_warning = 0; 4245my $bug_warning = 0;
3800 4246
3801our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN;
3803
3804sub wait_for_tick { 4247sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3806 4249
3807 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
3808 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait;
3810} 4251}
3811 4252
3812sub wait_for_tick_begin { 4253sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3814 4255
3815 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4258 $signal->wait;
3818} 4259}
3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3823 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
3824 return; 4265 return;
3825 } 4266 }
3826 4267
3827 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
4269
4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3828 4271
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3831 Coro::async_pool { 4274 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4275 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4276 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4277 or error "ERROR: unable to write runtime file: $!";
3835 }; 4278 };
3836 } 4279 }
3837 4280
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4282 $sig->send;
3840 } 4283 }
3841 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
3842 $sig->send;
3843 }
3844 4285
3845 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3847 4288
3848 if (0) { 4289 if (0) {
3849 if ($NEXT_TICK) { 4290 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4291 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4292 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4293 debug "jitter $JITTER\n";#d#
3853 } 4294 }
3854 } 4295 }
3855} 4296}
3856 4297
3857{ 4298{
3858 # configure BDB 4299 # configure BDB
4300 info "initialising database";
3859 4301
3860 BDB::min_parallel 8; 4302 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
3863 4305
3864 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 }; 4335 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 }; 4338 };
4339
4340 info "database initialised";
3897} 4341}
3898 4342
3899{ 4343{
3900 # configure IO::AIO 4344 # configure IO::AIO
3901 4345
4346 info "initialising aio";
3902 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
3905} 4351}
3906 4352
3907my $_log_backtrace; 4353our $_log_backtrace;
4354our $_log_backtrace_last;
3908 4355
3909sub _log_backtrace { 4356sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4357 my ($msg, @addr) = @_;
3911 4358
3912 $msg =~ s/\n//; 4359 $msg =~ s/\n$//;
3913 4360
4361 if ($_log_backtrace_last eq $msg) {
4362 LOG llevInfo, "[ABT] $msg\n";
4363 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4364 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4365 } elsif ($_log_backtrace < 2) {
4366 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4367 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4368 my $perl_bt = Carp::longmess $msg;
3918 async { 4369 async {
3919 $Coro::current->{desc} = "abt $msg"; 4370 $Coro::current->{desc} = "abt $msg";
3920 4371
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4391 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4392 --$_log_backtrace;
3942 }; 4393 };
3943 } else { 4394 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4395 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4396 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4397 }
3947} 4398}
3948 4399
3949# load additional modules 4400# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4401require "cf/$_.pm" for @EXTRA_MODULES;
4402cf::_connect_to_perl_2;
3951 4403
3952END { cf::emergency_save } 4404END { cf::emergency_save }
3953 4405
39541 44061
3955 4407

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines