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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::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
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
71our %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;
72 120
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 123our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
85 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
90our $NOW; 138our $NOW;
91 139
92our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
96# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 146
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
101our $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;
102 159
103binmode STDOUT; 160binmode STDOUT;
104binmode STDERR; 161binmode STDERR;
105 162
106# read virtual server time, if available 163# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
111} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
112 171
113mkdir $_ 172mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 174
116our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
117 176
118sub cf::map::normalise; 177sub cf::map::normalise;
119 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
120############################################################################# 183#############################################################################
121 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
122=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
123 197
124=over 4 198=over 4
125 199
126=item $cf::UPTIME 200=item $cf::UPTIME
127 201
128The 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.
129 218
130=item $cf::RUNTIME 219=item $cf::RUNTIME
131 220
132The 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
133every server tick. 222every server tick.
139Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
142database environment. 231database environment.
143 232
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 233=item $cf::LOADAVG
153 234
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
165from wherever your confdir points to. 246from wherever your confdir points to.
166 247
167=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
168 249
169These 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
170returns 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
171per 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.
172 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
173=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
174 272
175This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 275that call.
178 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
179=back 283=back
180 284
181=cut 285=cut
182 286
183BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 294 my $msg = join "", @_;
186 295
187 $msg .= "\n" 296 $msg .= "\n"
188 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
189 298
190 $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;
191 300
192 LOG llevError, $msg; 301 LOG llevWarn, $msg;
193 }; 302};
194}
195 303
196$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
197 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
198 Coro::terminate; 315 Coro::terminate
199}; 316};
200 317
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 328for my $pkg (qw(
212 cf::global cf::attachable 329 cf::global cf::attachable
213 cf::object cf::object::player 330 cf::object cf::object::player
214 cf::client cf::player 331 cf::client cf::player
215 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
216 cf::map cf::party cf::region 334 cf::party cf::region
217)) { 335)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 337}
221 338
222$EV::DIED = sub { 339$EV::DIED = sub {
223 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
224}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
225 347
226############################################################################# 348#############################################################################
227 349
228=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
229 351
250 $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;
251 $d 373 $d
252 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
253} 375}
254 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
255=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
256 392
257Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
258 394
259=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
265our $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
266 402
267sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
269 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
270=item cf::lock_wait $string 468=item cf::lock_wait $string
271 469
272Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
273 471
274=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
275 473
276Wait 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
277a 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,
278for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
279returned. 477returned.
280 478
281Locks 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
282deadlocked coro. 480deadlocked coro.
288 486
289Return 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.
290 488
291=cut 489=cut
292 490
293our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 492
296sub lock_wait($) { 493sub lock_wait($) {
297 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 495}
310 496
311sub lock_acquire($) { 497sub lock_acquire($) {
312 my ($key) = @_; 498 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 499}
326 500
327sub lock_active($) { 501sub lock_active($) {
328 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 503}
332 504
333sub freeze_mainloop { 505sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
335 507
336 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 509}
342 510
343=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
344 512
345Like 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
346get spread over timer. 514get spread over time.
347 515
348=cut 516=cut
349 517
350sub periodic($$) { 518sub periodic($$) {
351 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
355 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
356} 524}
357 525
358=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
359 527
360Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
361This 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
362of 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.
363 535
364The 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
365used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
366 538
367Useful for short background jobs. 539Useful for short background jobs.
368 540
369=cut 541=cut
370 542
371our @SLOT_QUEUE; 543our @SLOT_QUEUE;
372our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
373 546
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
377 550
378 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
379 553
380 while () { 554 while () {
381 next_job: 555 next_job:
556
382 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 558
384 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 563 $job->[2]->send;
388 Coro::cede; 564 Coro::cede;
389 goto next_job; 565 goto next_job;
390 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 568 }
392 } 569 }
393 570
394 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
395 # 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
396 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
397 $signal->wait;
398 } else { 574 } else {
575 $busy = 0;
399 Coro::schedule; 576 Coro::schedule;
400 } 577 }
401 } 578 }
402}; 579};
403 580
404sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
405 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
406 585
407 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
408 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
409 589
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
438=cut 618=cut
439 619
440sub sync_job(&) { 620sub sync_job(&) {
441 my ($job) = @_; 621 my ($job) = @_;
442 622
443 if ($Coro::current == $Coro::main) { 623 if (in_main) {
444 my $time = EV::time; 624 my $time = AE::time;
445 625
446 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
448 628
449 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
450 630
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
454 632
455 my $busy = 1; 633 my $busy = 1;
456 my @res; 634 my @res;
457 635
458 (async { 636 (async {
459 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 638 @res = eval { $job->() };
461 warn $@ if $@; 639 error $@ if $@;
462 undef $busy; 640 undef $busy;
463 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
464 642
465 while ($busy) { 643 while ($busy) {
466 if (Coro::nready) { 644 if (Coro::nready) {
468 } else { 646 } else {
469 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
470 } 648 }
471 } 649 }
472 650
473 $time = EV::time - $time; 651 my $time = AE::time - $time;
474 652
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
479 654
480 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
481 } else { 656 } else {
482 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
483 658
503 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
504 679
505 $coro 680 $coro
506} 681}
507 682
508=item fork_call { }, $args 683=item fork_call { }, @args
509 684
510Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 688never block itself or use any form of event handling.
514 689
515=cut 690=cut
516 691
692sub post_fork {
693 reset_signals;
694}
695
517sub fork_call(&@) { 696sub fork_call(&@) {
518 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
519 698
520 # 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,
521 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
523 702
524 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
525 reset_signals; 704 cf::post_fork;
526 &$cb 705 &$cb
527 }, @args; 706 } @args;
528 707
529 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 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
530} 747}
531 748
532=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
533 750
534Returns a single value from the environment database. 751Returns a single value from the environment database.
544within each server. 761within each server.
545 762
546=cut 763=cut
547 764
548sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
549 my ($name) = @_; 769 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
551 771
552 eval { 772 eval {
553 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
563} 783}
564 784
565our $DB; 785our $DB;
566 786
567sub db_init { 787sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
570 };
571} 789}
572 790
573sub db_get($$) { 791sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
575 793
576 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
577 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
578 798
579 $! ? () 799 $! ? ()
580 : $data 800 : $data
581 }
582} 801}
583 802
584sub db_put($$$) { 803sub db_put($$$) {
585 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
614 833
615 my @data; 834 my @data;
616 my $md5; 835 my $md5;
617 836
618 for (0 .. $#$src) { 837 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
620 or Carp::croak "$src->[$_]: $!";
621 } 839 }
622 840
623 # if processing is expensive, check 841 # if processing is expensive, check
624 # checksum first 842 # checksum first
625 if (1) { 843 if (1) {
642 860
643 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 862 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
646 864
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 866
649 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
652 870
662 880
663=cut 881=cut
664 882
665sub datalog($@) { 883sub datalog($@) {
666 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 886}
669 887
670=back 888=back
671 889
672=cut 890=cut
673 891
674############################################################################# 892#############################################################################
675 893
676=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
677 895
678Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
679attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
681 899
682In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
683C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
733=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
734 952
735Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
737 955
738Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
739that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
740 958
741These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
742 960
743=over 4 961=over 4
867 1085
868 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 1088
871 } elsif (ref $type) { 1089 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
873 1091
874 } else { 1092 } else {
875 shift @arg; 1093 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
877 } 1095 }
878 } 1096 }
879} 1097}
880 1098
881sub _object_attach { 1099sub _object_attach {
891 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
892 } 1110 }
893 1111
894 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
895 } else { 1113 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1115 }
898 1116
899 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
900} 1118}
901 1119
960 1178
961 for (@$callbacks) { 1179 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
963 1181
964 if ($@) { 1182 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1184 override;
968 } 1185 }
969 1186
970 return 1 if $override; 1187 return 1 if $override;
971 } 1188 }
1034 1251
1035sub reattach { 1252sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1254 my ($obj) = @_;
1038 1255
1256 # no longer needed after getting rid of delete_package?
1039 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1040 1258
1041 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1042 1260
1043 @$registry = (); 1261 @$registry = ();
1044 1262
1049 for (@$attach) { 1267 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1052 } 1270 }
1053 } else { 1271 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1273 }
1056 } 1274 }
1057} 1275}
1058 1276
1059cf::attachable->attach ( 1277cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1087 1305
1088 sync_job { 1306 sync_job {
1089 if (length $$rdata) { 1307 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1093 1312
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 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 }
1098 close $fh; 1320 aio_close $fh;
1099 1321
1100 if (@$objs) { 1322 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1331 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1333 }
1109 } else { 1334 } else {
1110 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1111 } 1336 }
1112 1337
1113 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1342 } else {
1115 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1116 } 1344 }
1117 } else { 1345 } else {
1118 aio_unlink $filename; 1346 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1120 } 1348 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1373 $av = $st->{objs};
1146 } 1374 }
1147 1375
1148 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1151 1380
1152 ($data, $av) 1381 ($data, $av)
1153} 1382}
1154 1383
1155=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1212 1441
1213 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1214} 1443}
1215 1444
1445use File::Glob ();
1446
1216cf::player->attach ( 1447cf::player->attach (
1217 on_command => sub { 1448 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1219 1450
1220 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1221 or return; 1452 or return;
1222 1453
1230 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1231 1462
1232 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1233 1464
1234 if (ref $msg) { 1465 if (ref $msg) {
1235 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1236 "ARRAY" eq ref $msg
1237 ? @$msg
1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1239 1467
1240 my @reply; 1468 my @reply;
1241 1469
1242 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1243 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1245 1473
1246 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1475 if $reply;
1248 1476
1249 } else { 1477 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1479 }
1252 1480
1253 cf::override; 1481 cf::override;
1254 }, 1482 },
1255); 1483);
1256 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1257sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1258 cf::sync_job { 1501 cf::sync_job {
1259 my %todo; 1502 my %todo;
1260 1503
1261 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1505 next unless -r $path;
1280 1523
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1526
1284 $ext{source} = 1527 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1287 . $source 1530 . $source
1288 . "\n};\n1"; 1531 . "\n};\n1";
1289 1532
1290 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1291 } 1534 }
1292 1535
1536 my $pass = 0;
1293 my %done; 1537 my %done;
1294 while (%todo) { 1538 while (%todo) {
1295 my $progress; 1539 my $progress;
1296 1540
1541 ++$pass;
1542
1543 ext:
1297 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1546 next ext
1300 unless exists $done{$_}; 1547 unless exists $done{$_};
1301 } 1548 }
1302 1549
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1551
1305 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1310 warn $msg; 1559
1311 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1561 delete $todo{$k};
1313 } 1562 } else {
1314 1563 $done{$k} = delete $todo{$k};
1315 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1316 } 1569 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1570 }
1322 1571
1323 skip: 1572 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1326 } 1582 }
1327 }; 1583 };
1328} 1584}
1329 1585
1330############################################################################# 1586#############################################################################
1331 1587
1332=back 1588=back
1333 1589
1334=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1335 1591
1336Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1337 1593
1338=cut 1594=cut
1339 1595
1340package cf::player; 1596package cf::player;
1341 1597
1384 1640
1385sub exists($) { 1641sub exists($) {
1386 my ($login) = @_; 1642 my ($login) = @_;
1387 1643
1388 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1390} 1646}
1391 1647
1392sub find($) { 1648sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1650 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1663 or return;
1408 1664
1409 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1410 or return; 1666 or return;
1667
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1414 } 1671 }
1415 } 1672 }
1416} 1673}
1417 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1418sub save($) { 1688sub save($) {
1419 my ($pl) = @_; 1689 my ($pl) = @_;
1420 1690
1421 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1422 1692
1425 1695
1426 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1427 1697
1428 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1705
1431 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1707 cf::cede_to_tick;
1433} 1708}
1434 1709
1466 my ($pl) = @_; 1741 my ($pl) = @_;
1467 1742
1468 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1469 1744
1470 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1747
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1474 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1476 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1477 1756
1478 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1480 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1518 1797
1519 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1520 my $path = path $login; 1799 my $path = path $login;
1521 1800
1522 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1807 }
1528 1808
1532 1812
1533 \@logins 1813 \@logins
1534} 1814}
1535 1815
1536=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1537 1819
1538Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1539player. May block. 1821player. May block.
1540 1822
1541=cut 1823=cut
1559 } 1841 }
1560 1842
1561 \@paths 1843 \@paths
1562} 1844}
1563 1845
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1847
1566Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1849
1657=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1658 1851
1659Sends an ext reply to the player. 1852Sends an ext reply to the player.
1660 1853
1692 1885
1693=cut 1886=cut
1694 1887
1695sub find_by_path($) { 1888sub find_by_path($) {
1696 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1697 1892
1698 my ($match, $specificity); 1893 my ($match, $specificity);
1699 1894
1700 for my $region (list) { 1895 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1729 1924
1730sub generate_random_map { 1925sub generate_random_map {
1731 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1732 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1733 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1931}
1747 1932
1748=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1749 1934
1750Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1755 1940
1756sub register { 1941sub register {
1757 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1943 my $pkg = caller;
1759 1944
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1946
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1948}
1765 1949
1766# also paths starting with '/' 1950# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1952
1769sub thawer_merge { 1953sub thawer_merge {
1770 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1771 1955
1772 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1777} 1961}
1778 1962
1779sub normalise { 1963sub normalise {
1780 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1781 1965
1782 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1783 1967
1784 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1785 1969
1786 # map plan: 1970 # map plan:
1787 # 1971 #
1802 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1987 $path = "$base/$path";
1804 } 1988 }
1805 1989
1806 for ($path) { 1990 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1810 } 1993 }
1811 1994
1812 $path 1995 $path
1826 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1827 return $self; 2010 return $self;
1828 } 2011 }
1829 } 2012 }
1830 2013
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2015 ()
1833} 2016}
1834 2017
2018# may re-bless or do other evil things
1835sub init { 2019sub init {
1836 my ($self) = @_; 2020 my ($self) = @_;
1837 2021
1838 $self 2022 $self
1839} 2023}
1858 2042
1859# the temporary/swap location 2043# the temporary/swap location
1860sub save_path { 2044sub save_path {
1861 my ($self) = @_; 2045 my ($self) = @_;
1862 2046
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1865} 2049}
1866 2050
1867# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1868sub uniq_path { 2052sub uniq_path {
1869 my ($self) = @_; 2053 my ($self) = @_;
1870 2054
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 2057}
1883 2058
1884sub decay_objects { 2059sub decay_objects {
1885 my ($self) = @_; 2060 my ($self) = @_;
1886 2061
1913 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1914 2089
1915 1 2090 1
1916} 2091}
1917 2092
2093# used to laod the header of an original map
1918sub load_header_orig { 2094sub load_header_orig {
1919 my ($self) = @_; 2095 my ($self) = @_;
1920 2096
1921 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1922} 2098}
1923 2099
2100# used to laod the header of an instantiated map
1924sub load_header_temp { 2101sub load_header_temp {
1925 my ($self) = @_; 2102 my ($self) = @_;
1926 2103
1927 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1928} 2105}
1929 2106
2107# called after loading the header from an instantiated map
1930sub prepare_temp { 2108sub prepare_temp {
1931 my ($self) = @_; 2109 my ($self) = @_;
1932 2110
1933 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1935 # safety 2113 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2116}
1939 2117
2118# called after loading the header from an original map
1940sub prepare_orig { 2119sub prepare_orig {
1941 my ($self) = @_; 2120 my ($self) = @_;
1942 2121
1943 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1968 2147
1969sub find; 2148sub find;
1970sub find { 2149sub find {
1971 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1972 2151
2152 cf::cede_to_tick;
2153
1973 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1974 2155
1975 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2158
1978 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1983 or return; 2161 or return;
1984 2162
1985 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1986 2164
1988 or return; 2166 or return;
1989 2167
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
1993 undef $guard1; 2172 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2173 $map->reset;
1996 return find $path; 2174 return find $path;
1997 } 2175 }
1998 2176
1999 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2000 } 2178 }
2001} 2179}
2002 2180
2003sub pre_load { } 2181sub pre_load { }
2004sub post_load { } 2182#sub post_load { } # XS
2005 2183
2006sub load { 2184sub load {
2007 my ($self) = @_; 2185 my ($self) = @_;
2008 2186
2009 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2012 2190
2013 { 2191 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2015 2193
2016 return unless $self->valid; 2194 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2196
2021 $self->alloc; 2197 $self->alloc;
2022 2198
2023 $self->pre_load; 2199 $self->pre_load;
2024 cf::cede_to_tick; 2200 cf::cede_to_tick;
2025 2201
2202 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2204 $f->skip_block;
2028 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2029 or return; 2206 or return;
2030 2207
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
2032 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2033 2210
2034 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2212 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2215 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2041 } 2219 }
2042 } 2220 }
2043 }
2044 2221
2045 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2046 2229
2047 cf::cede_to_tick; 2230 cf::cede_to_tick;
2048 # now do the right thing for maps 2231 # now do the right thing for maps
2049 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2238 $self->decay_objects;
2056 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2057 $self->update_buttons; 2240 $self->update_buttons;
2058 cf::cede_to_tick; 2241 cf::cede_to_tick;
2059 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2243 }
2063 2244
2064 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_IN_MEMORY);
2068 } 2247 }
2069 2248
2070 $self->post_load; 2249 $self->post_load;
2071}
2072 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2073sub customise_for { 2257sub customise_for {
2074 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2075 2259
2076 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2261 if $self->per_player;
2080# if $self->per_party; 2264# if $self->per_party;
2081 2265
2082 $self 2266 $self
2083} 2267}
2084 2268
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2269sub find_sync {
2112 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2113 2271
2114 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2115} 2277}
2116 2278
2117sub do_load_sync { 2279sub do_load_sync {
2118 my ($map) = @_; 2280 my ($map) = @_;
2119 2281
2282 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2122 2285
2123 cf::sync_job { $map->load }; 2286 $map->load;
2124} 2287}
2125 2288
2126our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2128 2291
2129sub find_async { 2292sub find_async {
2130 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2131 2294
2132 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2133 2296
2134 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2136 } 2299 }
2137 2300
2138 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2139 2302
2140 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2155 2318
2156 () 2319 ()
2157} 2320}
2158 2321
2322# common code, used by both ->save and ->swapout
2159sub save { 2323sub _save {
2160 my ($self) = @_; 2324 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2325
2164 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2165 2327
2166 return unless $self->dirty; 2328 return unless $self->dirty;
2167 2329
2176 2338
2177 cf::async { 2339 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2340 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2180 }; 2342 };
2343
2344 cf::get_slot 0.02;
2181 2345
2182 if ($uniq) { 2346 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2349 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2351 }
2188} 2352}
2189 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2190sub swap_out { 2362sub swap_out {
2191 my ($self) = @_; 2363 my ($self) = @_;
2192 2364
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2198 return if $self->players; 2369 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2200 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2201 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2202 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2203 2421
2204 $self->deactivate; 2422 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2424 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2425
2252 $self->unlink_save; 2426 $self->unlink_save;
2253 $self->destroy; 2427 $self->destroy;
2254} 2428}
2255 2429
2263 2437
2264 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2265 2439
2266 $self->unlink_save; 2440 $self->unlink_save;
2267 2441
2268 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2447
2322 2496
2323sub unique_maps() { 2497sub unique_maps() {
2324 [ 2498 [
2325 map { 2499 map {
2326 utf8::decode $_; 2500 utf8::decode $_;
2327 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2328 ? normalise $_ 2504 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2506 ]
2332} 2507}
2333 2508
2334package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2335 2540
2336=back 2541=back
2337 2542
2338=head3 cf::object 2543=head3 cf::object
2339 2544
2343 2548
2344=over 4 2549=over 4
2345 2550
2346=item $ob->inv_recursive 2551=item $ob->inv_recursive
2347 2552
2348Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2349 2555
2350=cut 2556=cut
2351 2557
2352sub inv_recursive_; 2558sub inv_recursive_;
2353sub inv_recursive_ { 2559sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2359} 2565}
2360 2566
2361=item $ref = $ob->ref 2567=item $ref = $ob->ref
2362 2568
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2569Creates and returns a persistent reference to an object that can be stored as a string.
2364 2570
2365=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2366 2572
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2574even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2607dialogue with the given NPC character.
2402 2608
2403=cut 2609=cut
2404 2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2624
2405# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2626# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2642
2423 } else { 2643 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2646 }
2427 } 2647 }
2428} 2648}
2429 2649
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2675
2456=item $player_object->enter_link 2676=item $player_object->enter_link
2457 2677
2458Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2459 2679
2460The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2462 2684
2463Will never block. 2685Will never block.
2464 2686
2465=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2466 2688
2486sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2487 my ($self) = @_; 2709 my ($self) = @_;
2488 2710
2489 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2490 2712
2713 ++$self->{_link_recursion};
2714
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2716
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2495 2719
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2721}
2498 2722
2499sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2501 2725
2518 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2520 2744
2521 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2524 2748
2525 $map->load; 2749 $map->load;
2526 $map->load_neighbours;
2527 2750
2528 return unless $self->contr->active; 2751 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2752
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2533} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2534 2760
2761}
2762
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2764
2537Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2769be called at the end of this process.
2542 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2543=cut 2774=cut
2544 2775
2545our $GOTOGEN; 2776our $GOTOGEN;
2546 2777
2547sub cf::object::player::goto { 2778sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2549 2786
2550 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2789
2553 $self->enter_link; 2790 $self->enter_link;
2573 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2574 } 2811 }
2575 } 2812 }
2576 2813
2577 my $map = eval { 2814 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2579 2816
2580 if ($map) { 2817 if ($map) {
2581 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2820 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2822 }
2586 2823
2587 $map 2824 $map
2595 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2598 } 2835 }
2599 2836
2600 $done->() if $done; 2837 $done->($self) if $done;
2601 })->prio (1); 2838 })->prio (1);
2602} 2839}
2603 2840
2604=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2605 2842
2625} 2862}
2626 2863
2627sub prepare_random_map { 2864sub prepare_random_map {
2628 my ($exit) = @_; 2865 my ($exit) = @_;
2629 2866
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2869 # that depends on the exit object
2635 2870
2636 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2873 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2643 } 2880 }
2644 2881
2645 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2646 2883
2647 my $data = cf::encode_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2650 2887
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2890 undef $fh;
2654 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2655 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2658 } 2899 }
2659} 2900}
2660 2901
2661sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2663 2904
2664 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2665 2906
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2907 $self->enter_link;
2678 2908
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2909 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2910 $Coro::current->{desc} = "enter_exit";
2685 2911
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2688 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2689 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2690 1; 2948 1
2691 }) { 2949 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2954
2697 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2956 $self->leave_link;
2699 } 2957 }
2700 })->prio (1); 2958 })->prio (1);
2701} 2959}
2702 2960
2714sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2716 2974
2717 utf8::encode $text; 2975 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2719} 3002}
2720 3003
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 3005
2723Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2727 3010
2728=cut 3011=cut
2729 3012
2730# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2732 "c/identify" => { 3021 "c/identify" => {
2733 id => "infobox", 3022 id => "infobox",
2734 title => "Identify", 3023 title => "Identify",
2735 reply => undef, 3024 reply => undef,
2736 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2738 "c/examine" => { 3027 "c/examine" => {
2739 id => "infobox", 3028 id => "infobox",
2740 title => "Examine", 3029 title => "Examine",
2741 reply => undef, 3030 reply => undef,
2742 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 3038 },
2744 "c/book" => { 3039 "c/book" => {
2745 id => "infobox", 3040 id => "infobox",
2746 title => "Book", 3041 title => "Book",
2747 reply => undef, 3042 reply => undef,
2763 id => "infobox", 3058 id => "infobox",
2764 title => "Body Parts", 3059 title => "Body Parts",
2765 reply => undef, 3060 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2767 }, 3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
2768 "c/uptime" => { 3099 "c/uptime" => {
2769 id => "infobox", 3100 id => "infobox",
2770 title => "Uptime", 3101 title => "Uptime",
2771 reply => undef, 3102 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3103 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3106 id => "infobox",
2776 title => "Map Info", 3107 title => "Map Info",
2777 reply => undef, 3108 reply => undef,
2778 tooltip => "Information related to the maps", 3109 tooltip => "Information related to the maps",
2779 }, 3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2780); 3125);
2781 3126
2782sub cf::client::send_msg { 3127sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3129
2785 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2786 3132
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3134
2789 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2792 3138
2793 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2797 3141
2798 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3147 }
2805 3148
2806 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2807 } 3150 }
2808 3151
2809 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2810 3153
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3154 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2815 3157
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3161 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3162
2830 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3164}
2844 3165
2845=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2846 3167
2847Sends an ext event to the client. 3168Sends an ext event to the client.
2850 3171
2851sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2853 3174
2854 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3180 }
2860} 3181}
2861 3182
2862=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2863 3184
2866=cut 3187=cut
2867 3188
2868sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2870 3191
2871 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 }
2878} 3195}
2879 3196
2880=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2881 3198
2882Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2937 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2938 3255
2939 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2940 3257
2941 if (ref $msg) { 3258 if (ref $msg) {
2942 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2943 "ARRAY" eq ref $msg
2944 ? @$msg
2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2946 3260
2947 my @reply; 3261 my @reply;
2948 3262
2949 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2950 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2952 3266
2953 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3268 if $reply;
2955 3269
2956 } else { 3270 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3272 }
2959 3273
2960 cf::override; 3274 cf::override;
2961 }, 3275 },
2962); 3276);
2982 3296
2983 $coro 3297 $coro
2984} 3298}
2985 3299
2986cf::client->attach ( 3300cf::client->attach (
2987 on_destroy => sub { 3301 on_client_destroy => sub {
2988 my ($ns) = @_; 3302 my ($ns) = @_;
2989 3303
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3305 },
2992); 3306);
3008our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3009 3323
3010$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3011 3325
3012$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3015 sort time 3329 sort time
3016)); 3330));
3017 3331
3018# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3021 3335
3022The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3023 3337
3024 cf::object 3338 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
3027 3342
3028 cf::object::player 3343 cf::object::player
3029 player 3344 player
3030 3345
3031 cf::player 3346 cf::player
3036 3351
3037=cut 3352=cut
3038 3353
3039for ( 3354for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3046) { 3361) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3364 for @funs;
3051} 3365}
3052 3366
3067 3381
3068 my $qcode = $code; 3382 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3071 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3072 local $_; 3389 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3390
3075 my $eval = 3391 my $eval =
3076 "do {\n" 3392 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3395 . $code
3080 . "\n}" 3396 . "\n}"
3081 ; 3397 ;
3082 3398
3399 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3086 3408
3087 if ($@) { 3409 if ($@) {
3088 warn "$@"; 3410 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3091 } 3413 }
3092 3414
3093 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3094} 3416}
3095 3417
3109=cut 3431=cut
3110 3432
3111sub register_script_function { 3433sub register_script_function {
3112 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3113 3435
3114 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3116} 3438}
3117 3439
3118=back 3440=back
3119 3441
3120=cut 3442=cut
3129 # for this (global event?) 3451 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3453
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3455
3134 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3135 3457
3136 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3137 0 < aio_load $path, $facedata
3138 or die "$path: $!";
3139
3140 $facedata = Coro::Storable::thaw $facedata;
3141 3459
3142 $facedata->{version} == 2 3460 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3462
3145 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3466 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3469 };
3150 cf::cede_to_tick; 3470 cf::cede_to_tick;
3151 3471
3152 { 3472 {
3153 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3477
3158 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3162 3483
3163 cf::cede_to_tick; 3484 cf::cede_to_tick;
3164 } 3485 }
3165 3486
3166 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3171 3492
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3496 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3498 }
3178 3499
3179 cf::cede_to_tick; 3500 cf::cede_to_tick;
3180 } 3501 }
3181 } 3502 }
3190 3511
3191 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3192 } 3513 }
3193 3514
3194 { 3515 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3198 3517
3199 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3521
3204 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3219 } else { 3524 } else {
3220 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3221 } 3526 }
3222 3527
3223 cf::cede_to_tick; 3528 cf::cede_to_tick;
3224 } 3529 }
3225 } 3530 }
3226 3531
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3533
3229 1 3534 1
3230} 3535}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3536
3252register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3254 3539
3255 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3541 $ns->fx_want ($k, $v);
3257 } 3542 }
3258}; 3543};
3544
3545sub load_resource_file($) {
3546 my $guard = lock_acquire "load_resource_file";
3547
3548 my $status = load_resource_file_ $_[0];
3549 get_slot 0.1, 100;
3550 cf::arch::commit_load;
3551
3552 $status
3553}
3259 3554
3260sub reload_regions { 3555sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3556 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3557 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3558 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3572}
3278 3573
3279sub reload_archetypes { 3574sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3577}
3288 3578
3289sub reload_treasures { 3579sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3292} 3582}
3293 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3294sub reload_resources { 3604sub reload_resources {
3295 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3296 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
3297 reload_regions; 3612 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3613 reload_treasures;
3302 3614
3303 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3616}
3309 3617
3310sub reload_config { 3618sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3312 or return;
3313 3620
3314 local $/; 3621 my $config = load_file "$CONFDIR/config";
3315 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3316 3624
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3626
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3629
3322 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3326 }; 3634 };
3327 warn $@ if $@; 3635 warn $@ if $@;
3328 } 3636 }
3329} 3637}
3330 3638
3639sub pidfile() {
3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3641 or die "$PIDFILE: $!";
3642 flock $fh, &Fcntl::LOCK_EX
3643 or die "$PIDFILE: flock: $!";
3644 $fh
3645}
3646
3647# make sure only one server instance is running at any one time
3648sub atomic {
3649 my $fh = pidfile;
3650
3651 my $pid = <$fh>;
3652 kill 9, $pid if $pid > 0;
3653
3654 seek $fh, 0, 0;
3655 print $fh $$;
3656}
3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3331sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3676
3332 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3680 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3682 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3339 }; 3684 };
3340 3685
3686 evthread_start IO::AIO::poll_fileno;
3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3341 reload_config; 3698 reload_config;
3342 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
3343 load_extensions; 3709 load_extensions;
3344 3710
3345 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3712
3347 EV::loop; 3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3716
3717 cf::_post_init 0;
3718 };
3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3348} 3728}
3349 3729
3350############################################################################# 3730#############################################################################
3351# initialisation and cleanup 3731# initialisation and cleanup
3352 3732
3353# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3354BEGIN { 3734BEGIN {
3355 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3359 }; 3739 };
3360 } 3740 }
3361} 3741}
3362 3742
3363sub write_runtime { 3743sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
3365 3745
3366 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3368 3748
3369 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3750
3371 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3372 3752
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3754 or return;
3375 3755
3376 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
3389 3769
3390 close $fh 3770 close $fh
3391 or return; 3771 or return;
3392 3772
3393 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3774 and return;
3395 3775
3396 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3777
3398 1 3778 1
3779}
3780
3781our $uuid_lock;
3782our $uuid_skip;
3783
3784sub write_uuid_sync($) {
3785 $uuid_skip ||= $_[0];
3786
3787 return if $uuid_lock;
3788 local $uuid_lock = 1;
3789
3790 my $uuid = "$LOCALDIR/uuid";
3791
3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3793 or return;
3794
3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3803 $uuid_skip = 0;
3804
3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3806 and return;
3807
3808 # always fsync - this file is important
3809 aio_fsync $fh
3810 and return;
3811
3812 close $fh
3813 or return;
3814
3815 aio_rename "$uuid~", $uuid
3816 and return;
3817
3818 trace "uuid file written ($value).\n";
3819
3820 1
3821
3822}
3823
3824sub write_uuid($$) {
3825 my ($skip, $sync) = @_;
3826
3827 $sync ? write_uuid_sync $skip
3828 : async { write_uuid_sync $skip };
3399} 3829}
3400 3830
3401sub emergency_save() { 3831sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3403 3833
3404 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3405 3840
3406 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3407 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3850 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3852 $pl->save;
3416 } 3853 }
3417 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3418 3855
3419 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3861 $map->valid or next;
3423 $map->save; 3862 $map->save;
3424 } 3863 }
3425 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3426 3865
3427 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3871
3872 info "emergency_perl_save: begin write uuid\n";
3873 write_uuid_sync 1;
3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3894 };
3431 3895
3432 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3433} 3897}
3434 3898
3435sub post_cleanup { 3899sub post_cleanup {
3436 my ($make_core) = @_; 3900 my ($make_core) = @_;
3437 3901
3902 IO::AIO::flush;
3903
3438 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3905 if $make_core;
3906
3907 my $fh = pidfile;
3908 unlink $PIDFILE if <$fh> == $$;
3909}
3910
3911# a safer delete_package, copied from Symbol
3912sub clear_package($) {
3913 my $pkg = shift;
3914
3915 # expand to full symbol table name if needed
3916 unless ($pkg =~ /^main::.*::$/) {
3917 $pkg = "main$pkg" if $pkg =~ /^::/;
3918 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3919 $pkg .= '::' unless $pkg =~ /::$/;
3920 }
3921
3922 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3923 my $stem_symtab = *{$stem}{HASH};
3924
3925 defined $stem_symtab and exists $stem_symtab->{$leaf}
3926 or return;
3927
3928 # clear all symbols
3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3930 for my $name (keys %$leaf_symtab) {
3931 _gv_clear *{"$pkg$name"};
3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3933 }
3440} 3934}
3441 3935
3442sub do_reload_perl() { 3936sub do_reload_perl() {
3443 # can/must only be called in main 3937 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3446 return; 3940 return;
3447 } 3941 }
3448 3942
3449 warn "reloading..."; 3943 return if $RELOAD++;
3450 3944
3451 warn "entering sync_job"; 3945 my $t1 = AE::time;
3452 3946
3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3950
3951 trace "perl_reload: entering sync_job";
3952
3453 cf::sync_job { 3953 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3954 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3955
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3958 %EXT_CORO = ();
3477 3959
3478 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3479 %COMMAND = (); 3961 %COMMAND = ();
3480 3962
3481 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3482 %EXTCMD = (); 3964 %EXTCMD = ();
3483 %EXTICMD = (); 3965 %EXTICMD = ();
3484 3966
3485 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3488 3970
3489 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3972 eval {
3491 $cb->($pkg); 3973 $cb->($pkg);
3492 1 3974 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3976 }
3977
3978 trace "... clearing $pkg";
3979 clear_package $pkg;
3494 } 3980 }
3495 3981
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3985
3504 warn "... unloading $k"; 3986 trace "... unloading $k";
3505 delete $INC{$k}; 3987 delete $INC{$k};
3506 3988
3507 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3509 3991
3510 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3512 } 3997 }
3513 3998
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 4002
3521 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 4006
3525 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3526 # and global variables created in xs 4008 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3528 4010
3529 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3530 4012
3531 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3532 require cf; 4014 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3534 4016
3535 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3536 cf::reload_config; 4018 cf::reload_config;
3537 4019
3538 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3539 cf::load_extensions; 4021 cf::load_extensions;
3540 4022
4023 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3544 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3547 4031
3548 warn "leaving sync_job"; 4032 cf::_post_init 1;
3549 4033
4034 trace "perl_reload: leaving sync_job";
4035
3550 1 4036 1
3551 } or do { 4037 } or do {
3552 warn $@; 4038 error $@;
3553 warn "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3554 exit 1; 4040 };
4041
4042 --$RELOAD;
3555 }; 4043 }
3556 4044
3557 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3558}; 4047};
3559 4048
3560our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3561 4050
3562sub reload_perl() { 4051sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3565 4054
4055 $RELOAD_WATCHER ||= cf::async {
4056 Coro::AIO::aio_wait cache_extensions;
4057
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4059 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4061 };
3569 }; 4062 };
3570} 4063}
3571 4064
3572register_command "reload" => sub { 4065register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3579 reload_perl; 4072 reload_perl;
3580 }; 4073 };
3581 } 4074 }
3582}; 4075};
3583 4076
3584unshift @INC, $LIBDIR; 4077#############################################################################
3585 4078
3586my $bug_warning = 0; 4079my $bug_warning = 0;
3587 4080
3588our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN;
3590
3591sub wait_for_tick { 4081sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3593 return if $Coro::current == $Coro::main;
3594 4083
3595 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3596 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait;
3598} 4085}
3599 4086
3600sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3602 return if $Coro::current == $Coro::main;
3603 4089
3604 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4092 $signal->wait;
3607} 4093}
3608 4094
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4095sub tick {
3610 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3613 return; 4099 return;
3614 } 4100 }
3615 4101
3616 $NOW = $tick_start = EV::now; 4102 cf::one_tick; # one server iteration
3617 4103
3618 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3619
3620 $RUNTIME += $TICK;
3621 $NEXT_TICK = $_[0]->at;
3622 4105
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4108 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4110 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3629 }; 4112 };
3630 } 4113 }
3631 4114
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4116 $sig->send;
3634 } 4117 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3636 $sig->send;
3637 }
3638 4119
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4122
3642 _post_tick; 4123 if (0) {
3643}; 4124 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
4129 }
4130}
3645 4131
3646{ 4132{
3647 # configure BDB 4133 # configure BDB
3648 4134
3649 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3652 4138
3653 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4146
3660 cf::sync_job { 4147 cf::sync_job {
3661 eval { 4148 eval {
3687{ 4174{
3688 # configure IO::AIO 4175 # configure IO::AIO
3689 4176
3690 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4179 undef $AnyEvent::AIO::WATCHER;
3693} 4180}
3694 4181
3695my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3696 4184
3697sub _log_backtrace { 4185sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3699 4187
3700 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3701 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3705 async { 4198 async {
3706 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3707 4200
3708 my @bt = fork_call { 4201 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4213 }
3721 4214
3722 @funcs 4215 @funcs
3723 }; 4216 };
3724 4217
3725 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4221 --$_log_backtrace;
3728 }; 4222 };
3729 } else { 4223 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4226 }
3733} 4227}
3734 4228
3735# load additional modules 4229# load additional modules
3736use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3737 4232
3738END { cf::emergency_save } 4233END { cf::emergency_save }
3739 4234
37401 42351
3741 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines