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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 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 "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 Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %RESOURCE; 113#our %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;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
119our $NOW; 138our $NOW;
120 139
121our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
130our $JITTER; # average jitter 149our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
132 151
133our @POST_INIT; 152our @POST_INIT;
134 153
135our $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;
136 159
137binmode STDOUT; 160binmode STDOUT;
138binmode STDERR; 161binmode STDERR;
139 162
140# read virtual server time, if available 163# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
145} 168}
146 169
170eval "sub TICK() { $TICK } 1" or die;
171
147mkdir $_ 172mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 174
150our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
151 176
152sub cf::map::normalise; 177sub cf::map::normalise;
153 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
154############################################################################# 183#############################################################################
155 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
156=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
157 197
158=over 4 198=over 4
159 199
160=item $cf::UPTIME 200=item $cf::UPTIME
161 201
162The 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.
163 218
164=item $cf::RUNTIME 219=item $cf::RUNTIME
165 220
166The 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
167every server tick. 222every server tick.
173Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
174directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
175unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
176database environment. 231database environment.
177 232
178=item $cf::NOW
179
180The time of the last (current) server tick.
181
182=item $cf::TICK
183
184The interval between server ticks, in seconds.
185
186=item $cf::LOADAVG 233=item $cf::LOADAVG
187 234
188The 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
189(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
190objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
199from wherever your confdir points to. 246from wherever your confdir points to.
200 247
201=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
202 249
203These 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
204returns 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
205per 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.
206 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
207=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
208 272
209This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 275that call.
212 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
213=back 283=back
214 284
215=cut 285=cut
216 286
217BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
218 *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 {
219 my $msg = join "", @_; 294 my $msg = join "", @_;
220 295
221 $msg .= "\n" 296 $msg .= "\n"
222 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
223 298
224 $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;
225 300
226 LOG llevError, $msg; 301 LOG llevWarn, $msg;
227 }; 302};
228}
229 303
230$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
232 306
233 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 311 return;#d#
236 }#d# 312 }#d#
237 313
238 # kill coroutine otherwise 314 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 315 Coro::terminate
241}; 316};
242
243$SIG{__DIE__} = sub { }; #d#?
244 317
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 335)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 337}
265 338
266$EV::DIED = sub { 339$EV::DIED = sub {
267 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
268}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
269 347
270############################################################################# 348#############################################################################
271 349
272=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
273 351
294 $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;
295 $d 373 $d
296 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
297} 375}
298 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
299=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
300 392
301Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
302 394
303=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
309our $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
310 402
311sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
313 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
314=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
315 438
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
318 441
319The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 443is a reload or not.
321 444
322=cut 445=cut
323 446
324sub post_init(&) { 447sub post_init(&) {
325 push @POST_INIT, shift; 448 push @POST_INIT, shift;
326} 449}
327 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 }
466}
467
328=item cf::lock_wait $string 468=item cf::lock_wait $string
329 469
330Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
331 471
332=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
333 473
334Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
337returned. 477returned.
338 478
339Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 480deadlocked coro.
346 486
347Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
348 488
349=cut 489=cut
350 490
351our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 492
354sub lock_wait($) { 493sub lock_wait($) {
355 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 495}
369 496
370sub lock_acquire($) { 497sub lock_acquire($) {
371 my ($key) = @_; 498 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 499}
385 500
386sub lock_active($) { 501sub lock_active($) {
387 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 503}
391 504
392sub freeze_mainloop { 505sub freeze_mainloop {
393 tick_inhibit_inc; 506 tick_inhibit_inc;
394 507
395 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
396} 509}
397 510
398=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
399 512
400Like 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
401get spread over timer. 514get spread over time.
402 515
403=cut 516=cut
404 517
405sub periodic($$) { 518sub periodic($$) {
406 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
411} 524}
412 525
413=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
414 527
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 535
419The 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
420used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
421 538
422Useful for short background jobs. 539Useful for short background jobs.
423 540
424=cut 541=cut
425 542
426our @SLOT_QUEUE; 543our @SLOT_QUEUE;
427our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
428 546
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
432 550
433 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
434 553
435 while () { 554 while () {
436 next_job: 555 next_job:
556
437 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 558
439 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 563 $job->[2]->send;
443 Coro::cede; 564 Coro::cede;
444 goto next_job; 565 goto next_job;
445 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 568 }
447 } 569 }
448 570
449 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 574 } else {
575 $busy = 0;
454 Coro::schedule; 576 Coro::schedule;
455 } 577 }
456 } 578 }
457}; 579};
458 580
459sub get_slot($;$$) { 581sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
461 583
462 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
463 585
464 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
465 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
466 589
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
495=cut 618=cut
496 619
497sub sync_job(&) { 620sub sync_job(&) {
498 my ($job) = @_; 621 my ($job) = @_;
499 622
500 if ($Coro::current == $Coro::main) { 623 if (in_main) {
501 my $time = EV::time; 624 my $time = AE::time;
502 625
503 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
505 628
506 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
507 630
508 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
509 632
510 my $busy = 1; 633 my $busy = 1;
511 my @res; 634 my @res;
512 635
513 (async { 636 (async {
514 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 638 @res = eval { $job->() };
516 warn $@ if $@; 639 error $@ if $@;
517 undef $busy; 640 undef $busy;
518 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
519 642
520 while ($busy) { 643 while ($busy) {
521 if (Coro::nready) { 644 if (Coro::nready) {
523 } else { 646 } else {
524 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
525 } 648 }
526 } 649 }
527 650
528 my $time = EV::time - $time; 651 my $time = AE::time - $time;
529 652
530 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
531 654
532 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
533 } else { 656 } else {
555 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
556 679
557 $coro 680 $coro
558} 681}
559 682
560=item fork_call { }, $args 683=item fork_call { }, @args
561 684
562Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 688never block itself or use any form of event handling.
566 689
567=cut 690=cut
568 691
692sub post_fork {
693 reset_signals;
694}
695
569sub fork_call(&@) { 696sub fork_call(&@) {
570 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
571 698
572 # 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,
573 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
575 702
576 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
577 reset_signals; 704 cf::post_fork;
578 &$cb 705 &$cb
579 }, @args; 706 } @args;
580 707
581 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 )
582} 720}
583 721
584=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
585 723
586=cut 724=cut
623within each server. 761within each server.
624 762
625=cut 763=cut
626 764
627sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
628 my ($name) = @_; 769 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
630 771
631 eval { 772 eval {
632 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
642} 783}
643 784
644our $DB; 785our $DB;
645 786
646sub db_init { 787sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
649 };
650} 789}
651 790
652sub db_get($$) { 791sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
654 793
655 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
656 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
657 798
658 $! ? () 799 $! ? ()
659 : $data 800 : $data
660 }
661} 801}
662 802
663sub db_put($$$) { 803sub db_put($$$) {
664 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 833
694 my @data; 834 my @data;
695 my $md5; 835 my $md5;
696 836
697 for (0 .. $#$src) { 837 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 839 }
701 840
702 # if processing is expensive, check 841 # if processing is expensive, check
703 # checksum first 842 # checksum first
704 if (1) { 843 if (1) {
721 860
722 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 862 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
725 864
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 866
728 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
731 870
741 880
742=cut 881=cut
743 882
744sub datalog($@) { 883sub datalog($@) {
745 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 886}
748 887
749=back 888=back
750 889
751=cut 890=cut
946 1085
947 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1088
950 } elsif (ref $type) { 1089 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
952 1091
953 } else { 1092 } else {
954 shift @arg; 1093 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
956 } 1095 }
957 } 1096 }
958} 1097}
959 1098
960sub _object_attach { 1099sub _object_attach {
970 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
971 } 1110 }
972 1111
973 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
974 } else { 1113 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1115 }
977 1116
978 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
979} 1118}
980 1119
1039 1178
1040 for (@$callbacks) { 1179 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1042 1181
1043 if ($@) { 1182 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1184 override;
1047 } 1185 }
1048 1186
1049 return 1 if $override; 1187 return 1 if $override;
1050 } 1188 }
1129 for (@$attach) { 1267 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1132 } 1270 }
1133 } else { 1271 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1273 }
1136 } 1274 }
1137} 1275}
1138 1276
1139cf::attachable->attach ( 1277cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1167 1305
1168 sync_job { 1306 sync_job {
1169 if (length $$rdata) { 1307 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1173 1312
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1320 aio_close $fh;
1179 1321
1180 if (@$objs) { 1322 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1331 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1333 }
1189 } else { 1334 } else {
1190 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1194 1339
1195 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1342 } else {
1198 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1199 } 1344 }
1200 } else { 1345 } else {
1201 aio_unlink $filename; 1346 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1203 } 1348 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1373 $av = $st->{objs};
1229 } 1374 }
1230 1375
1231 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1234 1380
1235 ($data, $av) 1381 ($data, $av)
1236} 1382}
1237 1383
1238=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1297} 1443}
1298 1444
1299use File::Glob (); 1445use File::Glob ();
1300 1446
1301cf::player->attach ( 1447cf::player->attach (
1302 on_command => sub { 1448 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1304 1450
1305 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1306 or return; 1452 or return;
1307 1453
1315 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1316 1462
1317 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1318 1464
1319 if (ref $msg) { 1465 if (ref $msg) {
1320 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1321 "ARRAY" eq ref $msg
1322 ? @$msg
1323 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1324 1467
1325 my @reply; 1468 my @reply;
1326 1469
1327 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1328 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1330 1473
1331 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1475 if $reply;
1333 1476
1334 } else { 1477 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1479 }
1337 1480
1338 cf::override; 1481 cf::override;
1339 }, 1482 },
1340); 1483);
1341 1484
1342# "readahead" all extensions 1485# "readahead" all extensions
1343sub cache_extensions { 1486sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1487 my $grp = IO::AIO::aio_group;
1345 1488
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1490 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1492 }
1350 }; 1493 };
1351 1494
1352 $grp 1495 $grp
1353} 1496}
1354 1497
1355sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1356 cf::sync_job { 1501 cf::sync_job {
1357 my %todo; 1502 my %todo;
1358 1503
1359 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1505 next unless -r $path;
1378 1523
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1526
1382 $ext{source} = 1527 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1385 . $source 1530 . $source
1386 . "\n};\n1"; 1531 . "\n};\n1";
1387 1532
1388 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1389 } 1534 }
1390 1535
1536 my $pass = 0;
1391 my %done; 1537 my %done;
1392 while (%todo) { 1538 while (%todo) {
1393 my $progress; 1539 my $progress;
1394 1540
1541 ++$pass;
1542
1543 ext:
1395 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1546 next ext
1398 unless exists $done{$_}; 1547 unless exists $done{$_};
1399 } 1548 }
1400 1549
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1551
1403 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1556
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1558 if exists $v->{meta}{mandatory};
1411 1559
1412 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;
1413 } 1569 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1570 }
1419 1571
1420 skip: 1572 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1582 }
1424 }; 1583 };
1425} 1584}
1426 1585
1427############################################################################# 1586#############################################################################
1511 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1512 } 1671 }
1513 } 1672 }
1514} 1673}
1515 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
1516sub save($) { 1688sub save($) {
1517 my ($pl) = @_; 1689 my ($pl) = @_;
1518 1690
1519 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1520 1692
1525 1697
1526 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1528 1700
1529 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];
1530 1705
1531 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1707 cf::cede_to_tick;
1533} 1708}
1534 1709
1568 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1569 1744
1570 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1571 $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
1572 1747
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1749 $pl->deactivate;
1750
1575 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;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1578 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1579 1756
1580 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1636 \@logins 1813 \@logins
1637} 1814}
1638 1815
1639=item $player->maps 1816=item $player->maps
1640 1817
1818=item cf::player::maps $login
1819
1641Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1642player. May block. 1821player. May block.
1643 1822
1644=cut 1823=cut
1645 1824
1707=cut 1886=cut
1708 1887
1709sub find_by_path($) { 1888sub find_by_path($) {
1710 my ($path) = @_; 1889 my ($path) = @_;
1711 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1712 my ($match, $specificity); 1893 my ($match, $specificity);
1713 1894
1714 for my $region (list) { 1895 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1744sub generate_random_map { 1925sub generate_random_map {
1745 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1746 1927
1747 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
1748 1929
1749 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1759 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1760 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1761 (cf::region::find $rmp->{region}), $rmp->{custom}
1762 )
1763} 1931}
1764 1932
1765=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1766 1934
1767Register 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
1772 1940
1773sub register { 1941sub register {
1774 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 1943 my $pkg = caller;
1776 1944
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 1946
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1948}
1782 1949
1783# also paths starting with '/' 1950# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1952
1786sub thawer_merge { 1953sub thawer_merge {
1787 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1788 1955
1789 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1794} 1961}
1795 1962
1796sub normalise { 1963sub normalise {
1797 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1798 1965
1799 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1800 1967
1801 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1802 1969
1803 # map plan: 1970 # map plan:
1804 # 1971 #
1819 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1820 $path = "$base/$path"; 1987 $path = "$base/$path";
1821 } 1988 }
1822 1989
1823 for ($path) { 1990 for ($path) {
1824 redo if s{//}{/};
1825 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1826 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1827 } 1993 }
1828 1994
1829 $path 1995 $path
1843 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1844 return $self; 2010 return $self;
1845 } 2011 }
1846 } 2012 }
1847 2013
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 2015 ()
1850} 2016}
1851 2017
2018# may re-bless or do other evil things
1852sub init { 2019sub init {
1853 my ($self) = @_; 2020 my ($self) = @_;
1854 2021
1855 $self 2022 $self
1856} 2023}
1887 2054
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1890} 2057}
1891 2058
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 2059sub decay_objects {
1902 my ($self) = @_; 2060 my ($self) = @_;
1903 2061
1904 return if $self->{deny_reset}; 2062 return if $self->{deny_reset};
1905 2063
1930 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1931 2089
1932 1 2090 1
1933} 2091}
1934 2092
2093# used to laod the header of an original map
1935sub load_header_orig { 2094sub load_header_orig {
1936 my ($self) = @_; 2095 my ($self) = @_;
1937 2096
1938 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1939} 2098}
1940 2099
2100# used to laod the header of an instantiated map
1941sub load_header_temp { 2101sub load_header_temp {
1942 my ($self) = @_; 2102 my ($self) = @_;
1943 2103
1944 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1945} 2105}
1946 2106
2107# called after loading the header from an instantiated map
1947sub prepare_temp { 2108sub prepare_temp {
1948 my ($self) = @_; 2109 my ($self) = @_;
1949 2110
1950 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1951 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1952 # safety 2113 # safety
1953 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1954 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1955} 2116}
1956 2117
2118# called after loading the header from an original map
1957sub prepare_orig { 2119sub prepare_orig {
1958 my ($self) = @_; 2120 my ($self) = @_;
1959 2121
1960 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1961 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1985 2147
1986sub find; 2148sub find;
1987sub find { 2149sub find {
1988 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1989 2151
2152 cf::cede_to_tick;
2153
1990 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1991 2155
1992 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2158
1995 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
2000 or return; 2161 or return;
2001 2162
2002 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
2003 2164
2015 2176
2016 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2017 } 2178 }
2018} 2179}
2019 2180
2020sub pre_load { } 2181sub pre_load { }
2021sub post_load { } 2182#sub post_load { } # XS
2022 2183
2023sub load { 2184sub load {
2024 my ($self) = @_; 2185 my ($self) = @_;
2025 2186
2026 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2029 2190
2030 { 2191 {
2031 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2032 2193
2033 return unless $self->valid; 2194 return unless $self->valid;
2034 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2035
2036 $self->in_memory (cf::MAP_LOADING);
2037 2196
2038 $self->alloc; 2197 $self->alloc;
2039 2198
2040 $self->pre_load; 2199 $self->pre_load;
2041 cf::cede_to_tick; 2200 cf::cede_to_tick;
2042 2201
2202 if (exists $self->{load_path}) {
2043 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block; 2204 $f->skip_block;
2045 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2046 or return; 2206 or return;
2047 2207
2048 $self->post_load_original 2208 $self->post_load_original
2049 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2050 2210
2051 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2052 utf8::encode $uniq; 2212 utf8::encode $uniq;
2053 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2055 $self->clear_unique_items; 2215 $self->clear_unique_items;
2056 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2058 } 2219 }
2059 } 2220 }
2060 }
2061 2221
2062 $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);
2063 2229
2064 cf::cede_to_tick; 2230 cf::cede_to_tick;
2065 # now do the right thing for maps 2231 # now do the right thing for maps
2066 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2067 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2071 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2238 $self->decay_objects;
2073 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2074 $self->update_buttons; 2240 $self->update_buttons;
2075 cf::cede_to_tick; 2241 cf::cede_to_tick;
2076 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2077 cf::cede_to_tick;
2078 $self->activate;
2079 } 2243 }
2080 2244
2081 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2083
2084 $self->in_memory (cf::MAP_ACTIVE);
2085 } 2247 }
2086 2248
2087 $self->post_load; 2249 $self->post_load;
2088}
2089 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
2090sub customise_for { 2257sub customise_for {
2091 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2092 2259
2093 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2261 if $self->per_player;
2097# if $self->per_party; 2264# if $self->per_party;
2098 2265
2099 $self 2266 $self
2100} 2267}
2101 2268
2102# find and load all maps in the 3x3 area around a map
2103sub load_neighbours {
2104 my ($map) = @_;
2105
2106 my @neigh; # diagonal neighbours
2107
2108 for (0 .. 3) {
2109 my $neigh = $map->tile_path ($_)
2110 or next;
2111 $neigh = find $neigh, $map
2112 or next;
2113 $neigh->load;
2114
2115 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 }
2119
2120 for (grep defined $_->[0], @neigh) {
2121 my ($path, $origin) = @$_;
2122 my $neigh = find $path, $origin
2123 or next;
2124 $neigh->load;
2125 }
2126}
2127
2128sub find_sync { 2269sub find_sync {
2129 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2130 2271
2131 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
2132} 2277}
2133 2278
2134sub do_load_sync { 2279sub do_load_sync {
2135 my ($map) = @_; 2280 my ($map) = @_;
2136 2281
2282 # it's a bug to call this from the main context
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2139 2285
2140 cf::sync_job { $map->load }; 2286 $map->load;
2141} 2287}
2142 2288
2143our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2145 2291
2146sub find_async { 2292sub find_async {
2147 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2148 2294
2149 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2150 2296
2151 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2153 } 2299 }
2154 2300
2155 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2156 2302
2157 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2171 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2172 2318
2173 () 2319 ()
2174} 2320}
2175 2321
2322# common code, used by both ->save and ->swapout
2176sub save { 2323sub _save {
2177 my ($self) = @_; 2324 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2325
2181 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2182 2327
2183 return unless $self->dirty; 2328 return unless $self->dirty;
2184 2329
2204 } else { 2349 } else {
2205 $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);
2206 } 2351 }
2207} 2352}
2208 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2209sub swap_out { 2362sub swap_out {
2210 my ($self) = @_; 2363 my ($self) = @_;
2211 2364
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2217 return if $self->players; 2369 return if $self->players;
2218 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
2219 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2220 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
2221 $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};
2222 2421
2223 $self->deactivate; 2422 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2424 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2425
2271 $self->unlink_save; 2426 $self->unlink_save;
2272 $self->destroy; 2427 $self->destroy;
2273} 2428}
2274 2429
2282 2437
2283 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2284 2439
2285 $self->unlink_save; 2440 $self->unlink_save;
2286 2441
2287 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2447
2349 : normalise $_ 2504 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2506 ]
2352} 2507}
2353 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
2354=back 2541=back
2355 2542
2356=head3 cf::object 2543=head3 cf::object
2357 2544
2358=cut 2545=cut
2423 2610
2424our $SAY_CHANNEL = { 2611our $SAY_CHANNEL = {
2425 id => "say", 2612 id => "say",
2426 title => "Map", 2613 title => "Map",
2427 reply => "say ", 2614 reply => "say ",
2428 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.",
2429}; 2616};
2430 2617
2431our $CHAT_CHANNEL = { 2618our $CHAT_CHANNEL = {
2432 id => "chat", 2619 id => "chat",
2433 title => "Chat", 2620 title => "Chat",
2490 2677
2491Freezes 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}>).
2492 2679
2493The 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.
2494for 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,
2495though, 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
2496map. 2683map.
2497 2684
2498Will never block. 2685Will never block.
2499 2686
2500=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2522 my ($self) = @_; 2709 my ($self) = @_;
2523 2710
2524 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2525 2712
2713 ++$self->{_link_recursion};
2714
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2716
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2530 2719
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2721}
2533 2722
2534sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2536 2725
2553 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2555 2744
2556 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2559 2748
2560 $map->load; 2749 $map->load;
2561 $map->load_neighbours;
2562 2750
2563 return unless $self->contr->active; 2751 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2752
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2569} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2570 2760
2761}
2762
2571=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)]])
2572 2764
2573Moves 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
2574her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2575that 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
2576the 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
2583 2775
2584our $GOTOGEN; 2776our $GOTOGEN;
2585 2777
2586sub cf::object::player::goto { 2778sub cf::object::player::goto {
2587 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 }
2588 2786
2589 # 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
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2789
2592 $self->enter_link; 2790 $self->enter_link;
2612 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2613 } 2811 }
2614 } 2812 }
2615 2813
2616 my $map = eval { 2814 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2618 2816
2619 if ($map) { 2817 if ($map) {
2620 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2820 } else {
2623 $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);
2624 } 2822 }
2625 2823
2626 $map 2824 $map
2634 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2637 } 2835 }
2638 2836
2639 $done->() if $done; 2837 $done->($self) if $done;
2640 })->prio (1); 2838 })->prio (1);
2641} 2839}
2642 2840
2643=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2644 2842
2712 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2713 2911
2714 unless (eval { 2912 unless (eval {
2715 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2716 2914
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2726 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2727 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 }
2728 2941
2729 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2730 2943
2731 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2737 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "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. "
2739 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2741 2954
2742 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 2956 $self->leave_link;
2744 } 2957 }
2745 })->prio (1); 2958 })->prio (1);
2746} 2959}
2747 2960
2759sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2761 2974
2762 utf8::encode $text; 2975 utf8::encode $text;
2763 $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);
2764} 3002}
2765 3003
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 3005
2768Send 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
2772 3010
2773=cut 3011=cut
2774 3012
2775# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2777 "c/identify" => { 3021 "c/identify" => {
2778 id => "infobox", 3022 id => "infobox",
2779 title => "Identify", 3023 title => "Identify",
2780 reply => undef, 3024 reply => undef,
2781 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2783 "c/examine" => { 3027 "c/examine" => {
2784 id => "infobox", 3028 id => "infobox",
2785 title => "Examine", 3029 title => "Examine",
2786 reply => undef, 3030 reply => undef,
2787 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",
2788 }, 3038 },
2789 "c/book" => { 3039 "c/book" => {
2790 id => "infobox", 3040 id => "infobox",
2791 title => "Book", 3041 title => "Book",
2792 reply => undef, 3042 reply => undef,
2808 id => "infobox", 3058 id => "infobox",
2809 title => "Body Parts", 3059 title => "Body Parts",
2810 reply => undef, 3060 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2812 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
2813 "c/skills" => { 3069 "c/skills" => {
2814 id => "infobox", 3070 id => "infobox",
2815 title => "Skills", 3071 title => "Skills",
2816 reply => undef, 3072 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 3073 tooltip => "Shows your experience per skill and item power",
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 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
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",
2818 }, 3098 },
2819 "c/uptime" => { 3099 "c/uptime" => {
2820 id => "infobox", 3100 id => "infobox",
2821 title => "Uptime", 3101 title => "Uptime",
2822 reply => undef, 3102 reply => undef,
2832 id => "party", 3112 id => "party",
2833 title => "Party", 3113 title => "Party",
2834 reply => "gsay ", 3114 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3115 tooltip => "Messages and chat related to your party",
2836 }, 3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2837); 3125);
2838 3126
2839sub cf::client::send_msg { 3127sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3129
2846 3134
2847 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2850 3138
2851 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2855 3141
2856 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3147 }
2863 3148
2864 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2865 } 3150 }
2866 3151
2867 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2868 3153
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3154 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2873 3157
2874 my $pkt = "msg " 3158 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3161 );
2878 3162
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3164}
2916 3165
2917=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2918 3167
2919Sends an ext event to the client. 3168Sends an ext event to the client.
2922 3171
2923sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2925 3174
2926 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3180 }
2932} 3181}
2933 3182
2934=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2935 3184
2938=cut 3187=cut
2939 3188
2940sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2942 3191
2943 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950} 3195}
2951 3196
2952=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2953 3198
2954Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
3009 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3010 3255
3011 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3012 3257
3013 if (ref $msg) { 3258 if (ref $msg) {
3014 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3015 "ARRAY" eq ref $msg
3016 ? @$msg
3017 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3018 3260
3019 my @reply; 3261 my @reply;
3020 3262
3021 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3022 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3024 3266
3025 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3268 if $reply;
3027 3269
3028 } else { 3270 } else {
3029 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";
3030 } 3272 }
3031 3273
3032 cf::override; 3274 cf::override;
3033 }, 3275 },
3034); 3276);
3054 3296
3055 $coro 3297 $coro
3056} 3298}
3057 3299
3058cf::client->attach ( 3300cf::client->attach (
3059 on_destroy => sub { 3301 on_client_destroy => sub {
3060 my ($ns) = @_; 3302 my ($ns) = @_;
3061 3303
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3305 },
3064); 3306);
3080our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3081 3323
3082$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3083 3325
3084$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3087 sort time 3329 sort time
3088)); 3330));
3089 3331
3090# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3095 3337
3096 cf::object 3338 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3340 insert remove name archname title slaying race decrease split
3341 value
3099 3342
3100 cf::object::player 3343 cf::object::player
3101 player 3344 player
3102 3345
3103 cf::player 3346 cf::player
3109=cut 3352=cut
3110 3353
3111for ( 3354for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3118) { 3361) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3364 for @funs;
3123} 3365}
3124 3366
3139 3381
3140 my $qcode = $code; 3382 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3143 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3144 local $_; 3389 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3390
3147 my $eval = 3391 my $eval =
3148 "do {\n" 3392 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3395 . $code
3152 . "\n}" 3396 . "\n}"
3153 ; 3397 ;
3154 3398
3399 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 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 }
3158 3408
3159 if ($@) { 3409 if ($@) {
3160 warn "$@"; 3410 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3163 } 3413 }
3164 3414
3165 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3166} 3416}
3167 3417
3181=cut 3431=cut
3182 3432
3183sub register_script_function { 3433sub register_script_function {
3184 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3185 3435
3186 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3188} 3438}
3189 3439
3190=back 3440=back
3191 3441
3192=cut 3442=cut
3201 # for this (global event?) 3451 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3453
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3455
3206 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3207 3457
3208 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3209 0 < aio_load $path, $facedata
3210 or die "$path: $!";
3211
3212 $facedata = Coro::Storable::thaw $facedata;
3213 3459
3214 $facedata->{version} == 2 3460 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3462
3217 # 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]);
3218 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3466 type => FT_RSRC,
3220 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),
3221 }; 3469 };
3222 cf::cede_to_tick; 3470 cf::cede_to_tick;
3223 3471
3224 { 3472 {
3225 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3477
3230 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 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} ;
3234 3483
3235 cf::cede_to_tick; 3484 cf::cede_to_tick;
3236 } 3485 }
3237 3486
3238 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3243 3492
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3496 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3498 }
3250 3499
3251 cf::cede_to_tick; 3500 cf::cede_to_tick;
3252 } 3501 }
3253 } 3502 }
3262 3511
3263 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3264 } 3513 }
3265 3514
3266 { 3515 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3270 3517
3271 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3519 if (defined (my $type = $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3522
3276 if ($info->{type} & 1) { 3523 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3291 } else { 3526 } else {
3292 $RESOURCE{$name} = $info; 3527# $RESOURCE{$name} = $info; # unused
3293 } 3528 }
3294 3529
3295 cf::cede_to_tick; 3530 cf::cede_to_tick;
3296 } 3531 }
3297 } 3532 }
3298 3533
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3535
3301 1 3536 1
3302} 3537}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3538
3324register_exticmd fx_want => sub { 3539register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3540 my ($ns, $want) = @_;
3326 3541
3327 while (my ($k, $v) = each %$want) { 3542 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3581sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
3369} 3584}
3370 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
3371sub reload_resources { 3606sub reload_resources {
3372 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
3373 3608
3609 reload_exp_table;
3610 reload_materials;
3374 reload_facedata; 3611 reload_facedata;
3612 reload_sound;
3375 reload_archetypes; 3613 reload_archetypes;
3376 reload_regions; 3614 reload_regions;
3377 reload_treasures; 3615 reload_treasures;
3378 3616
3379 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
3380} 3618}
3381 3619
3382sub reload_config { 3620sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3621 trace "reloading config file...\n";
3384 or return;
3385 3622
3386 local $/; 3623 my $config = load_file "$CONFDIR/config";
3387 *CFG = YAML::Load <$fh>; 3624 utf8::decode $config;
3625 *CFG = decode_yaml $config;
3388 3626
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3628
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3631
3394 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
3417 3655
3418 seek $fh, 0, 0; 3656 seek $fh, 0, 0;
3419 print $fh $$; 3657 print $fh $$;
3420} 3658}
3421 3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
3422sub main { 3669sub main {
3423 cf::init_globals; # initialise logging 3670 cf::init_globals; # initialise logging
3424 3671
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3676
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3678
3438 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
3445 }; 3686 };
3446 3687
3447 evthread_start IO::AIO::poll_fileno; 3688 evthread_start IO::AIO::poll_fileno;
3448 3689
3449 cf::sync_job { 3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3450 reload_resources; 3699 reload_resources;
3451 reload_config; 3700 reload_config;
3452 db_init; 3701 db_init;
3453 3702
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3703 cf::init_uuid;
3457 cf::init_signals; 3704 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3705 cf::init_skills;
3460 3706
3461 cf::init_beforeplay; 3707 cf::init_beforeplay;
3462 3708
3463 atomic; 3709 atomic;
3465 load_extensions; 3711 load_extensions;
3466 3712
3467 utime time, time, $RUNTIMEFILE; 3713 utime time, time, $RUNTIMEFILE;
3468 3714
3469 # no (long-running) fork's whatsoever before this point(!) 3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3718
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3719 cf::_post_init 0;
3473 }; 3720 };
3474 3721
3475 EV::loop; 3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
3476} 3730}
3477 3731
3478############################################################################# 3732#############################################################################
3479# initialisation and cleanup 3733# initialisation and cleanup
3480 3734
3481# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
3482BEGIN { 3736BEGIN {
3483 our %SIGWATCHER = (); 3737 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
3487 }; 3741 };
3488 } 3742 }
3489} 3743}
3490 3744
3491sub write_runtime_sync { 3745sub write_runtime_sync {
3746 my $t0 = AE::time;
3747
3492 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
3494 3750
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3752
3497 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
3498 3754
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3756 or return;
3501 3757
3502 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
3517 or return; 3773 or return;
3518 3774
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3776 and return;
3521 3777
3522 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3779
3524 1 3780 1
3525} 3781}
3526 3782
3527our $uuid_lock; 3783our $uuid_lock;
3539 or return; 3795 or return;
3540 3796
3541 my $value = uuid_seq uuid_cur; 3797 my $value = uuid_seq uuid_cur;
3542 3798
3543 unless ($value) { 3799 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3800 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3801 return;
3546 } 3802 }
3547 3803
3548 my $value = uuid_str $value + $uuid_skip; 3804 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3805 $uuid_skip = 0;
3559 or return; 3815 or return;
3560 3816
3561 aio_rename "$uuid~", $uuid 3817 aio_rename "$uuid~", $uuid
3562 and return; 3818 and return;
3563 3819
3564 warn "uuid file written ($value).\n"; 3820 trace "uuid file written ($value).\n";
3565 3821
3566 1 3822 1
3567 3823
3568} 3824}
3569 3825
3575} 3831}
3576 3832
3577sub emergency_save() { 3833sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
3579 3835
3580 warn "emergency_perl_save: enter\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
3581 3842
3582 cf::sync_job { 3843 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 3844 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 3845
3588 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 3849 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 3852 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 3854 $pl->save;
3597 } 3855 }
3598 warn "emergency_perl_save: end player save\n"; 3856 info "emergency_perl_save: end player save\n";
3599 3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3600 warn "emergency_perl_save: begin map save\n"; 3860 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 3863 $map->valid or next;
3604 $map->save; 3864 $map->save;
3605 } 3865 }
3606 warn "emergency_perl_save: end map save\n"; 3866 info "emergency_perl_save: end map save\n";
3607 3867
3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3608 warn "emergency_perl_save: begin database checkpoint\n"; 3870 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3611 3873
3612 warn "emergency_perl_save: begin write uuid\n"; 3874 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 3875 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 3896 };
3616 3897
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 3898 info "emergency_perl_save: leave\n";
3623} 3899}
3624 3900
3625sub post_cleanup { 3901sub post_cleanup {
3626 my ($make_core) = @_; 3902 my ($make_core) = @_;
3627 3903
3904 IO::AIO::flush;
3905
3628 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 3907 if $make_core;
3630 3908
3631 my $fh = pidfile; 3909 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 3910 unlink $PIDFILE if <$fh> == $$;
3633} 3911}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3932 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3933 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3935 }
3658 warn "cleared package $pkg\n";#d#
3659} 3936}
3660 3937
3661sub do_reload_perl() { 3938sub do_reload_perl() {
3662 # can/must only be called in main 3939 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
3664 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
3665 return; 3942 return;
3666 } 3943 }
3667 3944
3668 return if $RELOAD++; 3945 return if $RELOAD++;
3669 3946
3670 my $t1 = EV::time; 3947 my $t1 = AE::time;
3671 3948
3672 while ($RELOAD) { 3949 while ($RELOAD) {
3673 warn "reloading..."; 3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3674 3952
3675 warn "entering sync_job"; 3953 trace "perl_reload: entering sync_job";
3676 3954
3677 cf::sync_job { 3955 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 3956 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 3957
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 3960 %EXT_CORO = ();
3695 3961
3696 warn "removing commands"; 3962 trace "perl_reload: removing commands";
3697 %COMMAND = (); 3963 %COMMAND = ();
3698 3964
3699 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
3700 %EXTCMD = (); 3966 %EXTCMD = ();
3701 %EXTICMD = (); 3967 %EXTICMD = ();
3702 3968
3703 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
3706 3972
3707 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
3708 eval { 3974 eval {
3709 $cb->($pkg); 3975 $cb->($pkg);
3710 1 3976 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3712 } 3978 }
3713 3979
3714 warn "... clearing $pkg"; 3980 trace "... clearing $pkg";
3715 clear_package $pkg; 3981 clear_package $pkg;
3716 } 3982 }
3717 3983
3718 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 3987
3722 warn "... unloading $k"; 3988 trace "... unloading $k";
3723 delete $INC{$k}; 3989 delete $INC{$k};
3724 3990
3725 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3727 3993
3730 } 3996 }
3731 3997
3732 clear_package $k; 3998 clear_package $k;
3733 } 3999 }
3734 4000
3735 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 4002 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 4004
3739 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 4008
3743 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3744 # and global variables created in xs 4010 # and global variables created in xs
3745 #clear_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3746 4012
3747 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3748 4014
3749 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3750 require cf; 4016 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3752 4018
3753 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3754 cf::reload_config; 4020 cf::reload_config;
3755 4021
3756 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3757 cf::load_extensions; 4023 cf::load_extensions;
3758 4024
3759 if ($REATTACH_ON_RELOAD) { 4025 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3763 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
3766 } 4032 }
3767 4033
3768 warn "running post_init jobs"; 4034 cf::_post_init 1;
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770 4035
3771 warn "leaving sync_job"; 4036 trace "perl_reload: leaving sync_job";
3772 4037
3773 1 4038 1
3774 } or do { 4039 } or do {
3775 warn $@; 4040 error $@;
3776 cf::cleanup "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3777 }; 4042 };
3778 4043
3779 warn "reloaded";
3780 --$RELOAD; 4044 --$RELOAD;
3781 } 4045 }
3782 4046
3783 $t1 = EV::time - $t1; 4047 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4048 info "perl_reload: completed in ${t1}s\n";
3785}; 4049};
3786 4050
3787our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3788 4052
3789sub reload_perl() { 4053sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3792 4056
3793 $RELOAD_WATCHER ||= cf::async { 4057 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4058 Coro::AIO::aio_wait cache_extensions;
3795 4059
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4061 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3799 }; 4063 };
3800 }; 4064 };
3801} 4065}
3810 reload_perl; 4074 reload_perl;
3811 }; 4075 };
3812 } 4076 }
3813}; 4077};
3814 4078
3815unshift @INC, $LIBDIR; 4079#############################################################################
3816 4080
3817my $bug_warning = 0; 4081my $bug_warning = 0;
3818 4082
3819our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN;
3821
3822sub wait_for_tick { 4083sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3824 4085
3825 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3826 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait;
3828} 4087}
3829 4088
3830sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3832 4091
3833 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4094 $signal->wait;
3836} 4095}
3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3841 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3842 return; 4101 return;
3843 } 4102 }
3844 4103
3845 cf::server_tick; # one server iteration 4104 cf::one_tick; # one server iteration
4105
4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3846 4107
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4110 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4111 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4112 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4113 or error "ERROR: unable to write runtime file: $!";
3853 }; 4114 };
3854 } 4115 }
3855 4116
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4118 $sig->send;
3858 } 4119 }
3859 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3860 $sig->send;
3861 }
3862 4121
3863 $LOAD = ($NOW - $TICK_START) / $TICK; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3865 4124
3866 if (0) { 4125 if (0) {
3867 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3871 } 4130 }
3872 } 4131 }
3873} 4132}
3874 4133
3875{ 4134{
3876 # configure BDB 4135 # configure BDB
3877 4136
3878 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3881 4140
3882 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3920 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3921 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3922 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3923} 4182}
3924 4183
3925my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3926 4186
3927sub _log_backtrace { 4187sub _log_backtrace {
3928 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3929 4189
3930 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3931 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3932 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3933 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3934 ++$_log_backtrace; 4198 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3936 async { 4200 async {
3937 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3938 4202
3958 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3959 --$_log_backtrace; 4223 --$_log_backtrace;
3960 }; 4224 };
3961 } else { 4225 } else {
3962 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3964 } 4228 }
3965} 4229}
3966 4230
3967# load additional modules 4231# load additional modules
3968use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3969 4234
3970END { cf::emergency_save } 4235END { cf::emergency_save }
3971 4236
39721 42371
3973 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines