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.463 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes; 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 off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
111 129
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
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
117our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
118 139
119our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
121our $NOW; 143our $NOW;
122 144
123our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
124our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
125our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
132our $JITTER; # average jitter 154our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
134 156
135our @POST_INIT; 157our @POST_INIT;
136 158
137our $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;
138 164
139binmode STDOUT; 165binmode STDOUT;
140binmode STDERR; 166binmode STDERR;
141 167
142# read virtual server time, if available 168# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
147} 173}
148 174
175eval "sub TICK() { $TICK } 1" or die;
176
149mkdir $_ 177mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 179
152our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
153 181
154sub cf::map::normalise; 182sub cf::map::normalise;
155 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
156############################################################################# 188#############################################################################
157 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
158=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
159 202
160=over 4 203=over 4
161 204
162=item $cf::UPTIME 205=item $cf::UPTIME
163 206
164The 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.
165 223
166=item $cf::RUNTIME 224=item $cf::RUNTIME
167 225
168The 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
169every server tick. 227every server tick.
175Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
176directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
177unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
178database environment. 236database environment.
179 237
180=item $cf::NOW
181
182The time of the last (current) server tick.
183
184=item $cf::TICK
185
186The interval between server ticks, in seconds.
187
188=item $cf::LOADAVG 238=item $cf::LOADAVG
189 239
190The 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
191(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
192objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
201from wherever your confdir points to. 251from wherever your confdir points to.
202 252
203=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
204 254
205These 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
206returns 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
207per 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.
208 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
209=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
210 277
211This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 280that call.
214 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
215=back 288=back
216 289
217=cut 290=cut
218 291
219BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
220 *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 {
221 my $msg = join "", @_; 299 my $msg = join "", @_;
222 300
223 $msg .= "\n" 301 $msg .= "\n"
224 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
225 303
226 $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;
227 305
228 LOG llevError, $msg; 306 LOG llevWarn, $msg;
229 }; 307};
230}
231 308
232$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
234 311
235 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 316 return;#d#
238 }#d# 317 }#d#
239 318
240 # kill coroutine otherwise 319 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 320 Coro::terminate
243}; 321};
244
245$SIG{__DIE__} = sub { }; #d#?
246 322
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 340)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 342}
267 343
268$EV::DIED = sub { 344$EV::DIED = sub {
269 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
270}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
271 352
272############################################################################# 353#############################################################################
273 354
274=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
275 356
296 $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;
297 $d 378 $d
298 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
299} 380}
300 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
301=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
302 435
303Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
304 437
305=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
311our $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
312 445
313sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
315 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
316=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
317 481
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
320 484
321The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 486is a reload or not.
323 487
324=cut 488=cut
325 489
326sub post_init(&) { 490sub post_init(&) {
327 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 }
328} 509}
329 510
330=item cf::lock_wait $string 511=item cf::lock_wait $string
331 512
332Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
371} 552}
372 553
373=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
374 555
375Like 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
376get spread over timer. 557get spread over time.
377 558
378=cut 559=cut
379 560
380sub periodic($$) { 561sub periodic($$) {
381 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
386} 567}
387 568
388=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
389 570
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
391This 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
392of 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.
393 578
394The 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
395used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
396 581
397Useful for short background jobs. 582Useful for short background jobs.
398 583
399=cut 584=cut
400 585
401our @SLOT_QUEUE; 586our @SLOT_QUEUE;
402our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
403 589
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
407 593
408 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
409 596
410 while () { 597 while () {
411 next_job: 598 next_job:
599
412 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 601
414 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 606 $job->[2]->send;
418 Coro::cede; 607 Coro::cede;
419 goto next_job; 608 goto next_job;
420 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 611 }
422 } 612 }
423 613
424 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
427 $signal->wait;
428 } else { 617 } else {
618 $busy = 0;
429 Coro::schedule; 619 Coro::schedule;
430 } 620 }
431 } 621 }
432}; 622};
433 623
434sub get_slot($;$$) { 624sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
436 626
437 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
438 628
439 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
440 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
441 632
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
470=cut 661=cut
471 662
472sub sync_job(&) { 663sub sync_job(&) {
473 my ($job) = @_; 664 my ($job) = @_;
474 665
475 if ($Coro::current == $Coro::main) { 666 if (in_main) {
476 my $time = EV::time; 667 my $time = AE::time;
477 668
478 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
480 671
481 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
482 673
483 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
484 675
485 my $busy = 1; 676 my $busy = 1;
486 my @res; 677 my @res;
487 678
488 (async { 679 (async {
489 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 681 @res = eval { $job->() };
491 warn $@ if $@; 682 error $@ if $@;
492 undef $busy; 683 undef $busy;
493 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
494 685
495 while ($busy) { 686 while ($busy) {
496 if (Coro::nready) { 687 if (Coro::nready) {
498 } else { 689 } else {
499 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
500 } 691 }
501 } 692 }
502 693
503 my $time = EV::time - $time; 694 my $time = AE::time - $time;
504 695
505 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
506 697
507 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
508 } else { 699 } else {
530 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
531 722
532 $coro 723 $coro
533} 724}
534 725
535=item fork_call { }, $args 726=item fork_call { }, @args
536 727
537Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 731never block itself or use any form of event handling.
541 732
542=cut 733=cut
543 734
735sub post_fork {
736 reset_signals;
737}
738
544sub fork_call(&@) { 739sub fork_call(&@) {
545 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
546 741
547 # 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,
548 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
550 745
551 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
552 reset_signals; 747 cf::post_fork;
553 &$cb 748 &$cb
554 }, @args; 749 } @args;
555 750
556 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 )
557} 763}
558 764
559=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
560 766
561=cut 767=cut
598within each server. 804within each server.
599 805
600=cut 806=cut
601 807
602sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
603 my ($name) = @_; 812 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
605 814
606 eval { 815 eval {
607 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
617} 826}
618 827
619our $DB; 828our $DB;
620 829
621sub db_init { 830sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
624 };
625} 832}
626 833
627sub db_get($$) { 834sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
629 836
630 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
631 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
632 841
633 $! ? () 842 $! ? ()
634 : $data 843 : $data
635 }
636} 844}
637 845
638sub db_put($$$) { 846sub db_put($$$) {
639 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 876
669 my @data; 877 my @data;
670 my $md5; 878 my $md5;
671 879
672 for (0 .. $#$src) { 880 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 882 }
676 883
677 # if processing is expensive, check 884 # if processing is expensive, check
678 # checksum first 885 # checksum first
679 if (1) { 886 if (1) {
696 903
697 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 905 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
700 907
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 909
703 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
706 913
716 923
717=cut 924=cut
718 925
719sub datalog($@) { 926sub datalog($@) {
720 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 929}
723 930
724=back 931=back
725 932
726=cut 933=cut
921 1128
922 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1131
925 } elsif (ref $type) { 1132 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
927 1134
928 } else { 1135 } else {
929 shift @arg; 1136 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
931 } 1138 }
932 } 1139 }
933} 1140}
934 1141
935sub _object_attach { 1142sub _object_attach {
945 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
946 } 1153 }
947 1154
948 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
949 } else { 1156 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1158 }
952 1159
953 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
954} 1161}
955 1162
1014 1221
1015 for (@$callbacks) { 1222 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1017 1224
1018 if ($@) { 1225 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1227 override;
1022 } 1228 }
1023 1229
1024 return 1 if $override; 1230 return 1 if $override;
1025 } 1231 }
1104 for (@$attach) { 1310 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1107 } 1313 }
1108 } else { 1314 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1316 }
1111 } 1317 }
1112} 1318}
1113 1319
1114cf::attachable->attach ( 1320cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1142 1348
1143 sync_job { 1349 sync_job {
1144 if (length $$rdata) { 1350 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1148 1355
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1359 if ($cf::USE_FSYNC) {
1360 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1361 aio_fsync $fh;
1362 }
1153 aio_close $fh; 1363 aio_close $fh;
1154 1364
1155 if (@$objs) { 1365 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1366 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1370 if ($cf::USE_FSYNC) {
1371 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1372 aio_fsync $fh;
1373 }
1161 aio_close $fh; 1374 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1376 }
1164 } else { 1377 } else {
1165 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1169 1382
1170 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1385 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1174 } 1387 }
1175 } else { 1388 } else {
1176 aio_unlink $filename; 1389 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1178 } 1391 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1416 $av = $st->{objs};
1204 } 1417 }
1205 1418
1206 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1209 1423
1210 ($data, $av) 1424 ($data, $av)
1211} 1425}
1212 1426
1213=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1272} 1486}
1273 1487
1274use File::Glob (); 1488use File::Glob ();
1275 1489
1276cf::player->attach ( 1490cf::player->attach (
1277 on_command => sub { 1491 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1279 1493
1280 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1281 or return; 1495 or return;
1282 1496
1290 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1291 1505
1292 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1293 1507
1294 if (ref $msg) { 1508 if (ref $msg) {
1295 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1296 "ARRAY" eq ref $msg
1297 ? @$msg
1298 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1299 1510
1300 my @reply; 1511 my @reply;
1301 1512
1302 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1303 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1305 1516
1306 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1518 if $reply;
1308 1519
1309 } else { 1520 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1522 }
1312 1523
1313 cf::override; 1524 cf::override;
1314 }, 1525 },
1315); 1526);
1316 1527
1317# "readahead" all extensions 1528# "readahead" all extensions
1318sub cache_extensions { 1529sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1530 my $grp = IO::AIO::aio_group;
1320 1531
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1533 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1535 }
1325 }; 1536 };
1326 1537
1327 $grp 1538 $grp
1328} 1539}
1329 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
1330sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1331 cf::sync_job { 1557 cf::sync_job {
1332 my %todo; 1558 my %todo;
1333 1559
1334 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1561 next unless -r $path;
1353 1579
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1582
1357 $ext{source} = 1583 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1360 . $source 1586 . $source
1361 . "\n};\n1"; 1587 . "\n};\n1";
1362 1588
1363 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1364 } 1590 }
1365 1591
1592 my $pass = 0;
1366 my %done; 1593 my %done;
1367 while (%todo) { 1594 while (%todo) {
1368 my $progress; 1595 my $progress;
1369 1596
1597 ++$pass;
1598
1599 ext:
1370 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1602 next ext
1373 unless exists $done{$_}; 1603 unless exists $done{$_};
1374 } 1604 }
1375 1605
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1607
1378 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 $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1621
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1623 if exists $v->{meta}{mandatory};
1386 1624
1387 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;
1388 } 1634 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1635 }
1394 1636
1395 skip: 1637 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 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 }
1398 } 1647 }
1399 }; 1648 };
1400} 1649}
1401 1650
1402############################################################################# 1651#############################################################################
1486 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1487 } 1736 }
1488 } 1737 }
1489} 1738}
1490 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
1491sub save($) { 1753sub save($) {
1492 my ($pl) = @_; 1754 my ($pl) = @_;
1493 1755
1494 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1495 1757
1500 1762
1501 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1503 1765
1504 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];
1505 1770
1506 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1772 cf::cede_to_tick;
1508} 1773}
1509 1774
1543 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1544 1809
1545 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1546 $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
1547 1812
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1814 $pl->deactivate;
1815
1550 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;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1553 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1554 1821
1555 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1611 \@logins 1878 \@logins
1612} 1879}
1613 1880
1614=item $player->maps 1881=item $player->maps
1615 1882
1883=item cf::player::maps $login
1884
1616Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1617player. May block. 1886player. May block.
1618 1887
1619=cut 1888=cut
1620 1889
1682=cut 1951=cut
1683 1952
1684sub find_by_path($) { 1953sub find_by_path($) {
1685 my ($path) = @_; 1954 my ($path) = @_;
1686 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1687 my ($match, $specificity); 1958 my ($match, $specificity);
1688 1959
1689 for my $region (list) { 1960 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1990sub generate_random_map {
1720 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1721 1992
1722 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
1723 1994
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 1996}
1739 1997
1740=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1741 1999
1742Register 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
1747 2005
1748sub register { 2006sub register {
1749 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 2008 my $pkg = caller;
1751 2009
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 2011
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 2013}
1757 2014
1758# also paths starting with '/' 2015# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 2017
1761sub thawer_merge { 2018sub thawer_merge {
1762 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1763 2020
1764 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1769} 2026}
1770 2027
1771sub normalise { 2028sub normalise {
1772 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1773 2030
1774 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1775 2032
1776 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1777 2034
1778 # map plan: 2035 # map plan:
1779 # 2036 #
1794 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 2052 $path = "$base/$path";
1796 } 2053 }
1797 2054
1798 for ($path) { 2055 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1802 } 2058 }
1803 2059
1804 $path 2060 $path
1818 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1819 return $self; 2075 return $self;
1820 } 2076 }
1821 } 2077 }
1822 2078
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 2080 ()
1825} 2081}
1826 2082
2083# may re-bless or do other evil things
1827sub init { 2084sub init {
1828 my ($self) = @_; 2085 my ($self) = @_;
1829 2086
1830 $self 2087 $self
1831} 2088}
1896 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1897 2154
1898 1 2155 1
1899} 2156}
1900 2157
2158# used to laod the header of an original map
1901sub load_header_orig { 2159sub load_header_orig {
1902 my ($self) = @_; 2160 my ($self) = @_;
1903 2161
1904 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1905} 2163}
1906 2164
2165# used to laod the header of an instantiated map
1907sub load_header_temp { 2166sub load_header_temp {
1908 my ($self) = @_; 2167 my ($self) = @_;
1909 2168
1910 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1911} 2170}
1912 2171
2172# called after loading the header from an instantiated map
1913sub prepare_temp { 2173sub prepare_temp {
1914 my ($self) = @_; 2174 my ($self) = @_;
1915 2175
1916 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1917 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1918 # safety 2178 # safety
1919 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1920 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1921} 2181}
1922 2182
2183# called after loading the header from an original map
1923sub prepare_orig { 2184sub prepare_orig {
1924 my ($self) = @_; 2185 my ($self) = @_;
1925 2186
1926 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1927 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1951 2212
1952sub find; 2213sub find;
1953sub find { 2214sub find {
1954 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1955 2216
2217 cf::cede_to_tick;
2218
1956 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1957 2220
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1960 2223
1961 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1978 2241
1979 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1980 } 2243 }
1981} 2244}
1982 2245
1983sub pre_load { } 2246sub pre_load { }
1984sub post_load { } 2247#sub post_load { } # XS
1985 2248
1986sub load { 2249sub load {
1987 my ($self) = @_; 2250 my ($self) = @_;
1988 2251
1989 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
1992 2255
1993 { 2256 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
1995 2258
1996 return unless $self->valid; 2259 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2261
2001 $self->alloc; 2262 $self->alloc;
2002 2263
2003 $self->pre_load; 2264 $self->pre_load;
2004 cf::cede_to_tick; 2265 cf::cede_to_tick;
2005 2266
2267 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2269 $f->skip_block;
2008 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2009 or return; 2271 or return;
2010 2272
2011 $self->post_load_original 2273 $self->post_load_original
2012 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2013 2275
2014 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2277 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2280 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2021 } 2284 }
2022 } 2285 }
2023 }
2024 2286
2025 $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);
2026 2294
2027 cf::cede_to_tick; 2295 cf::cede_to_tick;
2028 # now do the right thing for maps 2296 # now do the right thing for maps
2029 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2034 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2303 $self->decay_objects;
2036 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2037 $self->update_buttons; 2305 $self->update_buttons;
2038 cf::cede_to_tick; 2306 cf::cede_to_tick;
2039 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2040 } 2308 }
2041 2309
2042 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2043 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2044
2045 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2312 }
2047 2313
2048 $self->post_load; 2314 $self->post_load;
2049}
2050 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
2051sub customise_for { 2322sub customise_for {
2052 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2053 2324
2054 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2326 if $self->per_player;
2058# if $self->per_party; 2329# if $self->per_party;
2059 2330
2060 $self 2331 $self
2061} 2332}
2062 2333
2063# find and load all maps in the 3x3 area around a map
2064sub load_neighbours {
2065 my ($map) = @_;
2066
2067 my @neigh; # diagonal neighbours
2068
2069 for (0 .. 3) {
2070 my $neigh = $map->tile_path ($_)
2071 or next;
2072 $neigh = find $neigh, $map
2073 or next;
2074 $neigh->load;
2075
2076 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 }
2080
2081 for (grep defined $_->[0], @neigh) {
2082 my ($path, $origin) = @$_;
2083 my $neigh = find $path, $origin
2084 or next;
2085 $neigh->load;
2086 }
2087}
2088
2089sub find_sync { 2334sub find_sync {
2090 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2091 2336
2092 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
2093} 2342}
2094 2343
2095sub do_load_sync { 2344sub do_load_sync {
2096 my ($map) = @_; 2345 my ($map) = @_;
2097 2346
2347 # it's a bug to call this from the main context
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2100 2350
2101 cf::sync_job { $map->load }; 2351 $map->load;
2102} 2352}
2103 2353
2104our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2106 2356
2107sub find_async { 2357sub find_async {
2108 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2109 2359
2110 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2111 2361
2112 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2114 } 2364 }
2115 2365
2116 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2117 2367
2118 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2132 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2133 2383
2134 () 2384 ()
2135} 2385}
2136 2386
2387# common code, used by both ->save and ->swapout
2137sub save { 2388sub _save {
2138 my ($self) = @_; 2389 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2390
2142 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2143 2392
2144 return unless $self->dirty; 2393 return unless $self->dirty;
2145 2394
2165 } else { 2414 } else {
2166 $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);
2167 } 2416 }
2168} 2417}
2169 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2170sub swap_out { 2427sub swap_out {
2171 my ($self) = @_; 2428 my ($self) = @_;
2172 2429
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2178 return if $self->players; 2434 return if $self->players;
2179 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
2180 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2181 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
2182 $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};
2183 2486
2184 $self->deactivate; 2487 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2489 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2490
2232 $self->unlink_save; 2491 $self->unlink_save;
2233 $self->destroy; 2492 $self->destroy;
2234} 2493}
2235 2494
2243 2502
2244 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2245 2504
2246 $self->unlink_save; 2505 $self->unlink_save;
2247 2506
2248 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2512
2310 : normalise $_ 2569 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2571 ]
2313} 2572}
2314 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
2315=back 2606=back
2316 2607
2317=head3 cf::object 2608=head3 cf::object
2318 2609
2319=cut 2610=cut
2384 2675
2385our $SAY_CHANNEL = { 2676our $SAY_CHANNEL = {
2386 id => "say", 2677 id => "say",
2387 title => "Map", 2678 title => "Map",
2388 reply => "say ", 2679 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2680 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2681};
2391 2682
2392our $CHAT_CHANNEL = { 2683our $CHAT_CHANNEL = {
2393 id => "chat", 2684 id => "chat",
2394 title => "Chat", 2685 title => "Chat",
2451 2742
2452Freezes 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}>).
2453 2744
2454The 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.
2455for 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,
2456though, 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
2457map. 2748map.
2458 2749
2459Will never block. 2750Will never block.
2460 2751
2461=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2483 my ($self) = @_; 2774 my ($self) = @_;
2484 2775
2485 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2486 2777
2778 ++$self->{_link_recursion};
2779
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2781
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2491 2784
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2786}
2494 2787
2495sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2497 2790
2514 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2516 2809
2517 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2520 2813
2521 $map->load; 2814 $map->load;
2522 $map->load_neighbours;
2523 2815
2524 return unless $self->contr->active; 2816 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2817
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2530} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2531 2825
2826}
2827
2532=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)]])
2533 2829
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2544 2840
2545our $GOTOGEN; 2841our $GOTOGEN;
2546 2842
2547sub cf::object::player::goto { 2843sub cf::object::player::goto {
2548 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 }
2549 2851
2550 # 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
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2854
2553 $self->enter_link; 2855 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2574 } 2876 }
2575 } 2877 }
2576 2878
2577 my $map = eval { 2879 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2881
2580 if ($map) { 2882 if ($map) {
2581 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2885 } else {
2584 $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);
2585 } 2887 }
2586 2888
2587 $map 2889 $map
2595 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2598 } 2900 }
2599 2901
2600 $done->() if $done; 2902 $done->($self) if $done;
2601 })->prio (1); 2903 })->prio (1);
2602} 2904}
2603 2905
2604=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2605 2907
2673 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2674 2976
2675 unless (eval { 2977 unless (eval {
2676 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2677 2979
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2687 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2688 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 }
2689 3006
2690 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2691 3008
2692 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2698 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "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. "
2700 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2702 3019
2703 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 3021 $self->leave_link;
2705 } 3022 }
2706 })->prio (1); 3023 })->prio (1);
2707} 3024}
2708 3025
2720sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2722 3039
2723 utf8::encode $text; 3040 utf8::encode $text;
2724 $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);
2725} 3067}
2726 3068
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 3070
2729Send 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
2733 3075
2734=cut 3076=cut
2735 3077
2736# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2738 "c/identify" => { 3086 "c/identify" => {
2739 id => "infobox", 3087 id => "infobox",
2740 title => "Identify", 3088 title => "Identify",
2741 reply => undef, 3089 reply => undef,
2742 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2744 "c/examine" => { 3092 "c/examine" => {
2745 id => "infobox", 3093 id => "infobox",
2746 title => "Examine", 3094 title => "Examine",
2747 reply => undef, 3095 reply => undef,
2748 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",
2749 }, 3103 },
2750 "c/book" => { 3104 "c/book" => {
2751 id => "infobox", 3105 id => "infobox",
2752 title => "Book", 3106 title => "Book",
2753 reply => undef, 3107 reply => undef,
2769 id => "infobox", 3123 id => "infobox",
2770 title => "Body Parts", 3124 title => "Body Parts",
2771 reply => undef, 3125 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 3126 tooltip => "Shows which body parts you posess and are available",
2773 }, 3127 },
3128 "c/statistics" => {
3129 id => "infobox",
3130 title => "Statistics",
3131 reply => undef,
3132 tooltip => "Shows your primary statistics",
3133 },
2774 "c/skills" => { 3134 "c/skills" => {
2775 id => "infobox", 3135 id => "infobox",
2776 title => "Skills", 3136 title => "Skills",
2777 reply => undef, 3137 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 3138 tooltip => "Shows your experience per skill and item power",
3139 },
3140 "c/shopitems" => {
3141 id => "infobox",
3142 title => "Shop Items",
3143 reply => undef,
3144 tooltip => "Shows the items currently for sale in this shop",
3145 },
3146 "c/resistances" => {
3147 id => "infobox",
3148 title => "Resistances",
3149 reply => undef,
3150 tooltip => "Shows your resistances",
3151 },
3152 "c/pets" => {
3153 id => "infobox",
3154 title => "Pets",
3155 reply => undef,
3156 tooltip => "Shows information abotu your pets/a specific pet",
3157 },
3158 "c/perceiveself" => {
3159 id => "infobox",
3160 title => "Perceive Self",
3161 reply => undef,
3162 tooltip => "You gained detailed knowledge about yourself",
2779 }, 3163 },
2780 "c/uptime" => { 3164 "c/uptime" => {
2781 id => "infobox", 3165 id => "infobox",
2782 title => "Uptime", 3166 title => "Uptime",
2783 reply => undef, 3167 reply => undef,
2793 id => "party", 3177 id => "party",
2794 title => "Party", 3178 title => "Party",
2795 reply => "gsay ", 3179 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 3180 tooltip => "Messages and chat related to your party",
2797 }, 3181 },
3182 "c/death" => {
3183 id => "death",
3184 title => "Death",
3185 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death",
3187 },
2798 "c/say" => $SAY_CHANNEL, 3188 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 3189 "c/chat" => $CHAT_CHANNEL,
2800); 3190);
2801 3191
2802sub cf::client::send_msg { 3192sub cf::client::send_msg {
2833 my $pkt = "msg " 3223 my $pkt = "msg "
2834 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2836 ); 3226 );
2837 3227
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if (8192 < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2849} 3229}
2850 3230
2851=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2852 3232
2853Sends an ext event to the client. 3233Sends an ext event to the client.
2856 3236
2857sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2858 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2859 3239
2860 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2862 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2863 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2865 } 3245 }
2866} 3246}
2867 3247
2868=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2869 3249
2872=cut 3252=cut
2873 3253
2874sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2875 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2876 3256
2877 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2878 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2879 } elsif ($self->extcmd == 1) {
2880 #TODO: version 1, remove
2881 unshift @msg, msgtype => "reply", msgid => $id;
2882 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2883 }
2884} 3260}
2885 3261
2886=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2887 3263
2888Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2943 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2944 3320
2945 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2946 3322
2947 if (ref $msg) { 3323 if (ref $msg) {
2948 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2949 "ARRAY" eq ref $msg
2950 ? @$msg
2951 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2952 3325
2953 my @reply; 3326 my @reply;
2954 3327
2955 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
2956 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
2958 3331
2959 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
2960 if $reply; 3333 if $reply;
2961 3334
2962 } else { 3335 } else {
2963 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2964 } 3337 }
2965 3338
2966 cf::override; 3339 cf::override;
2967 }, 3340 },
2968); 3341);
2988 3361
2989 $coro 3362 $coro
2990} 3363}
2991 3364
2992cf::client->attach ( 3365cf::client->attach (
2993 on_destroy => sub { 3366 on_client_destroy => sub {
2994 my ($ns) = @_; 3367 my ($ns) = @_;
2995 3368
2996 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2997 }, 3370 },
2998); 3371);
3014our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3015 3388
3016$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3017 3390
3018$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3019 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3020 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3021 sort time 3394 sort time
3022)); 3395));
3023 3396
3024# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3028The following functions and methods are available within a safe environment: 3401The following functions and methods are available within a safe environment:
3029 3402
3030 cf::object 3403 cf::object
3031 contr pay_amount pay_player map x y force_find force_add destroy 3404 contr pay_amount pay_player map x y force_find force_add destroy
3032 insert remove name archname title slaying race decrease split 3405 insert remove name archname title slaying race decrease split
3406 value
3033 3407
3034 cf::object::player 3408 cf::object::player
3035 player 3409 player
3036 3410
3037 cf::player 3411 cf::player
3043=cut 3417=cut
3044 3418
3045for ( 3419for (
3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3420 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3047 insert remove inv nrof name archname title slaying race 3421 insert remove inv nrof name archname title slaying race
3048 decrease split destroy change_exp)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3049 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3050 ["cf::player" => qw(peaceful)], 3424 ["cf::player" => qw(peaceful send_msg)],
3051 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3052) { 3426) {
3053 no strict 'refs';
3054 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3055 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3056 for @funs; 3429 for @funs;
3057} 3430}
3058 3431
3073 3446
3074 my $qcode = $code; 3447 my $qcode = $code;
3075 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3076 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3077 3450
3451 %vars = (_dummy => 0) unless %vars;
3452
3453 my @res;
3078 local $_; 3454 local $_;
3079 local @safe::cf::_safe_eval_args = values %vars;
3080 3455
3081 my $eval = 3456 my $eval =
3082 "do {\n" 3457 "do {\n"
3083 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3084 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3085 . $code 3460 . $code
3086 . "\n}" 3461 . "\n}"
3087 ; 3462 ;
3088 3463
3464 if ($CFG{safe_eval}) {
3089 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3090 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3091 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3092 3473
3093 if ($@) { 3474 if ($@) {
3094 warn "$@"; 3475 warn "$@",
3095 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3096 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3097 } 3478 }
3098 3479
3099 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3100} 3481}
3101 3482
3115=cut 3496=cut
3116 3497
3117sub register_script_function { 3498sub register_script_function {
3118 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3119 3500
3120 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3121 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3122} 3503}
3123 3504
3124=back 3505=back
3125 3506
3126=cut 3507=cut
3127 3508
3128############################################################################# 3509#############################################################################
3129# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3514# internal api, not fianlised
3515sub add_face {
3516 my ($name, $type, $data) = @_;
3517
3518 my $idx = cf::face::find $name;
3519
3520 if ($idx) {
3521 delete $FACEHASH{cf::face::get_chksum $idx};
3522 } else {
3523 $idx = cf::face::alloc $name;
3524 }
3525
3526 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3527
3528 cf::face::set_type $idx, $type;
3529 cf::face::set_data $idx, 0, $data, $hash;
3530 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3531 $FACEHASH{$hash} = $idx;#d#
3532
3533 $idx
3534}
3130 3535
3131sub load_facedata($) { 3536sub load_facedata($) {
3132 my ($path) = @_; 3537 my ($path) = @_;
3133 3538
3134 # HACK to clear player env face cache, we need some signal framework 3539 # HACK to clear player env face cache, we need some signal framework
3135 # for this (global event?) 3540 # for this (global event?)
3136 %ext::player_env::MUSIC_FACE_CACHE = (); 3541 %ext::player_env::MUSIC_FACE_CACHE = ();
3137 3542
3138 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3543 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3139 3544
3140 warn "loading facedata from $path\n"; 3545 trace "loading facedata from $path\n";
3141 3546
3142 my $facedata; 3547 my $facedata = decode_storable load_file $path;
3143 0 < aio_load $path, $facedata
3144 or die "$path: $!";
3145
3146 $facedata = Coro::Storable::thaw $facedata;
3147 3548
3148 $facedata->{version} == 2 3549 $facedata->{version} == 2
3149 or cf::cleanup "$path: version mismatch, cannot proceed."; 3550 or cf::cleanup "$path: version mismatch, cannot proceed.";
3150 3551
3151 # patch in the exptable
3152 $facedata->{resource}{"res/exp_table"} = {
3153 type => FT_RSRC,
3154 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3155 };
3156 cf::cede_to_tick; 3552 cf::cede_to_tick;
3157 3553
3158 { 3554 {
3159 my $faces = $facedata->{faceinfo}; 3555 my $faces = $facedata->{faceinfo};
3160 3556
3161 while (my ($face, $info) = each %$faces) { 3557 for my $face (sort keys %$faces) {
3558 my $info = $faces->{$face};
3162 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3559 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163 3560
3164 cf::face::set_visibility $idx, $info->{visibility}; 3561 cf::face::set_visibility $idx, $info->{visibility};
3165 cf::face::set_magicmap $idx, $info->{magicmap}; 3562 cf::face::set_magicmap $idx, $info->{magicmap};
3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3563 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3167 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3564 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3565 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3566 $FACEHASH{$info->{hash64}} = $idx;#d#
3168 3567
3169 cf::cede_to_tick; 3568 cf::cede_to_tick;
3170 } 3569 }
3171 3570
3172 while (my ($face, $info) = each %$faces) { 3571 while (my ($face, $info) = each %$faces) {
3177 3576
3178 if (my $smooth = cf::face::find $info->{smooth}) { 3577 if (my $smooth = cf::face::find $info->{smooth}) {
3179 cf::face::set_smooth $idx, $smooth; 3578 cf::face::set_smooth $idx, $smooth;
3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3579 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3181 } else { 3580 } else {
3182 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3581 error "smooth face '$info->{smooth}' not found for face '$face'";
3183 } 3582 }
3184 3583
3185 cf::cede_to_tick; 3584 cf::cede_to_tick;
3186 } 3585 }
3187 } 3586 }
3196 3595
3197 cf::anim::invalidate_all; # d'oh 3596 cf::anim::invalidate_all; # d'oh
3198 } 3597 }
3199 3598
3200 { 3599 {
3201 # TODO: for gcfclient pleasure, we should give resources
3202 # that gcfclient doesn't grok a >10000 face index.
3203 my $res = $facedata->{resource}; 3600 my $res = $facedata->{resource};
3204 3601
3205 while (my ($name, $info) = each %$res) { 3602 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) { 3603 if (defined (my $type = $info->{type})) {
3604 # TODO: different hash - must free and use new index, or cache ixface data queue
3207 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3605 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3208 my $data;
3209 3606
3210 if ($info->{type} & 1) {
3211 # prepend meta info
3212
3213 my $meta = $enc->encode ({
3214 name => $name,
3215 %{ $info->{meta} || {} },
3216 });
3217
3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type}; 3607 cf::face::set_type $idx, $type;
3608 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3609 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3610 $FACEHASH{$info->{hash}} = $idx;#d#
3225 } else { 3611 } else {
3226 $RESOURCE{$name} = $info; 3612# $RESOURCE{$name} = $info; # unused
3227 } 3613 }
3228 3614
3229 cf::cede_to_tick; 3615 cf::cede_to_tick;
3230 } 3616 }
3231 } 3617 }
3232 3618
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3619 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3234 3620
3235 1 3621 1
3236} 3622}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
3257 3623
3258register_exticmd fx_want => sub { 3624register_exticmd fx_want => sub {
3259 my ($ns, $want) = @_; 3625 my ($ns, $want) = @_;
3260 3626
3261 while (my ($k, $v) = each %$want) { 3627 while (my ($k, $v) = each %$want) {
3269 my $status = load_resource_file_ $_[0]; 3635 my $status = load_resource_file_ $_[0];
3270 get_slot 0.1, 100; 3636 get_slot 0.1, 100;
3271 cf::arch::commit_load; 3637 cf::arch::commit_load;
3272 3638
3273 $status 3639 $status
3640}
3641
3642sub reload_exp_table {
3643 _reload_exp_table;
3644
3645 add_face "res/exp_table" => FT_RSRC,
3646 JSON::XS->new->utf8->canonical->encode (
3647 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3648 );
3649}
3650
3651sub reload_materials {
3652 _reload_materials;
3274} 3653}
3275 3654
3276sub reload_regions { 3655sub reload_regions {
3277 # HACK to clear player env face cache, we need some signal framework 3656 # HACK to clear player env face cache, we need some signal framework
3278 # for this (global event?) 3657 # for this (global event?)
3293} 3672}
3294 3673
3295sub reload_archetypes { 3674sub reload_archetypes {
3296 load_resource_file "$DATADIR/archetypes" 3675 load_resource_file "$DATADIR/archetypes"
3297 or die "unable to load archetypes\n"; 3676 or die "unable to load archetypes\n";
3677
3678 add_face "res/skill_info" => FT_RSRC,
3679 JSON::XS->new->utf8->canonical->encode (
3680 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3681 );
3682 add_face "res/spell_paths" => FT_RSRC,
3683 JSON::XS->new->utf8->canonical->encode (
3684 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3685 );
3298} 3686}
3299 3687
3300sub reload_treasures { 3688sub reload_treasures {
3301 load_resource_file "$DATADIR/treasures" 3689 load_resource_file "$DATADIR/treasures"
3302 or die "unable to load treasurelists\n"; 3690 or die "unable to load treasurelists\n";
3303} 3691}
3304 3692
3693sub reload_sound {
3694 trace "loading sound config from $DATADIR/sound\n";
3695
3696 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3697
3698 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3699 my $sound = $soundconf->{compat}[$_]
3700 or next;
3701
3702 my $face = cf::face::find "sound/$sound->[1]";
3703 cf::sound::set $sound->[0] => $face;
3704 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3705 }
3706
3707 while (my ($k, $v) = each %{$soundconf->{event}}) {
3708 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face;
3710 }
3711}
3712
3305sub reload_resources { 3713sub reload_resources {
3306 warn "reloading resource files...\n"; 3714 trace "reloading resource files...\n";
3307 3715
3716 reload_materials;
3308 reload_facedata; 3717 reload_facedata;
3718 reload_exp_table;
3719 reload_sound;
3309 reload_archetypes; 3720 reload_archetypes;
3310 reload_regions; 3721 reload_regions;
3311 reload_treasures; 3722 reload_treasures;
3312 3723
3313 warn "finished reloading resource files\n"; 3724 trace "finished reloading resource files\n";
3314} 3725}
3315 3726
3316sub reload_config { 3727sub reload_config {
3317 open my $fh, "<:utf8", "$CONFDIR/config" 3728 trace "reloading config file...\n";
3318 or return;
3319 3729
3320 local $/; 3730 my $config = load_file "$CONFDIR/config";
3321 *CFG = YAML::Load <$fh>; 3731 utf8::decode $config;
3732 *CFG = decode_yaml $config;
3322 3733
3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3734 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3324 3735
3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3736 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3737 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3327 3738
3328 if (exists $CFG{mlockall}) { 3739 if (exists $CFG{mlockall}) {
3351 3762
3352 seek $fh, 0, 0; 3763 seek $fh, 0, 0;
3353 print $fh $$; 3764 print $fh $$;
3354} 3765}
3355 3766
3767sub main_loop {
3768 trace "EV::loop starting\n";
3769 if (1) {
3770 EV::loop;
3771 }
3772 trace "EV::loop returned\n";
3773 goto &main_loop unless $REALLY_UNLOOP;
3774}
3775
3356sub main { 3776sub main {
3357 cf::init_globals; # initialise logging 3777 cf::init_globals; # initialise logging
3358 3778
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3779 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3780 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3781 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3782 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363 3783
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3784 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370 3785
3371 # we must not ever block the main coroutine 3786 # we must not ever block the main coroutine
3372 local $Coro::idle = sub { 3787 $Coro::idle = sub {
3373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3788 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3374 (async { 3789 (async {
3375 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3790 $Coro::current->{desc} = "IDLE BUG HANDLER";
3376 EV::loop EV::LOOP_ONESHOT; 3791 EV::loop EV::LOOP_ONESHOT;
3377 })->prio (Coro::PRIO_MAX); 3792 })->prio (Coro::PRIO_MAX);
3378 }; 3793 };
3379 3794
3380 evthread_start IO::AIO::poll_fileno; 3795 evthread_start IO::AIO::poll_fileno;
3381 3796
3382 cf::sync_job { 3797 cf::sync_job {
3798 cf::incloader::init ();
3799
3800 cf::init_anim;
3801 cf::init_attackmess;
3802 cf::init_dynamic;
3803
3804 cf::load_settings;
3805
3383 reload_resources; 3806 reload_resources;
3384 reload_config; 3807 reload_config;
3385 db_init; 3808 db_init;
3386 3809
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid; 3810 cf::init_uuid;
3390 cf::init_signals; 3811 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills; 3812 cf::init_skills;
3393 3813
3394 cf::init_beforeplay; 3814 cf::init_beforeplay;
3395 3815
3396 atomic; 3816 atomic;
3398 load_extensions; 3818 load_extensions;
3399 3819
3400 utime time, time, $RUNTIMEFILE; 3820 utime time, time, $RUNTIMEFILE;
3401 3821
3402 # no (long-running) fork's whatsoever before this point(!) 3822 # no (long-running) fork's whatsoever before this point(!)
3823 use POSIX ();
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3824 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404 3825
3405 (pop @POST_INIT)->(0) while @POST_INIT; 3826 cf::_post_init 0;
3406 }; 3827 };
3407 3828
3408 EV::loop; 3829 cf::object::thawer::errors_are_fatal 0;
3830 info "parse errors in files are no longer fatal from this point on.\n";
3831
3832 AE::postpone {
3833 undef &main; # free gobs of memory :)
3834 };
3835
3836 goto &main_loop;
3409} 3837}
3410 3838
3411############################################################################# 3839#############################################################################
3412# initialisation and cleanup 3840# initialisation and cleanup
3413 3841
3414# install some emergency cleanup handlers 3842# install some emergency cleanup handlers
3415BEGIN { 3843BEGIN {
3416 our %SIGWATCHER = (); 3844 our %SIGWATCHER = ();
3417 for my $signal (qw(INT HUP TERM)) { 3845 for my $signal (qw(INT HUP TERM)) {
3418 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3846 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3419 cf::cleanup "SIG$signal"; 3847 cf::cleanup "SIG$signal";
3420 }; 3848 };
3421 } 3849 }
3422} 3850}
3423 3851
3424sub write_runtime_sync { 3852sub write_runtime_sync {
3853 my $t0 = AE::time;
3854
3425 # first touch the runtime file to show we are still running: 3855 # first touch the runtime file to show we are still running:
3426 # the fsync below can take a very very long time. 3856 # the fsync below can take a very very long time.
3427 3857
3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3858 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3429 3859
3430 my $guard = cf::lock_acquire "write_runtime"; 3860 my $guard = cf::lock_acquire "write_runtime";
3431 3861
3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3862 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3433 or return; 3863 or return;
3434 3864
3435 my $value = $cf::RUNTIME + 90 + 10; 3865 my $value = $cf::RUNTIME + 90 + 10;
3436 # 10 is the runtime save interval, for a monotonic clock 3866 # 10 is the runtime save interval, for a monotonic clock
3437 # 60 allows for the watchdog to kill the server. 3867 # 60 allows for the watchdog to kill the server.
3450 or return; 3880 or return;
3451 3881
3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3882 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3453 and return; 3883 and return;
3454 3884
3455 warn "runtime file written.\n"; 3885 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3456 3886
3457 1 3887 1
3458} 3888}
3459 3889
3460our $uuid_lock; 3890our $uuid_lock;
3472 or return; 3902 or return;
3473 3903
3474 my $value = uuid_seq uuid_cur; 3904 my $value = uuid_seq uuid_cur;
3475 3905
3476 unless ($value) { 3906 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n"; 3907 info "cowardly refusing to write zero uuid value!\n";
3478 return; 3908 return;
3479 } 3909 }
3480 3910
3481 my $value = uuid_str $value + $uuid_skip; 3911 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0; 3912 $uuid_skip = 0;
3492 or return; 3922 or return;
3493 3923
3494 aio_rename "$uuid~", $uuid 3924 aio_rename "$uuid~", $uuid
3495 and return; 3925 and return;
3496 3926
3497 warn "uuid file written ($value).\n"; 3927 trace "uuid file written ($value).\n";
3498 3928
3499 1 3929 1
3500 3930
3501} 3931}
3502 3932
3508} 3938}
3509 3939
3510sub emergency_save() { 3940sub emergency_save() {
3511 my $freeze_guard = cf::freeze_mainloop; 3941 my $freeze_guard = cf::freeze_mainloop;
3512 3942
3513 warn "emergency_perl_save: enter\n"; 3943 info "emergency_perl_save: enter\n";
3944
3945 # this is a trade-off: we want to be very quick here, so
3946 # save all maps without fsync, and later call a global sync
3947 # (which in turn might be very very slow)
3948 local $USE_FSYNC = 0;
3514 3949
3515 cf::sync_job { 3950 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so 3951 cf::write_runtime_sync; # external watchdog should not bark
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520 3952
3521 # use a peculiar iteration method to avoid tripping on perl 3953 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3954 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3955 # and maps saved/destroyed asynchronously.
3524 warn "emergency_perl_save: begin player save\n"; 3956 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3957 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3958 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3959 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3960 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3961 $pl->save;
3530 } 3962 }
3531 warn "emergency_perl_save: end player save\n"; 3963 info "emergency_perl_save: end player save\n";
3532 3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3966
3533 warn "emergency_perl_save: begin map save\n"; 3967 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3968 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3969 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3970 $map->valid or next;
3537 $map->save; 3971 $map->save;
3538 } 3972 }
3539 warn "emergency_perl_save: end map save\n"; 3973 info "emergency_perl_save: end map save\n";
3540 3974
3975 cf::write_runtime_sync; # external watchdog should not bark
3976
3541 warn "emergency_perl_save: begin database checkpoint\n"; 3977 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3978 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "emergency_perl_save: end database checkpoint\n"; 3979 info "emergency_perl_save: end database checkpoint\n";
3544 3980
3545 warn "emergency_perl_save: begin write uuid\n"; 3981 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3982 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n"; 3983 info "emergency_perl_save: end write uuid\n";
3984
3985 cf::write_runtime_sync; # external watchdog should not bark
3986
3987 trace "emergency_perl_save: syncing database to disk";
3988 BDB::db_env_txn_checkpoint $DB_ENV;
3989
3990 info "emergency_perl_save: starting sync\n";
3991 IO::AIO::aio_sync sub {
3992 info "emergency_perl_save: finished sync\n";
3993 };
3994
3995 cf::write_runtime_sync; # external watchdog should not bark
3996
3997 trace "emergency_perl_save: flushing outstanding aio requests";
3998 while (IO::AIO::nreqs || BDB::nreqs) {
3999 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4000 }
4001
4002 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 4003 };
3549 4004
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3555 warn "emergency_perl_save: leave\n"; 4005 info "emergency_perl_save: leave\n";
3556} 4006}
3557 4007
3558sub post_cleanup { 4008sub post_cleanup {
3559 my ($make_core) = @_; 4009 my ($make_core) = @_;
3560 4010
4011 IO::AIO::flush;
4012
3561 warn Carp::longmess "post_cleanup backtrace" 4013 error Carp::longmess "post_cleanup backtrace"
3562 if $make_core; 4014 if $make_core;
3563 4015
3564 my $fh = pidfile; 4016 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$; 4017 unlink $PIDFILE if <$fh> == $$;
3566} 4018}
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4038 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) { 4039 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"}; 4040 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4041# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 } 4042 }
3591 warn "cleared package $pkg\n";#d#
3592} 4043}
3593 4044
3594sub do_reload_perl() { 4045sub do_reload_perl() {
3595 # can/must only be called in main 4046 # can/must only be called in main
3596 if ($Coro::current != $Coro::main) { 4047 unless (in_main) {
3597 warn "can only reload from main coroutine"; 4048 error "can only reload from main coroutine";
3598 return; 4049 return;
3599 } 4050 }
3600 4051
3601 return if $RELOAD++; 4052 return if $RELOAD++;
3602 4053
3603 my $t1 = EV::time; 4054 my $t1 = AE::time;
3604 4055
3605 while ($RELOAD) { 4056 while ($RELOAD) {
3606 warn "reloading..."; 4057 cf::get_slot 0.1, -1, "reload_perl";
4058 info "perl_reload: reloading...";
3607 4059
3608 warn "entering sync_job"; 4060 trace "perl_reload: entering sync_job";
3609 4061
3610 cf::sync_job { 4062 cf::sync_job {
3611 cf::write_runtime_sync; # external watchdog should not bark
3612 cf::emergency_save; 4063 #cf::emergency_save;
3613 cf::write_runtime_sync; # external watchdog should not bark
3614 4064
3615 warn "syncing database to disk";
3616 BDB::db_env_txn_checkpoint $DB_ENV;
3617
3618 # if anything goes wrong in here, we should simply crash as we already saved
3619
3620 warn "flushing outstanding aio requests";
3621 while (IO::AIO::nreqs || BDB::nreqs) {
3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3623 }
3624
3625 warn "cancelling all extension coros"; 4065 trace "perl_reload: cancelling all extension coros";
3626 $_->cancel for values %EXT_CORO; 4066 $_->cancel for values %EXT_CORO;
3627 %EXT_CORO = (); 4067 %EXT_CORO = ();
3628 4068
3629 warn "removing commands"; 4069 trace "perl_reload: removing commands";
3630 %COMMAND = (); 4070 %COMMAND = ();
3631 4071
3632 warn "removing ext/exti commands"; 4072 trace "perl_reload: removing ext/exti commands";
3633 %EXTCMD = (); 4073 %EXTCMD = ();
3634 %EXTICMD = (); 4074 %EXTICMD = ();
3635 4075
3636 warn "unloading/nuking all extensions"; 4076 trace "perl_reload: unloading/nuking all extensions";
3637 for my $pkg (@EXTS) { 4077 for my $pkg (@EXTS) {
3638 warn "... unloading $pkg"; 4078 trace "... unloading $pkg";
3639 4079
3640 if (my $cb = $pkg->can ("unload")) { 4080 if (my $cb = $pkg->can ("unload")) {
3641 eval { 4081 eval {
3642 $cb->($pkg); 4082 $cb->($pkg);
3643 1 4083 1
3644 } or warn "$pkg unloaded, but with errors: $@"; 4084 } or error "$pkg unloaded, but with errors: $@";
3645 } 4085 }
3646 4086
3647 warn "... clearing $pkg"; 4087 trace "... clearing $pkg";
3648 clear_package $pkg; 4088 clear_package $pkg;
3649 } 4089 }
3650 4090
3651 warn "unloading all perl modules loaded from $LIBDIR"; 4091 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) { 4092 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4093 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654 4094
3655 warn "... unloading $k"; 4095 trace "... unloading $k";
3656 delete $INC{$k}; 4096 delete $INC{$k};
3657 4097
3658 $k =~ s/\.pm$//; 4098 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g; 4099 $k =~ s/\//::/g;
3660 4100
3663 } 4103 }
3664 4104
3665 clear_package $k; 4105 clear_package $k;
3666 } 4106 }
3667 4107
3668 warn "getting rid of safe::, as good as possible"; 4108 trace "perl_reload: getting rid of safe::, as good as possible";
3669 clear_package "safe::$_" 4109 clear_package "safe::$_"
3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4110 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3671 4111
3672 warn "unloading cf.pm \"a bit\""; 4112 trace "perl_reload: unloading cf.pm \"a bit\"";
3673 delete $INC{"cf.pm"}; 4113 delete $INC{"cf.pm"};
3674 delete $INC{"cf/pod.pm"}; 4114 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3675 4115
3676 # don't, removes xs symbols, too, 4116 # don't, removes xs symbols, too,
3677 # and global variables created in xs 4117 # and global variables created in xs
3678 #clear_package __PACKAGE__; 4118 #clear_package __PACKAGE__;
3679 4119
3680 warn "unload completed, starting to reload now"; 4120 info "perl_reload: unload completed, starting to reload now";
3681 4121
3682 warn "reloading cf.pm"; 4122 trace "perl_reload: reloading cf.pm";
3683 require cf; 4123 require cf;
3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4124 cf::_connect_to_perl_1;
3685 4125
3686 warn "loading config and database again"; 4126 trace "perl_reload: loading config and database again";
3687 cf::reload_config; 4127 cf::reload_config;
3688 4128
3689 warn "loading extensions"; 4129 trace "perl_reload: loading extensions";
3690 cf::load_extensions; 4130 cf::load_extensions;
3691 4131
3692 if ($REATTACH_ON_RELOAD) { 4132 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 4133 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 4134 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 4135 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 4136 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 4137 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 4138 reattach $_ for values %PLAYER;
3699 } 4139 }
3700 4140
3701 warn "running post_init jobs"; 4141 cf::_post_init 1;
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3703 4142
3704 warn "leaving sync_job"; 4143 trace "perl_reload: leaving sync_job";
3705 4144
3706 1 4145 1
3707 } or do { 4146 } or do {
3708 warn $@; 4147 error $@;
3709 cf::cleanup "error while reloading, exiting."; 4148 cf::cleanup "perl_reload: error, exiting.";
3710 }; 4149 };
3711 4150
3712 warn "reloaded";
3713 --$RELOAD; 4151 --$RELOAD;
3714 } 4152 }
3715 4153
3716 $t1 = EV::time - $t1; 4154 $t1 = AE::time - $t1;
3717 warn "reload completed in ${t1}s\n"; 4155 info "perl_reload: completed in ${t1}s\n";
3718}; 4156};
3719 4157
3720our $RELOAD_WATCHER; # used only during reload 4158our $RELOAD_WATCHER; # used only during reload
3721 4159
3722sub reload_perl() { 4160sub reload_perl() {
3724 # coro crashes during coro_state_free->destroy here. 4162 # coro crashes during coro_state_free->destroy here.
3725 4163
3726 $RELOAD_WATCHER ||= cf::async { 4164 $RELOAD_WATCHER ||= cf::async {
3727 Coro::AIO::aio_wait cache_extensions; 4165 Coro::AIO::aio_wait cache_extensions;
3728 4166
3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4167 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3730 do_reload_perl; 4168 do_reload_perl;
3731 undef $RELOAD_WATCHER; 4169 undef $RELOAD_WATCHER;
3732 }; 4170 };
3733 }; 4171 };
3734} 4172}
3743 reload_perl; 4181 reload_perl;
3744 }; 4182 };
3745 } 4183 }
3746}; 4184};
3747 4185
3748unshift @INC, $LIBDIR; 4186#############################################################################
3749 4187
3750my $bug_warning = 0; 4188my $bug_warning = 0;
3751 4189
3752our @WAIT_FOR_TICK;
3753our @WAIT_FOR_TICK_BEGIN;
3754
3755sub wait_for_tick { 4190sub wait_for_tick() {
3756 return if tick_inhibit || $Coro::current == $Coro::main; 4191 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3757 4192
3758 my $signal = new Coro::Signal; 4193 $WAIT_FOR_TICK->wait;
3759 push @WAIT_FOR_TICK, $signal;
3760 $signal->wait;
3761} 4194}
3762 4195
3763sub wait_for_tick_begin { 4196sub wait_for_tick_begin() {
3764 return if tick_inhibit || $Coro::current == $Coro::main; 4197 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3765 4198
3766 my $signal = new Coro::Signal; 4199 my $signal = new Coro::Signal;
3767 push @WAIT_FOR_TICK_BEGIN, $signal; 4200 push @WAIT_FOR_TICK_BEGIN, $signal;
3768 $signal->wait; 4201 $signal->wait;
3769} 4202}
3773 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4206 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3774 unless ++$bug_warning > 10; 4207 unless ++$bug_warning > 10;
3775 return; 4208 return;
3776 } 4209 }
3777 4210
3778 cf::server_tick; # one server iteration 4211 cf::one_tick; # one server iteration
4212
4213 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3779 4214
3780 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4215 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4216 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3782 Coro::async_pool { 4217 Coro::async_pool {
3783 $Coro::current->{desc} = "runtime saver"; 4218 $Coro::current->{desc} = "runtime saver";
3784 write_runtime_sync 4219 write_runtime_sync
3785 or warn "ERROR: unable to write runtime file: $!"; 4220 or error "ERROR: unable to write runtime file: $!";
3786 }; 4221 };
3787 } 4222 }
3788 4223
3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4224 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3790 $sig->send; 4225 $sig->send;
3791 } 4226 }
3792 while (my $sig = shift @WAIT_FOR_TICK) { 4227 $WAIT_FOR_TICK->broadcast;
3793 $sig->send;
3794 }
3795 4228
3796 $LOAD = ($NOW - $TICK_START) / $TICK; 4229 $LOAD = ($NOW - $TICK_START) / $TICK;
3797 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4230 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3798 4231
3799 if (0) { 4232 if (0) {
3800 if ($NEXT_TICK) { 4233 if ($NEXT_TICK) {
3801 my $jitter = $TICK_START - $NEXT_TICK; 4234 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4235 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d# 4236 debug "jitter $JITTER\n";#d#
3804 } 4237 }
3805 } 4238 }
3806} 4239}
3807 4240
3808{ 4241{
3809 # configure BDB 4242 # configure BDB
3810 4243
3811 BDB::min_parallel 8; 4244 BDB::min_parallel 16;
3812 BDB::max_poll_reqs $TICK * 0.1; 4245 BDB::max_poll_reqs $TICK * 0.1;
3813 $AnyEvent::BDB::WATCHER->priority (1); 4246 #$AnyEvent::BDB::WATCHER->priority (1);
3814 4247
3815 unless ($DB_ENV) { 4248 unless ($DB_ENV) {
3816 $DB_ENV = BDB::db_env_create; 4249 $DB_ENV = BDB::db_env_create;
3817 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4250 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3818 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4251 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3853 IO::AIO::min_parallel 8; 4286 IO::AIO::min_parallel 8;
3854 IO::AIO::max_poll_time $TICK * 0.1; 4287 IO::AIO::max_poll_time $TICK * 0.1;
3855 undef $AnyEvent::AIO::WATCHER; 4288 undef $AnyEvent::AIO::WATCHER;
3856} 4289}
3857 4290
3858my $_log_backtrace; 4291our $_log_backtrace;
4292our $_log_backtrace_last;
3859 4293
3860sub _log_backtrace { 4294sub _log_backtrace {
3861 my ($msg, @addr) = @_; 4295 my ($msg, @addr) = @_;
3862 4296
3863 $msg =~ s/\n//; 4297 $msg =~ s/\n$//;
3864 4298
4299 if ($_log_backtrace_last eq $msg) {
4300 LOG llevInfo, "[ABT] $msg\n";
4301 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3865 # limit the # of concurrent backtraces 4302 # limit the # of concurrent backtraces
3866 if ($_log_backtrace < 2) { 4303 } elsif ($_log_backtrace < 2) {
4304 $_log_backtrace_last = $msg;
3867 ++$_log_backtrace; 4305 ++$_log_backtrace;
3868 my $perl_bt = Carp::longmess $msg; 4306 my $perl_bt = Carp::longmess $msg;
3869 async { 4307 async {
3870 $Coro::current->{desc} = "abt $msg"; 4308 $Coro::current->{desc} = "abt $msg";
3871 4309
3891 LOG llevInfo, "[ABT] $_\n" for @bt; 4329 LOG llevInfo, "[ABT] $_\n" for @bt;
3892 --$_log_backtrace; 4330 --$_log_backtrace;
3893 }; 4331 };
3894 } else { 4332 } else {
3895 LOG llevInfo, "[ABT] $msg\n"; 4333 LOG llevInfo, "[ABT] $msg\n";
3896 LOG llevInfo, "[ABT] [suppressed]\n"; 4334 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3897 } 4335 }
3898} 4336}
3899 4337
3900# load additional modules 4338# load additional modules
3901use cf::pod; 4339require "cf/$_.pm" for @EXTRA_MODULES;
4340cf::_connect_to_perl_2;
3902 4341
3903END { cf::emergency_save } 4342END { cf::emergency_save }
3904 4343
39051 43441
3906 4345

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines