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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines