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.450 by root, Mon Sep 22 01:33:09 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 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 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
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
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 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; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
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
127 146
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 149our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
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;
132 159
133binmode STDOUT; 160binmode STDOUT;
134binmode STDERR; 161binmode STDERR;
135 162
136# read virtual server time, if available 163# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 165 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
141} 168}
142 169
170eval "sub TICK() { $TICK } 1" or die;
171
143mkdir $_ 172mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 174
146our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
147 176
148sub cf::map::normalise; 177sub cf::map::normalise;
149 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
150############################################################################# 183#############################################################################
151 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
152=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
153 197
154=over 4 198=over 4
155 199
156=item $cf::UPTIME 200=item $cf::UPTIME
157 201
158The 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.
159 218
160=item $cf::RUNTIME 219=item $cf::RUNTIME
161 220
162The 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
163every server tick. 222every server tick.
169Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
170directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
172database environment. 231database environment.
173 232
174=item $cf::NOW
175
176The time of the last (current) server tick.
177
178=item $cf::TICK
179
180The interval between server ticks, in seconds.
181
182=item $cf::LOADAVG 233=item $cf::LOADAVG
183 234
184The 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
185(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
186objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
195from wherever your confdir points to. 246from wherever your confdir points to.
196 247
197=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
198 249
199These 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
200returns 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
201per 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.
202 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
203=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
204 272
205This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 275that call.
208 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
209=back 283=back
210 284
211=cut 285=cut
212 286
213BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 294 my $msg = join "", @_;
216 295
217 $msg .= "\n" 296 $msg .= "\n"
218 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
219 298
220 $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;
221 300
222 LOG llevError, $msg; 301 LOG llevWarn, $msg;
223 }; 302};
224}
225 303
226$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
228 306
229 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 311 return;#d#
232 }#d# 312 }#d#
233 313
234 # kill coroutine otherwise 314 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 315 Coro::terminate
237}; 316};
238
239$SIG{__DIE__} = sub { }; #d#?
240 317
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 335)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 337}
261 338
262$EV::DIED = sub { 339$EV::DIED = sub {
263 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
264}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
265 347
266############################################################################# 348#############################################################################
267 349
268=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
269 351
290 $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;
291 $d 373 $d
292 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
293} 375}
294 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
295=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
296 392
297Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
298 394
299=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
305our $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
306 402
307sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
467
310=item cf::lock_wait $string 468=item cf::lock_wait $string
311 469
312Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
313 471
314=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
315 473
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
319returned. 477returned.
320 478
321Locks 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
322deadlocked coro. 480deadlocked coro.
328 486
329Return 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.
330 488
331=cut 489=cut
332 490
333our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 492
336sub lock_wait($) { 493sub lock_wait($) {
337 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 495}
350 496
351sub lock_acquire($) { 497sub lock_acquire($) {
352 my ($key) = @_; 498 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 499}
366 500
367sub lock_active($) { 501sub lock_active($) {
368 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 503}
372 504
373sub freeze_mainloop { 505sub freeze_mainloop {
374 tick_inhibit_inc; 506 tick_inhibit_inc;
375 507
376 Coro::guard \&tick_inhibit_dec; 508 &Guard::guard (\&tick_inhibit_dec);
377} 509}
378 510
379=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
380 512
381Like 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
382get spread over timer. 514get spread over time.
383 515
384=cut 516=cut
385 517
386sub periodic($$) { 518sub periodic($$) {
387 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
391 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
392} 524}
393 525
394=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
395 527
396Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
397This 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
398of 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.
399 535
400The 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
401used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
402 538
403Useful for short background jobs. 539Useful for short background jobs.
404 540
405=cut 541=cut
406 542
407our @SLOT_QUEUE; 543our @SLOT_QUEUE;
408our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
409 546
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
413 550
414 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
415 553
416 while () { 554 while () {
417 next_job: 555 next_job:
556
418 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 558
420 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 563 $job->[2]->send;
424 Coro::cede; 564 Coro::cede;
425 goto next_job; 565 goto next_job;
426 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 568 }
428 } 569 }
429 570
430 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
433 $signal->wait;
434 } else { 574 } else {
575 $busy = 0;
435 Coro::schedule; 576 Coro::schedule;
436 } 577 }
437 } 578 }
438}; 579};
439 580
440sub get_slot($;$$) { 581sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
442 583
443 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
444 585
445 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
446 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
447 589
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
476=cut 618=cut
477 619
478sub sync_job(&) { 620sub sync_job(&) {
479 my ($job) = @_; 621 my ($job) = @_;
480 622
481 if ($Coro::current == $Coro::main) { 623 if (in_main) {
482 my $time = EV::time; 624 my $time = AE::time;
483 625
484 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
486 628
487 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
488 630
489 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
490 632
491 my $busy = 1; 633 my $busy = 1;
492 my @res; 634 my @res;
493 635
494 (async { 636 (async {
495 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
496 @res = eval { $job->() }; 638 @res = eval { $job->() };
497 warn $@ if $@; 639 error $@ if $@;
498 undef $busy; 640 undef $busy;
499 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
500 642
501 while ($busy) { 643 while ($busy) {
502 if (Coro::nready) { 644 if (Coro::nready) {
504 } else { 646 } else {
505 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
506 } 648 }
507 } 649 }
508 650
509 my $time = EV::time - $time; 651 my $time = AE::time - $time;
510 652
511 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
512 654
513 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
514 } else { 656 } else {
536 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
537 679
538 $coro 680 $coro
539} 681}
540 682
541=item fork_call { }, $args 683=item fork_call { }, @args
542 684
543Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
544process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
545Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
546never block itself or use any form of event handling. 688never block itself or use any form of event handling.
547 689
548=cut 690=cut
549 691
692sub post_fork {
693 reset_signals;
694}
695
550sub fork_call(&@) { 696sub fork_call(&@) {
551 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
552 698
553 # 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,
554 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
555 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
556 702
557 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
558 reset_signals; 704 cf::post_fork;
559 &$cb 705 &$cb
560 }, @args; 706 } @args;
561 707
562 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 )
563} 720}
564 721
565=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
566 723
567=cut 724=cut
604within each server. 761within each server.
605 762
606=cut 763=cut
607 764
608sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
609 my ($name) = @_; 769 my ($name) = @_;
610 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
611 771
612 eval { 772 eval {
613 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
623} 783}
624 784
625our $DB; 785our $DB;
626 786
627sub db_init { 787sub db_init {
628 cf::sync_job {
629 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
630 };
631} 789}
632 790
633sub db_get($$) { 791sub db_get($$) {
634 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
635 793
636 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
637 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
638 798
639 $! ? () 799 $! ? ()
640 : $data 800 : $data
641 }
642} 801}
643 802
644sub db_put($$$) { 803sub db_put($$$) {
645 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
646 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
674 833
675 my @data; 834 my @data;
676 my $md5; 835 my $md5;
677 836
678 for (0 .. $#$src) { 837 for (0 .. $#$src) {
679 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
680 or Carp::croak "$src->[$_]: $!";
681 } 839 }
682 840
683 # if processing is expensive, check 841 # if processing is expensive, check
684 # checksum first 842 # checksum first
685 if (1) { 843 if (1) {
702 860
703 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
704 my $data = $process->(\@data); 862 my $data = $process->(\@data);
705 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
706 864
707 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
708 866
709 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
710 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
711 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
712 870
722 880
723=cut 881=cut
724 882
725sub datalog($@) { 883sub datalog($@) {
726 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
727 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
728} 886}
729 887
730=back 888=back
731 889
732=cut 890=cut
927 1085
928 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
929 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
930 1088
931 } elsif (ref $type) { 1089 } elsif (ref $type) {
932 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
933 1091
934 } else { 1092 } else {
935 shift @arg; 1093 shift @arg;
936 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
937 } 1095 }
938 } 1096 }
939} 1097}
940 1098
941sub _object_attach { 1099sub _object_attach {
951 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
952 } 1110 }
953 1111
954 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
955 } else { 1113 } else {
956 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
957 } 1115 }
958 1116
959 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
960} 1118}
961 1119
1020 1178
1021 for (@$callbacks) { 1179 for (@$callbacks) {
1022 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1023 1181
1024 if ($@) { 1182 if ($@) {
1025 warn "$@";
1026 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1027 override; 1184 override;
1028 } 1185 }
1029 1186
1030 return 1 if $override; 1187 return 1 if $override;
1031 } 1188 }
1110 for (@$attach) { 1267 for (@$attach) {
1111 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1112 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1113 } 1270 }
1114 } else { 1271 } else {
1115 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1116 } 1273 }
1117 } 1274 }
1118} 1275}
1119 1276
1120cf::attachable->attach ( 1277cf::attachable->attach (
1147 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1148 1305
1149 sync_job { 1306 sync_job {
1150 if (length $$rdata) { 1307 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1154 1312
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1320 aio_close $fh;
1160 1321
1161 if (@$objs) { 1322 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1324 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1331 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1333 }
1170 } else { 1334 } else {
1171 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1172 } 1336 }
1173 1337
1174 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1342 } else {
1176 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1177 } 1344 }
1178 } else { 1345 } else {
1179 aio_unlink $filename; 1346 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1181 } 1348 }
1205 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs}; 1373 $av = $st->{objs};
1207 } 1374 }
1208 1375
1209 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1212 1380
1213 ($data, $av) 1381 ($data, $av)
1214} 1382}
1215 1383
1216=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1273 1441
1274 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1275} 1443}
1276 1444
1445use File::Glob ();
1446
1277cf::player->attach ( 1447cf::player->attach (
1278 on_command => sub { 1448 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1280 1450
1281 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1282 or return; 1452 or return;
1283 1453
1306 1476
1307 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1308 if $reply; 1478 if $reply;
1309 1479
1310 } else { 1480 } else {
1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1312 } 1482 }
1313 1483
1314 cf::override; 1484 cf::override;
1315 }, 1485 },
1316); 1486);
1317 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1318sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1319 cf::sync_job { 1504 cf::sync_job {
1320 my %todo; 1505 my %todo;
1321 1506
1322 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1323 next unless -r $path; 1508 next unless -r $path;
1341 1526
1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1344 1529
1345 $ext{source} = 1530 $ext{source} =
1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1347 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1348 . $source 1533 . $source
1349 . "\n};\n1"; 1534 . "\n};\n1";
1350 1535
1351 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1352 } 1537 }
1353 1538
1539 my $pass = 0;
1354 my %done; 1540 my %done;
1355 while (%todo) { 1541 while (%todo) {
1356 my $progress; 1542 my $progress;
1357 1543
1544 ++$pass;
1545
1546 ext:
1358 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1549 next ext
1361 unless exists $done{$_}; 1550 unless exists $done{$_};
1362 } 1551 }
1363 1552
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1554
1366 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1559
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1561 if exists $v->{meta}{mandatory};
1374 1562
1375 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1376 } 1572 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1573 }
1382 1574
1383 skip: 1575 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1386 } 1585 }
1387 }; 1586 };
1388} 1587}
1389 1588
1390############################################################################# 1589#############################################################################
1444 1643
1445sub exists($) { 1644sub exists($) {
1446 my ($login) = @_; 1645 my ($login) = @_;
1447 1646
1448 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1450} 1649}
1451 1650
1452sub find($) { 1651sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1653 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1475 } 1674 }
1476 } 1675 }
1477} 1676}
1478 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1479sub save($) { 1691sub save($) {
1480 my ($pl) = @_; 1692 my ($pl) = @_;
1481 1693
1482 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1483 1695
1488 1700
1489 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1491 1703
1492 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1493 1708
1494 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1710 cf::cede_to_tick;
1496} 1711}
1497 1712
1531 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1532 1747
1533 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1535 1750
1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1537 $pl->deactivate; 1752 $pl->deactivate;
1753
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1540 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1541 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1542 1759
1543 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1544 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1545 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1599 \@logins 1816 \@logins
1600} 1817}
1601 1818
1602=item $player->maps 1819=item $player->maps
1603 1820
1821=item cf::player::maps $login
1822
1604Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1605player. May block. 1824player. May block.
1606 1825
1607=cut 1826=cut
1608 1827
1670=cut 1889=cut
1671 1890
1672sub find_by_path($) { 1891sub find_by_path($) {
1673 my ($path) = @_; 1892 my ($path) = @_;
1674 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1675 my ($match, $specificity); 1896 my ($match, $specificity);
1676 1897
1677 for my $region (list) { 1898 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1707sub generate_random_map { 1928sub generate_random_map {
1708 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1709 1930
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711 1932
1712 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1721 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1722 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1723 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1724 (cf::region::find $rmp->{region}), $rmp->{custom}
1725 )
1726} 1934}
1727 1935
1728=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1729 1937
1730Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1735 1943
1736sub register { 1944sub register {
1737 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1738 my $pkg = caller; 1946 my $pkg = caller;
1739 1947
1740 no strict;
1741 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1742 1949
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1951}
1745 1952
1746# also paths starting with '/' 1953# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1955
1749sub thawer_merge { 1956sub thawer_merge {
1750 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1751 1958
1752 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1757} 1964}
1758 1965
1759sub normalise { 1966sub normalise {
1760 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1761 1968
1762 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1763 1970
1764 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1765 1972
1766 # map plan: 1973 # map plan:
1767 # 1974 #
1782 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1783 $path = "$base/$path"; 1990 $path = "$base/$path";
1784 } 1991 }
1785 1992
1786 for ($path) { 1993 for ($path) {
1787 redo if s{//}{/};
1788 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1789 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1790 } 1996 }
1791 1997
1792 $path 1998 $path
1806 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1807 return $self; 2013 return $self;
1808 } 2014 }
1809 } 2015 }
1810 2016
1811 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1812 () 2018 ()
1813} 2019}
1814 2020
2021# may re-bless or do other evil things
1815sub init { 2022sub init {
1816 my ($self) = @_; 2023 my ($self) = @_;
1817 2024
1818 $self 2025 $self
1819} 2026}
1850 2057
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1853} 2060}
1854 2061
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 2062sub decay_objects {
1865 my ($self) = @_; 2063 my ($self) = @_;
1866 2064
1867 return if $self->{deny_reset}; 2065 return if $self->{deny_reset};
1868 2066
1893 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1894 2092
1895 1 2093 1
1896} 2094}
1897 2095
2096# used to laod the header of an original map
1898sub load_header_orig { 2097sub load_header_orig {
1899 my ($self) = @_; 2098 my ($self) = @_;
1900 2099
1901 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1902} 2101}
1903 2102
2103# used to laod the header of an instantiated map
1904sub load_header_temp { 2104sub load_header_temp {
1905 my ($self) = @_; 2105 my ($self) = @_;
1906 2106
1907 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1908} 2108}
1909 2109
2110# called after loading the header from an instantiated map
1910sub prepare_temp { 2111sub prepare_temp {
1911 my ($self) = @_; 2112 my ($self) = @_;
1912 2113
1913 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1914 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1915 # safety 2116 # safety
1916 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1917 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1918} 2119}
1919 2120
2121# called after loading the header from an original map
1920sub prepare_orig { 2122sub prepare_orig {
1921 my ($self) = @_; 2123 my ($self) = @_;
1922 2124
1923 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1924 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1948 2150
1949sub find; 2151sub find;
1950sub find { 2152sub find {
1951 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1952 2154
2155 cf::cede_to_tick;
2156
1953 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1954 2158
1955 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2161
1958 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1963 or return; 2164 or return;
1964 2165
1965 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1966 2167
1978 2179
1979 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1980 } 2181 }
1981} 2182}
1982 2183
1983sub pre_load { } 2184sub pre_load { }
1984sub post_load { } 2185#sub post_load { } # XS
1985 2186
1986sub load { 2187sub load {
1987 my ($self) = @_; 2188 my ($self) = @_;
1988 2189
1989 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1992 2193
1993 { 2194 {
1994 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1995 2196
1996 return unless $self->valid; 2197 return unless $self->valid;
1997 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1998
1999 $self->in_memory (cf::MAP_LOADING);
2000 2199
2001 $self->alloc; 2200 $self->alloc;
2002 2201
2003 $self->pre_load; 2202 $self->pre_load;
2004 cf::cede_to_tick; 2203 cf::cede_to_tick;
2005 2204
2205 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2207 $f->skip_block;
2008 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2009 or return; 2209 or return;
2010 2210
2011 $self->post_load_original 2211 $self->post_load_original
2012 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2013 2213
2014 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2215 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2218 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2021 } 2222 }
2022 } 2223 }
2023 }
2024 2224
2025 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2026 2232
2027 cf::cede_to_tick; 2233 cf::cede_to_tick;
2028 # now do the right thing for maps 2234 # now do the right thing for maps
2029 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2033 2239
2034 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2241 $self->decay_objects;
2036 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2037 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2038 cf::cede_to_tick; 2245 cf::cede_to_tick;
2039 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2040 cf::cede_to_tick;
2041 $self->activate;
2042 } 2247 }
2043 2248
2044 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2251 }
2049 2252
2050 $self->post_load; 2253 $self->post_load;
2051}
2052 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2053sub customise_for { 2261sub customise_for {
2054 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2055 2263
2056 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2265 if $self->per_player;
2073 or next; 2281 or next;
2074 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2075 or next; 2283 or next;
2076 $neigh->load; 2284 $neigh->load;
2077 2285
2286 # now find the diagonal neighbours
2078 push @neigh, 2287 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2290 }
2082 2291
2089} 2298}
2090 2299
2091sub find_sync { 2300sub find_sync {
2092 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2093 2302
2094 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2095} 2308}
2096 2309
2097sub do_load_sync { 2310sub do_load_sync {
2098 my ($map) = @_; 2311 my ($map) = @_;
2099 2312
2313 # it's a bug to call this from the main context
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2102 2316
2103 cf::sync_job { $map->load }; 2317 $map->load;
2104} 2318}
2105 2319
2106our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2107our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2108 2322
2109sub find_async { 2323sub find_async {
2110 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2111 2325
2112 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2113 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2114 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2331 return $map if !$load || $map->linkable;
2116 } 2332 }
2117 2333
2118 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2119 2335
2120 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2134 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2135 2351
2136 () 2352 ()
2137} 2353}
2138 2354
2355# common code, used by both ->save and ->swapout
2139sub save { 2356sub _save {
2140 my ($self) = @_; 2357 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2358
2144 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2145 2360
2146 return unless $self->dirty; 2361 return unless $self->dirty;
2147 2362
2167 } else { 2382 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2384 }
2170} 2385}
2171 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2172sub swap_out { 2395sub swap_out {
2173 my ($self) = @_; 2396 my ($self) = @_;
2174 2397
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2180 return if $self->players; 2402 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2182 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2183 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2184 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2185 2454
2186 $self->deactivate; 2455 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2457 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2458
2234 $self->unlink_save; 2459 $self->unlink_save;
2235 $self->destroy; 2460 $self->destroy;
2236} 2461}
2237 2462
2245 2470
2246 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2247 2472
2248 $self->unlink_save; 2473 $self->unlink_save;
2249 2474
2250 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2480
2312 : normalise $_ 2537 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2539 ]
2315} 2540}
2316 2541
2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2573
2317=back 2574=back
2318 2575
2319=head3 cf::object 2576=head3 cf::object
2320 2577
2321=cut 2578=cut
2386 2643
2387our $SAY_CHANNEL = { 2644our $SAY_CHANNEL = {
2388 id => "say", 2645 id => "say",
2389 title => "Map", 2646 title => "Map",
2390 reply => "say ", 2647 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2649};
2393 2650
2394our $CHAT_CHANNEL = { 2651our $CHAT_CHANNEL = {
2395 id => "chat", 2652 id => "chat",
2396 title => "Chat", 2653 title => "Chat",
2453 2710
2454Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2455 2712
2456The player should be reasonably safe there for short amounts of time (e.g. 2713The player should be reasonably safe there for short amounts of time (e.g.
2457for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link 2715though, as the player cannot control the character while it is on the link
2459map. 2716map.
2460 2717
2461Will never block. 2718Will never block.
2462 2719
2463=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2485 my ($self) = @_; 2742 my ($self) = @_;
2486 2743
2487 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2488 2745
2746 ++$self->{_link_recursion};
2747
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2749
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2493 2752
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2754}
2496 2755
2497sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2499 2758
2516 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2518 2777
2519 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2522 2781
2523 $map->load; 2782 $map->load;
2524 $map->load_neighbours; 2783 $map->load_neighbours;
2525 2784
2526 return unless $self->contr->active; 2785 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2786
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2532} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2533 2794
2795}
2796
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2535 2798
2536Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2537her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2538that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2539the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2546 2809
2547our $GOTOGEN; 2810our $GOTOGEN;
2548 2811
2549sub cf::object::player::goto { 2812sub cf::object::player::goto {
2550 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2551 2820
2552 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2823
2555 $self->enter_link; 2824 $self->enter_link;
2575 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2576 } 2845 }
2577 } 2846 }
2578 2847
2579 my $map = eval { 2848 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2581 2850
2582 if ($map) { 2851 if ($map) {
2583 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2854 } else {
2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 } 2856 }
2588 2857
2589 $map 2858 $map
2597 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2600 } 2869 }
2601 2870
2602 $done->() if $done; 2871 $done->($self) if $done;
2603 })->prio (1); 2872 })->prio (1);
2604} 2873}
2605 2874
2606=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2607 2876
2675 $Coro::current->{desc} = "enter_exit"; 2944 $Coro::current->{desc} = "enter_exit";
2676 2945
2677 unless (eval { 2946 unless (eval {
2678 $self->deactivate_recursive; # just to be sure 2947 $self->deactivate_recursive; # just to be sure
2679 2948
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2689 my $x = $exit->stats->hp; 2950 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp; 2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2691 2975
2692 $self->goto ($map, $x, $y); 2976 $self->goto ($map, $x, $y);
2693 2977
2694 # if exit is damned, update players death & WoR home-position 2978 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y) 2979 $self->contr->savebed ($map, $x, $y)
2700 $self->message ("Something went wrong deep within the deliantra server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2701 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2702 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2703 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2704 2988
2705 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2706 $self->leave_link; 2990 $self->leave_link;
2707 } 2991 }
2708 })->prio (1); 2992 })->prio (1);
2709} 2993}
2710 2994
2722sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2723 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2724 3008
2725 utf8::encode $text; 3009 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2727} 3036}
2728 3037
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 3039
2731Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2735 3044
2736=cut 3045=cut
2737 3046
2738# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2740 "c/identify" => { 3055 "c/identify" => {
2741 id => "infobox", 3056 id => "infobox",
2742 title => "Identify", 3057 title => "Identify",
2743 reply => undef, 3058 reply => undef,
2744 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2746 "c/examine" => { 3061 "c/examine" => {
2747 id => "infobox", 3062 id => "infobox",
2748 title => "Examine", 3063 title => "Examine",
2749 reply => undef, 3064 reply => undef,
2750 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 3072 },
2752 "c/book" => { 3073 "c/book" => {
2753 id => "infobox", 3074 id => "infobox",
2754 title => "Book", 3075 title => "Book",
2755 reply => undef, 3076 reply => undef,
2771 id => "infobox", 3092 id => "infobox",
2772 title => "Body Parts", 3093 title => "Body Parts",
2773 reply => undef, 3094 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2775 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
2776 "c/skills" => { 3103 "c/skills" => {
2777 id => "infobox", 3104 id => "infobox",
2778 title => "Skills", 3105 title => "Skills",
2779 reply => undef, 3106 reply => undef,
2780 tooltip => "Shows your experience per skill and item power", 3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
2781 }, 3132 },
2782 "c/uptime" => { 3133 "c/uptime" => {
2783 id => "infobox", 3134 id => "infobox",
2784 title => "Uptime", 3135 title => "Uptime",
2785 reply => undef, 3136 reply => undef,
2795 id => "party", 3146 id => "party",
2796 title => "Party", 3147 title => "Party",
2797 reply => "gsay ", 3148 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3149 tooltip => "Messages and chat related to your party",
2799 }, 3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2800); 3159);
2801 3160
2802sub cf::client::send_msg { 3161sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3163
2809 3168
2810 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2813 3172
2814 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2818 3175
2819 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3181 }
2826 3182
2827 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2828 } 3184 }
2829 3185
2830 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2831 3187
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3188 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2836 3191
2837 my $pkt = "msg " 3192 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3193 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3195 );
2841 3196
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3197 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3198}
2879 3199
2880=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2881 3201
2882Sends an ext event to the client. 3202Sends an ext event to the client.
2885 3205
2886sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2888 3208
2889 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3214 }
2895} 3215}
2896 3216
2897=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2898 3218
2902 3222
2903sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2905 3225
2906 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3229 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3232 }
2913} 3233}
2914 3234
2915=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2916 3236
2987 3307
2988 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2989 if $reply; 3309 if $reply;
2990 3310
2991 } else { 3311 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 } 3313 }
2994 3314
2995 cf::override; 3315 cf::override;
2996 }, 3316 },
2997); 3317);
3017 3337
3018 $coro 3338 $coro
3019} 3339}
3020 3340
3021cf::client->attach ( 3341cf::client->attach (
3022 on_destroy => sub { 3342 on_client_destroy => sub {
3023 my ($ns) = @_; 3343 my ($ns) = @_;
3024 3344
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3346 },
3027); 3347);
3043our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3044 3364
3045$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3046 3366
3047$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3050 sort time 3370 sort time
3051)); 3371));
3052 3372
3053# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3058 3378
3059 cf::object 3379 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3381 insert remove name archname title slaying race decrease split
3382 value
3062 3383
3063 cf::object::player 3384 cf::object::player
3064 player 3385 player
3065 3386
3066 cf::player 3387 cf::player
3072=cut 3393=cut
3073 3394
3074for ( 3395for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3081) { 3402) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3405 for @funs;
3086} 3406}
3087 3407
3102 3422
3103 my $qcode = $code; 3423 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3106 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3107 local $_; 3430 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3431
3110 my $eval = 3432 my $eval =
3111 "do {\n" 3433 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3436 . $code
3115 . "\n}" 3437 . "\n}"
3116 ; 3438 ;
3117 3439
3440 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3121 3449
3122 if ($@) { 3450 if ($@) {
3123 warn "$@"; 3451 warn "$@",
3124 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3126 } 3454 }
3127 3455
3128 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3129} 3457}
3130 3458
3144=cut 3472=cut
3145 3473
3146sub register_script_function { 3474sub register_script_function {
3147 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3148 3476
3149 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3151} 3479}
3152 3480
3153=back 3481=back
3154 3482
3155=cut 3483=cut
3164 # for this (global event?) 3492 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3166 3494
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168 3496
3169 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3170 3498
3171 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3172 0 < aio_load $path, $facedata
3173 or die "$path: $!";
3174
3175 $facedata = Coro::Storable::thaw $facedata;
3176 3500
3177 $facedata->{version} == 2 3501 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3503
3180 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3507 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3510 };
3185 cf::cede_to_tick; 3511 cf::cede_to_tick;
3186 3512
3187 { 3513 {
3188 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3518
3193 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3197 3524
3198 cf::cede_to_tick; 3525 cf::cede_to_tick;
3199 } 3526 }
3200 3527
3201 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3206 3533
3207 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3210 } else { 3537 } else {
3211 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3212 } 3539 }
3213 3540
3214 cf::cede_to_tick; 3541 cf::cede_to_tick;
3215 } 3542 }
3216 } 3543 }
3225 3552
3226 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3227 } 3554 }
3228 3555
3229 { 3556 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3233 3558
3234 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3562
3239 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3254 } else { 3565 } else {
3255 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3256 } 3567 }
3257 3568
3258 cf::cede_to_tick; 3569 cf::cede_to_tick;
3259 } 3570 }
3260 } 3571 }
3261 3572
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263 3574
3264 1 3575 1
3265} 3576}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286 3577
3287register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3289 3580
3290 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3329sub reload_treasures { 3620sub reload_treasures {
3330 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3331 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3332} 3623}
3333 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3334sub reload_resources { 3645sub reload_resources {
3335 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3336 3647
3648 reload_exp_table;
3649 reload_materials;
3337 reload_facedata; 3650 reload_facedata;
3651 reload_sound;
3338 reload_archetypes; 3652 reload_archetypes;
3339 reload_regions; 3653 reload_regions;
3340 reload_treasures; 3654 reload_treasures;
3341 3655
3342 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3343}
3344
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351} 3657}
3352 3658
3353sub reload_config { 3659sub reload_config {
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3355 or return;
3356 3661
3357 local $/; 3662 my $config = load_file "$CONFDIR/config";
3358 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3359 3665
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3667
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3364 3670
3365 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3388 3694
3389 seek $fh, 0, 0; 3695 seek $fh, 0, 0;
3390 print $fh $$; 3696 print $fh $$;
3391} 3697}
3392 3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3393sub main { 3708sub main {
3394 atomic; 3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 3717
3396 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3399 (async { 3721 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3403 }; 3725 };
3404 3726
3405 { 3727 evthread_start IO::AIO::poll_fileno;
3406 my $guard = freeze_mainloop; 3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3407 reload_config; 3739 reload_config;
3408 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3409 load_extensions; 3750 load_extensions;
3410 3751
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3752 utime time, time, $RUNTIMEFILE;
3415 3753
3416 # no (long-running) fork's whatsoever before this point(!) 3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418 3757
3419 EV::loop; 3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3420} 3770}
3421 3771
3422############################################################################# 3772#############################################################################
3423# initialisation and cleanup 3773# initialisation and cleanup
3424 3774
3425# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3426BEGIN { 3776BEGIN {
3427 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3431 }; 3781 };
3432 } 3782 }
3433} 3783}
3434 3784
3435sub write_runtime_sync { 3785sub write_runtime_sync {
3786 my $t0 = AE::time;
3787
3436 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3438 3790
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3792
3441 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3442 3794
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3796 or return;
3445 3797
3446 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3461 or return; 3813 or return;
3462 3814
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3816 and return;
3465 3817
3466 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3819
3468 1 3820 1
3469} 3821}
3470 3822
3471our $uuid_lock; 3823our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3832 my $uuid = "$LOCALDIR/uuid";
3481 3833
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3835 or return;
3484 3836
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3486 $uuid_skip = 0; 3845 $uuid_skip = 0;
3487 3846
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3848 and return;
3490 3849
3496 or return; 3855 or return;
3497 3856
3498 aio_rename "$uuid~", $uuid 3857 aio_rename "$uuid~", $uuid
3499 and return; 3858 and return;
3500 3859
3501 warn "uuid file written ($value).\n"; 3860 trace "uuid file written ($value).\n";
3502 3861
3503 1 3862 1
3504 3863
3505} 3864}
3506 3865
3512} 3871}
3513 3872
3514sub emergency_save() { 3873sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3516 3875
3517 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3518 3882
3519 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3520 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3892 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3894 $pl->save;
3529 } 3895 }
3530 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3531 3897
3532 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3903 $map->valid or next;
3536 $map->save; 3904 $map->save;
3537 } 3905 }
3538 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3539 3907
3540 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3543 3913
3544 warn "begin write uuid\n"; 3914 info "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3915 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3547 }; 3936 };
3548 3937
3549 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3550} 3939}
3551 3940
3552sub post_cleanup { 3941sub post_cleanup {
3553 my ($make_core) = @_; 3942 my ($make_core) = @_;
3554 3943
3944 IO::AIO::flush;
3945
3555 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3556 if $make_core; 3947 if $make_core;
3557 3948
3558 my $fh = pidfile; 3949 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$; 3950 unlink $PIDFILE if <$fh> == $$;
3560} 3951}
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3972 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3973 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3975 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3976}
3587
3588our $RELOAD; # how many times to reload
3589 3977
3590sub do_reload_perl() { 3978sub do_reload_perl() {
3591 # can/must only be called in main 3979 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3593 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3594 return; 3982 return;
3595 } 3983 }
3596 3984
3597 return if $RELOAD++; 3985 return if $RELOAD++;
3598 3986
3987 my $t1 = AE::time;
3988
3599 while ($RELOAD) { 3989 while ($RELOAD) {
3600 warn "reloading..."; 3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3601 3992
3602 warn "entering sync_job"; 3993 trace "perl_reload: entering sync_job";
3603 3994
3604 cf::sync_job { 3995 cf::sync_job {
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 cf::emergency_save; 3996 #cf::emergency_save;
3607 cf::write_runtime_sync; # external watchdog should not bark
3608 3997
3609 warn "syncing database to disk";
3610 BDB::db_env_txn_checkpoint $DB_ENV;
3611
3612 # if anything goes wrong in here, we should simply crash as we already saved
3613
3614 warn "flushing outstanding aio requests";
3615 while (IO::AIO::nreqs || BDB::nreqs) {
3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3617 }
3618
3619 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3620 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3621 %EXT_CORO = (); 4000 %EXT_CORO = ();
3622 4001
3623 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3624 %COMMAND = (); 4003 %COMMAND = ();
3625 4004
3626 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3627 %EXTCMD = (); 4006 %EXTCMD = ();
3628 %EXTICMD = (); 4007 %EXTICMD = ();
3629 4008
3630 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3631 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3632 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3633 4012
3634 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3635 eval { 4014 eval {
3636 $cb->($pkg); 4015 $cb->($pkg);
3637 1 4016 1
3638 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
3639 } 4018 }
3640 4019
3641 warn "... clearing $pkg"; 4020 trace "... clearing $pkg";
3642 clear_package $pkg; 4021 clear_package $pkg;
3643 } 4022 }
3644 4023
3645 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648 4027
3649 warn "... unloading $k"; 4028 trace "... unloading $k";
3650 delete $INC{$k}; 4029 delete $INC{$k};
3651 4030
3652 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3654 4033
3657 } 4036 }
3658 4037
3659 clear_package $k; 4038 clear_package $k;
3660 } 4039 }
3661 4040
3662 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3663 clear_package "safe::$_" 4042 clear_package "safe::$_"
3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3665 4044
3666 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 4048
3670 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3671 # and global variables created in xs 4050 # and global variables created in xs
3672 #clear_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3673 4052
3674 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3675 4054
3676 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3677 require cf; 4056 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3679 4058
3680 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3681 cf::reload_config; 4060 cf::reload_config;
3682 4061
3683 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3684 cf::load_extensions; 4063 cf::load_extensions;
3685 4064
4065 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3689 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3691 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3692 4073
3693 warn "leaving sync_job"; 4074 cf::_post_init 1;
4075
4076 trace "perl_reload: leaving sync_job";
3694 4077
3695 1 4078 1
3696 } or do { 4079 } or do {
3697 warn $@; 4080 error $@;
3698 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3699 }; 4082 };
3700 4083
3701 warn "reloaded";
3702 --$RELOAD; 4084 --$RELOAD;
3703 } 4085 }
4086
4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3704}; 4089};
3705 4090
3706our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3707 4092
3708sub reload_perl() { 4093sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3711 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 4101 do_reload_perl;
3714 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3715 }; 4104 };
3716} 4105}
3717 4106
3718register_command "reload" => sub { 4107register_command "reload" => sub {
3719 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3725 reload_perl; 4114 reload_perl;
3726 }; 4115 };
3727 } 4116 }
3728}; 4117};
3729 4118
3730unshift @INC, $LIBDIR; 4119#############################################################################
3731 4120
3732my $bug_warning = 0; 4121my $bug_warning = 0;
3733 4122
3734our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN;
3736
3737sub wait_for_tick { 4123sub wait_for_tick() {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3739 4125
3740 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3741 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait;
3743} 4127}
3744 4128
3745sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3747 4131
3748 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 4134 $signal->wait;
3751} 4135}
3755 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3756 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3757 return; 4141 return;
3758 } 4142 }
3759 4143
3760 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3761 4147
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3764 Coro::async_pool { 4150 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3766 write_runtime_sync 4152 write_runtime_sync
3767 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3768 }; 4154 };
3769 } 4155 }
3770 4156
3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3772 $sig->send; 4158 $sig->send;
3773 } 4159 }
3774 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3775 $sig->send;
3776 }
3777 4161
3778 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3779 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3780 4164
3781 if (0) { 4165 if (0) {
3782 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3786 } 4170 }
3787 } 4171 }
3788} 4172}
3789 4173
3790{ 4174{
3791 # configure BDB 4175 # configure BDB
3792 4176
3793 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3796 4180
3797 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3835 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3836 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3837 undef $AnyEvent::AIO::WATCHER; 4221 undef $AnyEvent::AIO::WATCHER;
3838} 4222}
3839 4223
3840my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3841 4226
3842sub _log_backtrace { 4227sub _log_backtrace {
3843 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3844 4229
3845 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3846 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3847 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3848 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3849 ++$_log_backtrace; 4238 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg; 4239 my $perl_bt = Carp::longmess $msg;
3851 async { 4240 async {
3852 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3853 4242
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4263 --$_log_backtrace;
3875 }; 4264 };
3876 } else { 4265 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3879 } 4268 }
3880} 4269}
3881 4270
3882# load additional modules 4271# load additional modules
3883use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3884 4274
3885END { cf::emergency_save } 4275END { cf::emergency_save }
3886 4276
38871 42771
3888 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines