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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines