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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 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# <http://www.gnu.org/licenses/>.
18# 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 ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
123our $NOW; 138our $NOW;
124 139
125our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
126our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
127our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
134our $JITTER; # average jitter 149our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
136 151
137our @POST_INIT; 152our @POST_INIT;
138 153
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
140 159
141binmode STDOUT; 160binmode STDOUT;
142binmode STDERR; 161binmode STDERR;
143 162
144# read virtual server time, if available 163# read virtual server time, if available
146 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
149} 168}
150 169
170eval "sub TICK() { $TICK } 1" or die;
171
151mkdir $_ 172mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 174
154our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
155 176
156sub cf::map::normalise; 177sub cf::map::normalise;
157 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
158############################################################################# 183#############################################################################
159 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
160=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
161 197
162=over 4 198=over 4
163 199
164=item $cf::UPTIME 200=item $cf::UPTIME
165 201
166The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
167 218
168=item $cf::RUNTIME 219=item $cf::RUNTIME
169 220
170The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
171every server tick. 222every server tick.
177Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
178directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
179unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
180database environment. 231database environment.
181 232
182=item $cf::NOW
183
184The time of the last (current) server tick.
185
186=item $cf::TICK
187
188The interval between server ticks, in seconds.
189
190=item $cf::LOADAVG 233=item $cf::LOADAVG
191 234
192The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
193(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
194objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
203from wherever your confdir points to. 246from wherever your confdir points to.
204 247
205=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
206 249
207These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
208returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
209per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
210 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
211=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
212 272
213This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
214C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
215that call. 275that call.
216 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
217=back 283=back
218 284
219=cut 285=cut
220 286
221BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
222 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
223 my $msg = join "", @_; 294 my $msg = join "", @_;
224 295
225 $msg .= "\n" 296 $msg .= "\n"
226 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
227 298
228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
229 300
230 LOG llevError, $msg; 301 LOG llevWarn, $msg;
231 }; 302};
232}
233 303
234$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
236 306
237 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 311 return;#d#
240 }#d# 312 }#d#
241 313
242 # kill coroutine otherwise 314 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 315 Coro::terminate
245}; 316};
246
247$SIG{__DIE__} = sub { }; #d#?
248 317
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
266)) { 335)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 337}
269 338
270$EV::DIED = sub { 339$EV::DIED = sub {
271 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
272}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
273 347
274############################################################################# 348#############################################################################
275 349
276=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
277 351
298 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
299 $d 373 $d
300 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
301} 375}
302 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
303=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
304 392
305Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
306 394
307=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
314 402
315sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
316sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
317 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
318=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
319 438
320Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
322 441
323The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
324is a reload or not. 443is a reload or not.
325 444
326=cut 445=cut
327 446
328sub post_init(&) { 447sub post_init(&) {
329 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
330} 466}
331 467
332=item cf::lock_wait $string 468=item cf::lock_wait $string
333 469
334Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
373} 509}
374 510
375=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
376 512
377Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer. 514get spread over time.
379 515
380=cut 516=cut
381 517
382sub periodic($$) { 518sub periodic($$) {
383 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
387 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
388} 524}
389 525
390=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
391 527
392Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
393This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
394of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
395 535
396The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
397used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
398 538
399Useful for short background jobs. 539Useful for short background jobs.
400 540
401=cut 541=cut
402 542
403our @SLOT_QUEUE; 543our @SLOT_QUEUE;
404our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
405 546
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
409 550
410 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
411 553
412 while () { 554 while () {
413 next_job: 555 next_job:
556
414 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 558
416 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 563 $job->[2]->send;
420 Coro::cede; 564 Coro::cede;
421 goto next_job; 565 goto next_job;
422 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 568 }
424 } 569 }
425 570
426 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
429 $signal->wait;
430 } else { 574 } else {
575 $busy = 0;
431 Coro::schedule; 576 Coro::schedule;
432 } 577 }
433 } 578 }
434}; 579};
435 580
436sub get_slot($;$$) { 581sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
438 583
439 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
440 585
441 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
442 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
443 589
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
472=cut 618=cut
473 619
474sub sync_job(&) { 620sub sync_job(&) {
475 my ($job) = @_; 621 my ($job) = @_;
476 622
477 if ($Coro::current == $Coro::main) { 623 if (in_main) {
478 my $time = EV::time; 624 my $time = AE::time;
479 625
480 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
482 628
483 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
484 630
485 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
486 632
487 my $busy = 1; 633 my $busy = 1;
488 my @res; 634 my @res;
489 635
490 (async { 636 (async {
491 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
492 @res = eval { $job->() }; 638 @res = eval { $job->() };
493 warn $@ if $@; 639 error $@ if $@;
494 undef $busy; 640 undef $busy;
495 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
496 642
497 while ($busy) { 643 while ($busy) {
498 if (Coro::nready) { 644 if (Coro::nready) {
500 } else { 646 } else {
501 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
502 } 648 }
503 } 649 }
504 650
505 my $time = EV::time - $time; 651 my $time = AE::time - $time;
506 652
507 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
508 654
509 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
510 } else { 656 } else {
532 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
533 679
534 $coro 680 $coro
535} 681}
536 682
537=item fork_call { }, $args 683=item fork_call { }, @args
538 684
539Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
540process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
541Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
542never block itself or use any form of event handling. 688never block itself or use any form of event handling.
543 689
544=cut 690=cut
545 691
692sub post_fork {
693 reset_signals;
694}
695
546sub fork_call(&@) { 696sub fork_call(&@) {
547 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
548 698
549 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
550 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
551 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
552 702
553 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
554 reset_signals; 704 cf::post_fork;
555 &$cb 705 &$cb
556 }, @args; 706 } @args;
557 707
558 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
559} 720}
560 721
561=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
562 723
563=cut 724=cut
600within each server. 761within each server.
601 762
602=cut 763=cut
603 764
604sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
605 my ($name) = @_; 769 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
607 771
608 eval { 772 eval {
609 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
619} 783}
620 784
621our $DB; 785our $DB;
622 786
623sub db_init { 787sub db_init {
624 cf::sync_job {
625 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
626 };
627} 789}
628 790
629sub db_get($$) { 791sub db_get($$) {
630 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
631 793
632 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
633 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
634 798
635 $! ? () 799 $! ? ()
636 : $data 800 : $data
637 }
638} 801}
639 802
640sub db_put($$$) { 803sub db_put($$$) {
641 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
642 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
670 833
671 my @data; 834 my @data;
672 my $md5; 835 my $md5;
673 836
674 for (0 .. $#$src) { 837 for (0 .. $#$src) {
675 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
676 or Carp::croak "$src->[$_]: $!";
677 } 839 }
678 840
679 # if processing is expensive, check 841 # if processing is expensive, check
680 # checksum first 842 # checksum first
681 if (1) { 843 if (1) {
698 860
699 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
700 my $data = $process->(\@data); 862 my $data = $process->(\@data);
701 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
702 864
703 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
704 866
705 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
706 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
707 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
708 870
718 880
719=cut 881=cut
720 882
721sub datalog($@) { 883sub datalog($@) {
722 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
723 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
724} 886}
725 887
726=back 888=back
727 889
728=cut 890=cut
923 1085
924 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
925 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
926 1088
927 } elsif (ref $type) { 1089 } elsif (ref $type) {
928 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
929 1091
930 } else { 1092 } else {
931 shift @arg; 1093 shift @arg;
932 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
933 } 1095 }
934 } 1096 }
935} 1097}
936 1098
937sub _object_attach { 1099sub _object_attach {
947 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
948 } 1110 }
949 1111
950 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
951 } else { 1113 } else {
952 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
953 } 1115 }
954 1116
955 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
956} 1118}
957 1119
1016 1178
1017 for (@$callbacks) { 1179 for (@$callbacks) {
1018 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1019 1181
1020 if ($@) { 1182 if ($@) {
1021 warn "$@";
1022 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1023 override; 1184 override;
1024 } 1185 }
1025 1186
1026 return 1 if $override; 1187 return 1 if $override;
1027 } 1188 }
1106 for (@$attach) { 1267 for (@$attach) {
1107 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1108 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1109 } 1270 }
1110 } else { 1271 } else {
1111 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1112 } 1273 }
1113 } 1274 }
1114} 1275}
1115 1276
1116cf::attachable->attach ( 1277cf::attachable->attach (
1143 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1144 1305
1145 sync_job { 1306 sync_job {
1146 if (length $$rdata) { 1307 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1148 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1149 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1150 1312
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1155 aio_close $fh; 1320 aio_close $fh;
1156 1321
1157 if (@$objs) { 1322 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1163 aio_close $fh; 1331 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1333 }
1166 } else { 1334 } else {
1167 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1170 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1171 1339
1172 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1174 } else { 1342 } else {
1175 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1176 } 1344 }
1177 } else { 1345 } else {
1178 aio_unlink $filename; 1346 aio_unlink $filename;
1179 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1180 } 1348 }
1204 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs}; 1373 $av = $st->{objs};
1206 } 1374 }
1207 1375
1208 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1209 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1210 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1211 1380
1212 ($data, $av) 1381 ($data, $av)
1213} 1382}
1214 1383
1215=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1274} 1443}
1275 1444
1276use File::Glob (); 1445use File::Glob ();
1277 1446
1278cf::player->attach ( 1447cf::player->attach (
1279 on_command => sub { 1448 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1281 1450
1282 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1283 or return; 1452 or return;
1284 1453
1292 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1293 1462
1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295 1464
1296 if (ref $msg) { 1465 if (ref $msg) {
1297 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301 1467
1302 my @reply; 1468 my @reply;
1303 1469
1304 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1305 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1307 1473
1308 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1475 if $reply;
1310 1476
1311 } else { 1477 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1479 }
1314 1480
1315 cf::override; 1481 cf::override;
1316 }, 1482 },
1317); 1483);
1318 1484
1319# "readahead" all extensions 1485# "readahead" all extensions
1320sub cache_extensions { 1486sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1487 my $grp = IO::AIO::aio_group;
1322 1488
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1490 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1492 }
1327 }; 1493 };
1328 1494
1329 $grp 1495 $grp
1330} 1496}
1331 1497
1332sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1333 cf::sync_job { 1501 cf::sync_job {
1334 my %todo; 1502 my %todo;
1335 1503
1336 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1337 next unless -r $path; 1505 next unless -r $path;
1355 1523
1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1358 1526
1359 $ext{source} = 1527 $ext{source} =
1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1361 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1362 . $source 1530 . $source
1363 . "\n};\n1"; 1531 . "\n};\n1";
1364 1532
1365 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1366 } 1534 }
1367 1535
1536 my $pass = 0;
1368 my %done; 1537 my %done;
1369 while (%todo) { 1538 while (%todo) {
1370 my $progress; 1539 my $progress;
1371 1540
1541 ++$pass;
1542
1543 ext:
1372 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1546 next ext
1375 unless exists $done{$_}; 1547 unless exists $done{$_};
1376 } 1548 }
1377 1549
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1551
1380 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1556
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1558 if exists $v->{meta}{mandatory};
1388 1559
1389 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1390 } 1569 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1570 }
1396 1571
1397 skip: 1572 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1400 } 1582 }
1401 }; 1583 };
1402} 1584}
1403 1585
1404############################################################################# 1586#############################################################################
1488 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1489 } 1671 }
1490 } 1672 }
1491} 1673}
1492 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1493sub save($) { 1688sub save($) {
1494 my ($pl) = @_; 1689 my ($pl) = @_;
1495 1690
1496 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1497 1692
1502 1697
1503 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1505 1700
1506 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1705
1508 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1707 cf::cede_to_tick;
1510} 1708}
1511 1709
1545 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1546 1744
1547 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1549 1747
1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1551 $pl->deactivate; 1749 $pl->deactivate;
1750
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1554 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1555 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1556 1756
1557 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1558 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1559 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1613 \@logins 1813 \@logins
1614} 1814}
1615 1815
1616=item $player->maps 1816=item $player->maps
1617 1817
1818=item cf::player::maps $login
1819
1618Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1619player. May block. 1821player. May block.
1620 1822
1621=cut 1823=cut
1622 1824
1684=cut 1886=cut
1685 1887
1686sub find_by_path($) { 1888sub find_by_path($) {
1687 my ($path) = @_; 1889 my ($path) = @_;
1688 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1689 my ($match, $specificity); 1893 my ($match, $specificity);
1690 1894
1691 for my $region (list) { 1895 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1721sub generate_random_map { 1925sub generate_random_map {
1722 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1723 1927
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1929
1726 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1735 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1736 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1737 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1738 (cf::region::find $rmp->{region}), $rmp->{custom}
1739 )
1740} 1931}
1741 1932
1742=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1743 1934
1744Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1749 1940
1750sub register { 1941sub register {
1751 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1752 my $pkg = caller; 1943 my $pkg = caller;
1753 1944
1754 no strict;
1755 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1756 1946
1757 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1758} 1948}
1759 1949
1760# also paths starting with '/' 1950# also paths starting with '/'
1761$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1762 1952
1763sub thawer_merge { 1953sub thawer_merge {
1764 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1765 1955
1766 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1771} 1961}
1772 1962
1773sub normalise { 1963sub normalise {
1774 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1775 1965
1776 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1777 1967
1778 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1779 1969
1780 # map plan: 1970 # map plan:
1781 # 1971 #
1796 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1797 $path = "$base/$path"; 1987 $path = "$base/$path";
1798 } 1988 }
1799 1989
1800 for ($path) { 1990 for ($path) {
1801 redo if s{//}{/};
1802 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1803 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1804 } 1993 }
1805 1994
1806 $path 1995 $path
1820 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1821 return $self; 2010 return $self;
1822 } 2011 }
1823 } 2012 }
1824 2013
1825 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1826 () 2015 ()
1827} 2016}
1828 2017
2018# may re-bless or do other evil things
1829sub init { 2019sub init {
1830 my ($self) = @_; 2020 my ($self) = @_;
1831 2021
1832 $self 2022 $self
1833} 2023}
1898 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1899 2089
1900 1 2090 1
1901} 2091}
1902 2092
2093# used to laod the header of an original map
1903sub load_header_orig { 2094sub load_header_orig {
1904 my ($self) = @_; 2095 my ($self) = @_;
1905 2096
1906 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1907} 2098}
1908 2099
2100# used to laod the header of an instantiated map
1909sub load_header_temp { 2101sub load_header_temp {
1910 my ($self) = @_; 2102 my ($self) = @_;
1911 2103
1912 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1913} 2105}
1914 2106
2107# called after loading the header from an instantiated map
1915sub prepare_temp { 2108sub prepare_temp {
1916 my ($self) = @_; 2109 my ($self) = @_;
1917 2110
1918 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1919 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1920 # safety 2113 # safety
1921 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1922 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1923} 2116}
1924 2117
2118# called after loading the header from an original map
1925sub prepare_orig { 2119sub prepare_orig {
1926 my ($self) = @_; 2120 my ($self) = @_;
1927 2121
1928 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1929 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1953 2147
1954sub find; 2148sub find;
1955sub find { 2149sub find {
1956 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1957 2151
2152 cf::cede_to_tick;
2153
1958 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1959 2155
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1961 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1962 2158
1963 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1980 2176
1981 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1982 } 2178 }
1983} 2179}
1984 2180
1985sub pre_load { } 2181sub pre_load { }
1986sub post_load { } 2182#sub post_load { } # XS
1987 2183
1988sub load { 2184sub load {
1989 my ($self) = @_; 2185 my ($self) = @_;
1990 2186
1991 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1994 2190
1995 { 2191 {
1996 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1997 2193
1998 return unless $self->valid; 2194 return unless $self->valid;
1999 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2000
2001 $self->in_memory (cf::MAP_LOADING);
2002 2196
2003 $self->alloc; 2197 $self->alloc;
2004 2198
2005 $self->pre_load; 2199 $self->pre_load;
2006 cf::cede_to_tick; 2200 cf::cede_to_tick;
2007 2201
2202 if (exists $self->{load_path}) {
2008 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block; 2204 $f->skip_block;
2010 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2011 or return; 2206 or return;
2012 2207
2013 $self->post_load_original 2208 $self->post_load_original
2014 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2015 2210
2016 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2017 utf8::encode $uniq; 2212 utf8::encode $uniq;
2018 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2020 $self->clear_unique_items; 2215 $self->clear_unique_items;
2021 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2023 } 2219 }
2024 } 2220 }
2025 }
2026 2221
2027 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2028 2229
2029 cf::cede_to_tick; 2230 cf::cede_to_tick;
2030 # now do the right thing for maps 2231 # now do the right thing for maps
2031 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2032 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2036 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2037 $self->decay_objects; 2238 $self->decay_objects;
2038 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2039 $self->update_buttons; 2240 $self->update_buttons;
2040 cf::cede_to_tick; 2241 cf::cede_to_tick;
2041 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2042 } 2243 }
2043 2244
2044 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2247 }
2049 2248
2050 $self->post_load; 2249 $self->post_load;
2051}
2052 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2053sub customise_for { 2257sub customise_for {
2054 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2055 2259
2056 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2261 if $self->per_player;
2060# if $self->per_party; 2264# if $self->per_party;
2061 2265
2062 $self 2266 $self
2063} 2267}
2064 2268
2065# find and load all maps in the 3x3 area around a map
2066sub load_neighbours {
2067 my ($map) = @_;
2068
2069 my @neigh; # diagonal neighbours
2070
2071 for (0 .. 3) {
2072 my $neigh = $map->tile_path ($_)
2073 or next;
2074 $neigh = find $neigh, $map
2075 or next;
2076 $neigh->load;
2077
2078 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 }
2082
2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
2085 my $neigh = find $path, $origin
2086 or next;
2087 $neigh->load;
2088 }
2089}
2090
2091sub find_sync { 2269sub find_sync {
2092 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2093 2271
2094 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2095} 2277}
2096 2278
2097sub do_load_sync { 2279sub do_load_sync {
2098 my ($map) = @_; 2280 my ($map) = @_;
2099 2281
2282 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2102 2285
2103 cf::sync_job { $map->load }; 2286 $map->load;
2104} 2287}
2105 2288
2106our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2108 2291
2109sub find_async { 2292sub find_async {
2110 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2111 2294
2112 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2113 2296
2114 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2116 } 2299 }
2117 2300
2118 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2119 2302
2120 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2135 2318
2136 () 2319 ()
2137} 2320}
2138 2321
2322# common code, used by both ->save and ->swapout
2139sub save { 2323sub _save {
2140 my ($self) = @_; 2324 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2325
2144 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2145 2327
2146 return unless $self->dirty; 2328 return unless $self->dirty;
2147 2329
2167 } else { 2349 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2351 }
2170} 2352}
2171 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2172sub swap_out { 2362sub swap_out {
2173 my ($self) = @_; 2363 my ($self) = @_;
2174 2364
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2180 return if $self->players; 2369 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2182 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2183 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2184 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2185 2421
2186 $self->deactivate; 2422 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2424 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2425
2234 $self->unlink_save; 2426 $self->unlink_save;
2235 $self->destroy; 2427 $self->destroy;
2236} 2428}
2237 2429
2245 2437
2246 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2247 2439
2248 $self->unlink_save; 2440 $self->unlink_save;
2249 2441
2250 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2447
2312 : normalise $_ 2504 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2506 ]
2315} 2507}
2316 2508
2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2540
2317=back 2541=back
2318 2542
2319=head3 cf::object 2543=head3 cf::object
2320 2544
2321=cut 2545=cut
2386 2610
2387our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2388 id => "say", 2612 id => "say",
2389 title => "Map", 2613 title => "Map",
2390 reply => "say ", 2614 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2616};
2393 2617
2394our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2395 id => "chat", 2619 id => "chat",
2396 title => "Chat", 2620 title => "Chat",
2453 2677
2454Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2455 2679
2456The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2459map. 2683map.
2460 2684
2461Will never block. 2685Will never block.
2462 2686
2463=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2485 my ($self) = @_; 2709 my ($self) = @_;
2486 2710
2487 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2488 2712
2713 ++$self->{_link_recursion};
2714
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2716
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2493 2719
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2721}
2496 2722
2497sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2499 2725
2516 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2518 2744
2519 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2522 2748
2523 $map->load; 2749 $map->load;
2524 $map->load_neighbours;
2525 2750
2526 return unless $self->contr->active; 2751 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2752
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2532} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2533 2760
2761}
2762
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2764
2536Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2546 2775
2547our $GOTOGEN; 2776our $GOTOGEN;
2548 2777
2549sub cf::object::player::goto { 2778sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2551 2786
2552 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2789
2555 $self->enter_link; 2790 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2576 } 2811 }
2577 } 2812 }
2578 2813
2579 my $map = eval { 2814 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2816
2582 if ($map) { 2817 if ($map) {
2583 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2820 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2822 }
2588 2823
2589 $map 2824 $map
2597 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2600 } 2835 }
2601 2836
2602 $done->() if $done; 2837 $done->($self) if $done;
2603 })->prio (1); 2838 })->prio (1);
2604} 2839}
2605 2840
2606=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2607 2842
2675 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2676 2911
2677 unless (eval { 2912 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2679 2914
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2691 2941
2692 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2693 2943
2694 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2954
2705 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2956 $self->leave_link;
2707 } 2957 }
2708 })->prio (1); 2958 })->prio (1);
2709} 2959}
2710 2960
2722sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2724 2974
2725 utf8::encode $text; 2975 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2727} 3002}
2728 3003
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3005
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2735 3010
2736=cut 3011=cut
2737 3012
2738# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2740 "c/identify" => { 3021 "c/identify" => {
2741 id => "infobox", 3022 id => "infobox",
2742 title => "Identify", 3023 title => "Identify",
2743 reply => undef, 3024 reply => undef,
2744 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2746 "c/examine" => { 3027 "c/examine" => {
2747 id => "infobox", 3028 id => "infobox",
2748 title => "Examine", 3029 title => "Examine",
2749 reply => undef, 3030 reply => undef,
2750 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3038 },
2752 "c/book" => { 3039 "c/book" => {
2753 id => "infobox", 3040 id => "infobox",
2754 title => "Book", 3041 title => "Book",
2755 reply => undef, 3042 reply => undef,
2783 id => "infobox", 3070 id => "infobox",
2784 title => "Skills", 3071 title => "Skills",
2785 reply => undef, 3072 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 3073 tooltip => "Shows your experience per skill and item power",
2787 }, 3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
2788 "c/resistances" => { 3081 "c/resistances" => {
2789 id => "infobox", 3082 id => "infobox",
2790 title => "Resistances", 3083 title => "Resistances",
2791 reply => undef, 3084 reply => undef,
2792 tooltip => "Shows your resistances", 3085 tooltip => "Shows your resistances",
2794 "c/pets" => { 3087 "c/pets" => {
2795 id => "infobox", 3088 id => "infobox",
2796 title => "Pets", 3089 title => "Pets",
2797 reply => undef, 3090 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
2799 }, 3098 },
2800 "c/uptime" => { 3099 "c/uptime" => {
2801 id => "infobox", 3100 id => "infobox",
2802 title => "Uptime", 3101 title => "Uptime",
2803 reply => undef, 3102 reply => undef,
2859 my $pkt = "msg " 3158 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3161 );
2863 3162
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2875} 3164}
2876 3165
2877=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2878 3167
2879Sends an ext event to the client. 3168Sends an ext event to the client.
2882 3171
2883sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2885 3174
2886 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3180 }
2892} 3181}
2893 3182
2894=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2895 3184
2898=cut 3187=cut
2899 3188
2900sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2902 3191
2903 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 }
2910} 3195}
2911 3196
2912=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2913 3198
2914Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2969 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2970 3255
2971 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2972 3257
2973 if (ref $msg) { 3258 if (ref $msg) {
2974 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2975 "ARRAY" eq ref $msg
2976 ? @$msg
2977 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2978 3260
2979 my @reply; 3261 my @reply;
2980 3262
2981 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2982 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2984 3266
2985 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2986 if $reply; 3268 if $reply;
2987 3269
2988 } else { 3270 } else {
2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2990 } 3272 }
2991 3273
2992 cf::override; 3274 cf::override;
2993 }, 3275 },
2994); 3276);
3014 3296
3015 $coro 3297 $coro
3016} 3298}
3017 3299
3018cf::client->attach ( 3300cf::client->attach (
3019 on_destroy => sub { 3301 on_client_destroy => sub {
3020 my ($ns) = @_; 3302 my ($ns) = @_;
3021 3303
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3305 },
3024); 3306);
3040our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3041 3323
3042$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3043 3325
3044$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3047 sort time 3329 sort time
3048)); 3330));
3049 3331
3050# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3075 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3076 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3077 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3078 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3079) { 3361) {
3080 no strict 'refs';
3081 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3083 for @funs; 3364 for @funs;
3084} 3365}
3085 3366
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3104 3385
3105 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3106 3387
3388 my @res;
3107 local $_; 3389 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3390
3110 my $eval = 3391 my $eval =
3111 "do {\n" 3392 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3395 . $code
3115 . "\n}" 3396 . "\n}"
3116 ; 3397 ;
3117 3398
3399 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3121 3408
3122 if ($@) { 3409 if ($@) {
3123 warn "$@"; 3410 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3126 } 3413 }
3127 3414
3128 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3129} 3416}
3130 3417
3144=cut 3431=cut
3145 3432
3146sub register_script_function { 3433sub register_script_function {
3147 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3148 3435
3149 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3151} 3438}
3152 3439
3153=back 3440=back
3154 3441
3155=cut 3442=cut
3164 # for this (global event?) 3451 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3453
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3455
3169 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3170 3457
3171 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3459
3177 $facedata->{version} == 2 3460 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3462
3180 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3466 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3469 };
3185 cf::cede_to_tick; 3470 cf::cede_to_tick;
3186 3471
3187 { 3472 {
3188 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3477
3193 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3197 3483
3198 cf::cede_to_tick; 3484 cf::cede_to_tick;
3199 } 3485 }
3200 3486
3201 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3206 3492
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3496 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3498 }
3213 3499
3214 cf::cede_to_tick; 3500 cf::cede_to_tick;
3215 } 3501 }
3216 } 3502 }
3225 3511
3226 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3227 } 3513 }
3228 3514
3229 { 3515 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3233 3517
3234 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3521
3239 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3254 } else { 3524 } else {
3255 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3256 } 3526 }
3257 3527
3258 cf::cede_to_tick; 3528 cf::cede_to_tick;
3259 } 3529 }
3260 } 3530 }
3261 3531
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3533
3264 1 3534 1
3265} 3535}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3536
3287register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3289 3539
3290 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3579sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3332} 3582}
3333 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3334sub reload_resources { 3604sub reload_resources {
3335 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3336 3606
3607 reload_exp_table;
3608 reload_materials;
3337 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3338 reload_archetypes; 3611 reload_archetypes;
3339 reload_regions; 3612 reload_regions;
3340 reload_treasures; 3613 reload_treasures;
3341 3614
3342 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3343} 3616}
3344 3617
3345sub reload_config { 3618sub reload_config {
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3347 or return;
3348 3620
3349 local $/; 3621 my $config = load_file "$CONFDIR/config";
3350 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3351 3624
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3353 3626
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3356 3629
3357 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3380 3653
3381 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3382 print $fh $$; 3655 print $fh $$;
3383} 3656}
3384 3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3385sub main { 3667sub main {
3386 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3387 3669
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3674
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3676
3400 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3407 }; 3684 };
3408 3685
3409 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3410 3687
3411 cf::sync_job { 3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3412 reload_resources; 3697 reload_resources;
3413 reload_config; 3698 reload_config;
3414 db_init; 3699 db_init;
3415 3700
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3701 cf::init_uuid;
3419 cf::init_signals; 3702 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3703 cf::init_skills;
3422 3704
3423 cf::init_beforeplay; 3705 cf::init_beforeplay;
3424 3706
3425 atomic; 3707 atomic;
3427 load_extensions; 3709 load_extensions;
3428 3710
3429 utime time, time, $RUNTIMEFILE; 3711 utime time, time, $RUNTIMEFILE;
3430 3712
3431 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3716
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3435 }; 3718 };
3436 3719
3437 EV::loop; 3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3438} 3728}
3439 3729
3440############################################################################# 3730#############################################################################
3441# initialisation and cleanup 3731# initialisation and cleanup
3442 3732
3443# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3444BEGIN { 3734BEGIN {
3445 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3449 }; 3739 };
3450 } 3740 }
3451} 3741}
3452 3742
3453sub write_runtime_sync { 3743sub write_runtime_sync {
3744 my $t0 = AE::time;
3745
3454 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3456 3748
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3750
3459 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3460 3752
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3754 or return;
3463 3755
3464 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3479 or return; 3771 or return;
3480 3772
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3774 and return;
3483 3775
3484 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3777
3486 1 3778 1
3487} 3779}
3488 3780
3489our $uuid_lock; 3781our $uuid_lock;
3501 or return; 3793 or return;
3502 3794
3503 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3504 3796
3505 unless ($value) { 3797 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3507 return; 3799 return;
3508 } 3800 }
3509 3801
3510 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3803 $uuid_skip = 0;
3521 or return; 3813 or return;
3522 3814
3523 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3524 and return; 3816 and return;
3525 3817
3526 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3527 3819
3528 1 3820 1
3529 3821
3530} 3822}
3531 3823
3537} 3829}
3538 3830
3539sub emergency_save() { 3831sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3541 3833
3542 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3543 3840
3544 cf::sync_job { 3841 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549 3843
3550 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3551 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3552 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3553 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3554 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3555 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3556 $pl->valid or next; 3850 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3558 $pl->save; 3852 $pl->save;
3559 } 3853 }
3560 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3561 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3562 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3563 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3564 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3565 $map->valid or next; 3861 $map->valid or next;
3566 $map->save; 3862 $map->save;
3567 } 3863 }
3568 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3569 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3570 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3571 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3572 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3573 3871
3574 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1; 3873 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3577 }; 3894 };
3578 3895
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3584 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3585} 3897}
3586 3898
3587sub post_cleanup { 3899sub post_cleanup {
3588 my ($make_core) = @_; 3900 my ($make_core) = @_;
3589 3901
3902 IO::AIO::flush;
3903
3590 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3905 if $make_core;
3592 3906
3593 my $fh = pidfile; 3907 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3595} 3909}
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3930 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3931 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3933 }
3620 warn "cleared package $pkg\n";#d#
3621} 3934}
3622 3935
3623sub do_reload_perl() { 3936sub do_reload_perl() {
3624 # can/must only be called in main 3937 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3626 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3627 return; 3940 return;
3628 } 3941 }
3629 3942
3630 return if $RELOAD++; 3943 return if $RELOAD++;
3631 3944
3632 my $t1 = EV::time; 3945 my $t1 = AE::time;
3633 3946
3634 while ($RELOAD) { 3947 while ($RELOAD) {
3635 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3636 3950
3637 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3638 3952
3639 cf::sync_job { 3953 cf::sync_job {
3640 cf::write_runtime_sync; # external watchdog should not bark
3641 cf::emergency_save; 3954 #cf::emergency_save;
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 3955
3644 warn "syncing database to disk";
3645 BDB::db_env_txn_checkpoint $DB_ENV;
3646
3647 # if anything goes wrong in here, we should simply crash as we already saved
3648
3649 warn "flushing outstanding aio requests";
3650 while (IO::AIO::nreqs || BDB::nreqs) {
3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3652 }
3653
3654 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3655 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3656 %EXT_CORO = (); 3958 %EXT_CORO = ();
3657 3959
3658 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3659 %COMMAND = (); 3961 %COMMAND = ();
3660 3962
3661 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3662 %EXTCMD = (); 3964 %EXTCMD = ();
3663 %EXTICMD = (); 3965 %EXTICMD = ();
3664 3966
3665 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3666 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3667 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3668 3970
3669 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3670 eval { 3972 eval {
3671 $cb->($pkg); 3973 $cb->($pkg);
3672 1 3974 1
3673 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3674 } 3976 }
3675 3977
3676 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3677 clear_package $pkg; 3979 clear_package $pkg;
3678 } 3980 }
3679 3981
3680 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683 3985
3684 warn "... unloading $k"; 3986 trace "... unloading $k";
3685 delete $INC{$k}; 3987 delete $INC{$k};
3686 3988
3687 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3689 3991
3692 } 3994 }
3693 3995
3694 clear_package $k; 3996 clear_package $k;
3695 } 3997 }
3696 3998
3697 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3698 clear_package "safe::$_" 4000 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 4002
3701 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 4006
3705 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3706 # and global variables created in xs 4008 # and global variables created in xs
3707 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3708 4010
3709 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3710 4012
3711 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3712 require cf; 4014 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3714 4016
3715 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3716 cf::reload_config; 4018 cf::reload_config;
3717 4019
3718 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3719 cf::load_extensions; 4021 cf::load_extensions;
3720 4022
3721 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3722 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3723 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3724 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3725 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3726 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3727 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3728 } 4030 }
3729 4031
3730 warn "running post_init jobs"; 4032 cf::_post_init 1;
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732 4033
3733 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3734 4035
3735 1 4036 1
3736 } or do { 4037 } or do {
3737 warn $@; 4038 error $@;
3738 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3739 }; 4040 };
3740 4041
3741 warn "reloaded";
3742 --$RELOAD; 4042 --$RELOAD;
3743 } 4043 }
3744 4044
3745 $t1 = EV::time - $t1; 4045 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3747}; 4047};
3748 4048
3749our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3750 4050
3751sub reload_perl() { 4051sub reload_perl() {
3753 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3754 4054
3755 $RELOAD_WATCHER ||= cf::async { 4055 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 4056 Coro::AIO::aio_wait cache_extensions;
3757 4057
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 4059 do_reload_perl;
3760 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3761 }; 4061 };
3762 }; 4062 };
3763} 4063}
3772 reload_perl; 4072 reload_perl;
3773 }; 4073 };
3774 } 4074 }
3775}; 4075};
3776 4076
3777unshift @INC, $LIBDIR; 4077#############################################################################
3778 4078
3779my $bug_warning = 0; 4079my $bug_warning = 0;
3780 4080
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4081sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4083
3787 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4085}
3791 4086
3792sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4089
3795 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4092 $signal->wait;
3798} 4093}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3804 return; 4099 return;
3805 } 4100 }
3806 4101
3807 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4105
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4108 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4110 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3815 }; 4112 };
3816 } 4113 }
3817 4114
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4116 $sig->send;
3820 } 4117 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4119
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4122
3828 if (0) { 4123 if (0) {
3829 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3833 } 4128 }
3834 } 4129 }
3835} 4130}
3836 4131
3837{ 4132{
3838 # configure BDB 4133 # configure BDB
3839 4134
3840 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4138
3844 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3885} 4180}
3886 4181
3887my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3888 4184
3889sub _log_backtrace { 4185sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3891 4187
3892 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3893 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4196 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3898 async { 4198 async {
3899 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3900 4200
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4221 --$_log_backtrace;
3922 }; 4222 };
3923 } else { 4223 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4226 }
3927} 4227}
3928 4228
3929# load additional modules 4229# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3931 4232
3932END { cf::emergency_save } 4233END { cf::emergency_save }
3933 4234
39341 42351
3935 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines