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.411 by root, Fri Feb 1 15:54:07 2008 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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 {
197 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
198 306
199 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 311 return;#d#
202 }#d# 312 }#d#
203 313
204 # kill coroutine otherwise 314 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 315 Coro::terminate
207}; 316};
208
209$SIG{__DIE__} = sub { }; #d#?
210 317
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 328for my $pkg (qw(
222 cf::global cf::attachable 329 cf::global cf::attachable
223 cf::object cf::object::player 330 cf::object cf::object::player
224 cf::client cf::player 331 cf::client cf::player
225 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
226 cf::map cf::party cf::region 334 cf::party cf::region
227)) { 335)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 337}
231 338
232$EV::DIED = sub { 339$EV::DIED = sub {
233 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
234}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
235 347
236############################################################################# 348#############################################################################
237 349
238=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
239 351
260 $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;
261 $d 373 $d
262 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
263} 375}
264 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
265=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
266 392
267Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
268 394
269=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
275our $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
276 402
277sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
279 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
280=item cf::lock_wait $string 468=item cf::lock_wait $string
281 469
282Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
283 471
284=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
285 473
286Wait 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
287a 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,
288for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
289returned. 477returned.
290 478
291Locks 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
292deadlocked coro. 480deadlocked coro.
298 486
299Return 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.
300 488
301=cut 489=cut
302 490
303our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 492
306sub lock_wait($) { 493sub lock_wait($) {
307 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 495}
320 496
321sub lock_acquire($) { 497sub lock_acquire($) {
322 my ($key) = @_; 498 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 499}
336 500
337sub lock_active($) { 501sub lock_active($) {
338 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 503}
342 504
343sub freeze_mainloop { 505sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
345 507
346 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 509}
352 510
353=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
354 512
355Like 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
356get spread over timer. 514get spread over time.
357 515
358=cut 516=cut
359 517
360sub periodic($$) { 518sub periodic($$) {
361 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
365 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
366} 524}
367 525
368=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
369 527
370Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
371This 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
372of 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.
373 535
374The 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
375used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
376 538
377Useful for short background jobs. 539Useful for short background jobs.
378 540
379=cut 541=cut
380 542
381our @SLOT_QUEUE; 543our @SLOT_QUEUE;
382our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
383 546
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
387 550
388 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
389 553
390 while () { 554 while () {
391 next_job: 555 next_job:
556
392 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 558
394 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 563 $job->[2]->send;
398 Coro::cede; 564 Coro::cede;
399 goto next_job; 565 goto next_job;
400 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 568 }
402 } 569 }
403 570
404 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
405 # 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
406 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
407 $signal->wait;
408 } else { 574 } else {
575 $busy = 0;
409 Coro::schedule; 576 Coro::schedule;
410 } 577 }
411 } 578 }
412}; 579};
413 580
414sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
415 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
416 585
417 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
418 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
419 589
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
448=cut 618=cut
449 619
450sub sync_job(&) { 620sub sync_job(&) {
451 my ($job) = @_; 621 my ($job) = @_;
452 622
453 if ($Coro::current == $Coro::main) { 623 if (in_main) {
454 my $time = EV::time; 624 my $time = AE::time;
455 625
456 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
458 628
459 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
460 630
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
464 632
465 my $busy = 1; 633 my $busy = 1;
466 my @res; 634 my @res;
467 635
468 (async { 636 (async {
469 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 638 @res = eval { $job->() };
471 warn $@ if $@; 639 error $@ if $@;
472 undef $busy; 640 undef $busy;
473 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
474 642
475 while ($busy) { 643 while ($busy) {
476 if (Coro::nready) { 644 if (Coro::nready) {
478 } else { 646 } else {
479 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
480 } 648 }
481 } 649 }
482 650
483 $time = EV::time - $time; 651 my $time = AE::time - $time;
484 652
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
489 654
490 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
491 } else { 656 } else {
492 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
493 658
513 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
514 679
515 $coro 680 $coro
516} 681}
517 682
518=item fork_call { }, $args 683=item fork_call { }, @args
519 684
520Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling. 688never block itself or use any form of event handling.
524 689
525=cut 690=cut
526 691
692sub post_fork {
693 reset_signals;
694}
695
527sub fork_call(&@) { 696sub fork_call(&@) {
528 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
529 698
530 # 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,
531 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
533 702
534 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
535 reset_signals; 704 cf::post_fork;
536 &$cb 705 &$cb
537 }, @args; 706 } @args;
538 707
539 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
540} 747}
541 748
542=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
543 750
544Returns a single value from the environment database. 751Returns a single value from the environment database.
554within each server. 761within each server.
555 762
556=cut 763=cut
557 764
558sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
559 my ($name) = @_; 769 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
561 771
562 eval { 772 eval {
563 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
573} 783}
574 784
575our $DB; 785our $DB;
576 786
577sub db_init { 787sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
580 };
581} 789}
582 790
583sub db_get($$) { 791sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
585 793
586 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
587 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
588 798
589 $! ? () 799 $! ? ()
590 : $data 800 : $data
591 }
592} 801}
593 802
594sub db_put($$$) { 803sub db_put($$$) {
595 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
624 833
625 my @data; 834 my @data;
626 my $md5; 835 my $md5;
627 836
628 for (0 .. $#$src) { 837 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
630 or Carp::croak "$src->[$_]: $!";
631 } 839 }
632 840
633 # if processing is expensive, check 841 # if processing is expensive, check
634 # checksum first 842 # checksum first
635 if (1) { 843 if (1) {
652 860
653 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data); 862 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
656 864
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 866
659 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
662 870
672 880
673=cut 881=cut
674 882
675sub datalog($@) { 883sub datalog($@) {
676 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 886}
679 887
680=back 888=back
681 889
682=cut 890=cut
683 891
684############################################################################# 892#############################################################################
685 893
686=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
687 895
688Many 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
689attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
691 899
692In 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>
693C<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
743=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
744 952
745Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
747 955
748Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
749that 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.
750 958
751These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
752 960
753=over 4 961=over 4
877 1085
878 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 1088
881 } elsif (ref $type) { 1089 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
883 1091
884 } else { 1092 } else {
885 shift @arg; 1093 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
887 } 1095 }
888 } 1096 }
889} 1097}
890 1098
891sub _object_attach { 1099sub _object_attach {
901 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
902 } 1110 }
903 1111
904 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
905 } else { 1113 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1115 }
908 1116
909 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
910} 1118}
911 1119
970 1178
971 for (@$callbacks) { 1179 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
973 1181
974 if ($@) { 1182 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1184 override;
978 } 1185 }
979 1186
980 return 1 if $override; 1187 return 1 if $override;
981 } 1188 }
1044 1251
1045sub reattach { 1252sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1254 my ($obj) = @_;
1048 1255
1256 # no longer needed after getting rid of delete_package?
1049 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
1050 1258
1051 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1052 1260
1053 @$registry = (); 1261 @$registry = ();
1054 1262
1059 for (@$attach) { 1267 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1062 } 1270 }
1063 } else { 1271 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1273 }
1066 } 1274 }
1067} 1275}
1068 1276
1069cf::attachable->attach ( 1277cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1097 1305
1098 sync_job { 1306 sync_job {
1099 if (length $$rdata) { 1307 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1103 1312
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 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 }
1108 close $fh; 1320 aio_close $fh;
1109 1321
1110 if (@$objs) { 1322 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1115 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 }
1116 close $fh; 1331 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1333 }
1119 } else { 1334 } else {
1120 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1121 } 1336 }
1122 1337
1123 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1342 } else {
1125 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1126 } 1344 }
1127 } else { 1345 } else {
1128 aio_unlink $filename; 1346 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1130 } 1348 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1373 $av = $st->{objs};
1156 } 1374 }
1157 1375
1158 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1161 1380
1162 ($data, $av) 1381 ($data, $av)
1163} 1382}
1164 1383
1165=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1221 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1222 1441
1223 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1224} 1443}
1225 1444
1445use File::Glob ();
1446
1226cf::player->attach ( 1447cf::player->attach (
1227 on_command => sub { 1448 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1229 1450
1230 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1231 or return; 1452 or return;
1232 1453
1240 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1241 1462
1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1243 1464
1244 if (ref $msg) { 1465 if (ref $msg) {
1245 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249 1467
1250 my @reply; 1468 my @reply;
1251 1469
1252 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1253 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1255 1473
1256 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1257 if $reply; 1475 if $reply;
1258 1476
1259 } else { 1477 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1479 }
1262 1480
1263 cf::override; 1481 cf::override;
1264 }, 1482 },
1265); 1483);
1266 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
1267sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1268 cf::sync_job { 1501 cf::sync_job {
1269 my %todo; 1502 my %todo;
1270 1503
1271 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1505 next unless -r $path;
1290 1523
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1526
1294 $ext{source} = 1527 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1297 . $source 1530 . $source
1298 . "\n};\n1"; 1531 . "\n};\n1";
1299 1532
1300 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1301 } 1534 }
1302 1535
1536 my $pass = 0;
1303 my %done; 1537 my %done;
1304 while (%todo) { 1538 while (%todo) {
1305 my $progress; 1539 my $progress;
1306 1540
1541 ++$pass;
1542
1543 ext:
1307 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1546 next ext
1310 unless exists $done{$_}; 1547 unless exists $done{$_};
1311 } 1548 }
1312 1549
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1551
1315 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1556
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1322 } 1558 if exists $v->{meta}{mandatory};
1323 1559
1324 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1325 } 1569 }
1326
1327 $done{$k} = delete $todo{$k};
1328 push @EXTS, $v->{pkg};
1329 $progress = 1;
1330 } 1570 }
1331 1571
1332 skip: 1572 unless ($progress) {
1333 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1334 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 }
1335 } 1582 }
1336 }; 1583 };
1337} 1584}
1338 1585
1339############################################################################# 1586#############################################################################
1340 1587
1341=back 1588=back
1342 1589
1343=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1344 1591
1345Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1346 1593
1347=cut 1594=cut
1348 1595
1349package cf::player; 1596package cf::player;
1350 1597
1393 1640
1394sub exists($) { 1641sub exists($) {
1395 my ($login) = @_; 1642 my ($login) = @_;
1396 1643
1397 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1399} 1646}
1400 1647
1401sub find($) { 1648sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1650 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1663 or return;
1417 1664
1418 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1419 or return; 1666 or return;
1667
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1423 } 1671 }
1424 } 1672 }
1425} 1673}
1426 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
1427sub save($) { 1688sub save($) {
1428 my ($pl) = @_; 1689 my ($pl) = @_;
1429 1690
1430 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1431 1692
1434 1695
1435 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1436 1697
1437 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1438 $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];
1439 1705
1440 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1707 cf::cede_to_tick;
1442} 1708}
1443 1709
1475 my ($pl) = @_; 1741 my ($pl) = @_;
1476 1742
1477 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1478 1744
1479 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1480 $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
1481 1747
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1483 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1485 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1486 1756
1487 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1489 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1527 1797
1528 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1529 my $path = path $login; 1799 my $path = path $login;
1530 1800
1531 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1807 }
1537 1808
1541 1812
1542 \@logins 1813 \@logins
1543} 1814}
1544 1815
1545=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1546 1819
1547Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1548player. May block. 1821player. May block.
1549 1822
1550=cut 1823=cut
1568 } 1841 }
1569 1842
1570 \@paths 1843 \@paths
1571} 1844}
1572 1845
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1847
1575Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1576
1577=cut
1578
1579use re 'eval';
1580
1581my $group;
1582my $interior; $interior = qr{
1583 # match a pod interior sequence sans C<< >>
1584 (?:
1585 \ (.*?)\ (?{ $group = $^N })
1586 | < (??{$interior}) >
1587 )
1588}x;
1589
1590sub expand_cfpod {
1591 my ($self, $pod) = @_;
1592
1593 my $xml;
1594
1595 while () {
1596 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1597 $group = $1;
1598
1599 $group =~ s/&/&amp;/g;
1600 $group =~ s/</&lt;/g;
1601
1602 $xml .= $group;
1603 } elsif ($pod =~ m%\G
1604 ([BCGHITU])
1605 <
1606 (?:
1607 ([^<>]*) (?{ $group = $^N })
1608 | < $interior >
1609 )
1610 >
1611 %gcsx
1612 ) {
1613 my ($code, $data) = ($1, $group);
1614
1615 if ($code eq "B") {
1616 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1617 } elsif ($code eq "I") {
1618 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1619 } elsif ($code eq "U") {
1620 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1621 } elsif ($code eq "C") {
1622 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1623 } elsif ($code eq "T") {
1624 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1625 } elsif ($code eq "G") {
1626 my ($male, $female) = split /\|/, $data;
1627 $data = $self->gender ? $female : $male;
1628 $xml .= expand_cfpod ($self, $data);
1629 } elsif ($code eq "H") {
1630 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1631 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1632 "")
1633 [$self->{hintmode}];
1634 } else {
1635 $xml .= "error processing '$code($data)' directive";
1636 }
1637 } else {
1638 if ($pod =~ /\G(.+)/) {
1639 warn "parse error while expanding $pod (at $1)";
1640 }
1641 last;
1642 }
1643 }
1644
1645 for ($xml) {
1646 # create single paragraphs (very hackish)
1647 s/(?<=\S)\n(?=\w)/ /g;
1648
1649 # compress some whitespace
1650 s/\s+\n/\n/g; # ws line-ends
1651 s/\n\n+/\n/g; # double lines
1652 s/^\n+//; # beginning lines
1653 s/\n+$//; # ending lines
1654 }
1655
1656 $xml
1657}
1658
1659no re 'eval';
1660
1661sub hintmode {
1662 $_[0]{hintmode} = $_[1] if @_ > 1;
1663 $_[0]{hintmode}
1664}
1665 1849
1666=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1667 1851
1668Sends an ext reply to the player. 1852Sends an ext reply to the player.
1669 1853
1701 1885
1702=cut 1886=cut
1703 1887
1704sub find_by_path($) { 1888sub find_by_path($) {
1705 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1706 1892
1707 my ($match, $specificity); 1893 my ($match, $specificity);
1708 1894
1709 for my $region (list) { 1895 for my $region (list) {
1710 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1736our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1738 1924
1739sub generate_random_map { 1925sub generate_random_map {
1740 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1741 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1742 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1743 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1744 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1745 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1746 $rmp->{exit_on_final_map},
1747 $rmp->{xsize}, $rmp->{ysize},
1748 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1749 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1750 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1751 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1752 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1753 (cf::region::find $rmp->{region}), $rmp->{custom}
1754 )
1755} 1931}
1756 1932
1757=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1758 1934
1759Register 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
1764 1940
1765sub register { 1941sub register {
1766 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1767 my $pkg = caller; 1943 my $pkg = caller;
1768 1944
1769 no strict;
1770 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1771 1946
1772 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1773} 1948}
1774 1949
1775# also paths starting with '/' 1950# also paths starting with '/'
1776$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1777 1952
1778sub thawer_merge { 1953sub thawer_merge {
1779 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1780 1955
1781 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1786} 1961}
1787 1962
1788sub normalise { 1963sub normalise {
1789 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1790 1965
1791 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1792 1967
1793 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1794 1969
1795 # map plan: 1970 # map plan:
1796 # 1971 #
1811 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1812 $path = "$base/$path"; 1987 $path = "$base/$path";
1813 } 1988 }
1814 1989
1815 for ($path) { 1990 for ($path) {
1816 redo if s{//}{/};
1817 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1818 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1819 } 1993 }
1820 1994
1821 $path 1995 $path
1835 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1836 return $self; 2010 return $self;
1837 } 2011 }
1838 } 2012 }
1839 2013
1840 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1841 () 2015 ()
1842} 2016}
1843 2017
2018# may re-bless or do other evil things
1844sub init { 2019sub init {
1845 my ($self) = @_; 2020 my ($self) = @_;
1846 2021
1847 $self 2022 $self
1848} 2023}
1867 2042
1868# the temporary/swap location 2043# the temporary/swap location
1869sub save_path { 2044sub save_path {
1870 my ($self) = @_; 2045 my ($self) = @_;
1871 2046
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1874} 2049}
1875 2050
1876# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1877sub uniq_path { 2052sub uniq_path {
1878 my ($self) = @_; 2053 my ($self) = @_;
1879 2054
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1882}
1883
1884# and all this just because we cannot iterate over
1885# all maps in C++...
1886sub change_all_map_light {
1887 my ($change) = @_;
1888
1889 $_->change_map_light ($change)
1890 for grep $_->outdoor, values %cf::MAP;
1891} 2057}
1892 2058
1893sub decay_objects { 2059sub decay_objects {
1894 my ($self) = @_; 2060 my ($self) = @_;
1895 2061
1922 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1923 2089
1924 1 2090 1
1925} 2091}
1926 2092
2093# used to laod the header of an original map
1927sub load_header_orig { 2094sub load_header_orig {
1928 my ($self) = @_; 2095 my ($self) = @_;
1929 2096
1930 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1931} 2098}
1932 2099
2100# used to laod the header of an instantiated map
1933sub load_header_temp { 2101sub load_header_temp {
1934 my ($self) = @_; 2102 my ($self) = @_;
1935 2103
1936 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1937} 2105}
1938 2106
2107# called after loading the header from an instantiated map
1939sub prepare_temp { 2108sub prepare_temp {
1940 my ($self) = @_; 2109 my ($self) = @_;
1941 2110
1942 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1943 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1944 # safety 2113 # safety
1945 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1946 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1947} 2116}
1948 2117
2118# called after loading the header from an original map
1949sub prepare_orig { 2119sub prepare_orig {
1950 my ($self) = @_; 2120 my ($self) = @_;
1951 2121
1952 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1953 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1977 2147
1978sub find; 2148sub find;
1979sub find { 2149sub find {
1980 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1981 2151
2152 cf::cede_to_tick;
2153
1982 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1983 2155
1984 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1986 2158
1987 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1988 my $guard1 = cf::lock_acquire "map_find:$path";
1989 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1990
1991 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1992 or return; 2161 or return;
1993 2162
1994 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1995 2164
1997 or return; 2166 or return;
1998 2167
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2002 undef $guard1; 2172 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2173 $map->reset;
2005 return find $path; 2174 return find $path;
2006 } 2175 }
2007 2176
2008 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2009 } 2178 }
2010} 2179}
2011 2180
2012sub pre_load { } 2181sub pre_load { }
2013sub post_load { } 2182#sub post_load { } # XS
2014 2183
2015sub load { 2184sub load {
2016 my ($self) = @_; 2185 my ($self) = @_;
2017 2186
2018 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2021 2190
2022 { 2191 {
2023 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2024 2193
2025 return unless $self->valid; 2194 return unless $self->valid;
2026 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2027
2028 $self->in_memory (cf::MAP_LOADING);
2029 2196
2030 $self->alloc; 2197 $self->alloc;
2031 2198
2032 $self->pre_load; 2199 $self->pre_load;
2033 cf::cede_to_tick; 2200 cf::cede_to_tick;
2034 2201
2202 if (exists $self->{load_path}) {
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2204 $f->skip_block;
2037 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2038 or return; 2206 or return;
2039 2207
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
2041 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2042 2210
2043 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2212 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2047 $self->clear_unique_items; 2215 $self->clear_unique_items;
2048 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2050 } 2219 }
2051 } 2220 }
2052 }
2053 2221
2054 $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);
2055 2229
2056 cf::cede_to_tick; 2230 cf::cede_to_tick;
2057 # now do the right thing for maps 2231 # now do the right thing for maps
2058 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2059 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2063 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2238 $self->decay_objects;
2065 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2066 $self->update_buttons; 2240 $self->update_buttons;
2067 cf::cede_to_tick; 2241 cf::cede_to_tick;
2068 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
2069 cf::cede_to_tick;
2070 $self->activate;
2071 } 2243 }
2072 2244
2073 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_IN_MEMORY);
2077 } 2247 }
2078 2248
2079 $self->post_load; 2249 $self->post_load;
2080}
2081 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
2082sub customise_for { 2257sub customise_for {
2083 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2084 2259
2085 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2261 if $self->per_player;
2089# if $self->per_party; 2264# if $self->per_party;
2090 2265
2091 $self 2266 $self
2092} 2267}
2093 2268
2094# find and load all maps in the 3x3 area around a map
2095sub load_neighbours {
2096 my ($map) = @_;
2097
2098 my @neigh; # diagonal neighbours
2099
2100 for (0 .. 3) {
2101 my $neigh = $map->tile_path ($_)
2102 or next;
2103 $neigh = find $neigh, $map
2104 or next;
2105 $neigh->load;
2106
2107 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 }
2111
2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
2114 my $neigh = find $path, $origin
2115 or next;
2116 $neigh->load;
2117 }
2118}
2119
2120sub find_sync { 2269sub find_sync {
2121 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2122 2271
2123 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
2124} 2277}
2125 2278
2126sub do_load_sync { 2279sub do_load_sync {
2127 my ($map) = @_; 2280 my ($map) = @_;
2128 2281
2282 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2131 2285
2132 cf::sync_job { $map->load }; 2286 $map->load;
2133} 2287}
2134 2288
2135our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2137 2291
2138sub find_async { 2292sub find_async {
2139 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2140 2294
2141 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2142 2296
2143 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2145 } 2299 }
2146 2300
2147 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2148 2302
2149 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2164 2318
2165 () 2319 ()
2166} 2320}
2167 2321
2322# common code, used by both ->save and ->swapout
2168sub save { 2323sub _save {
2169 my ($self) = @_; 2324 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2325
2173 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2174 2327
2175 return unless $self->dirty; 2328 return unless $self->dirty;
2176 2329
2185 2338
2186 cf::async { 2339 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2340 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2189 }; 2342 };
2343
2344 cf::get_slot 0.02;
2190 2345
2191 if ($uniq) { 2346 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2349 } else {
2195 $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);
2196 } 2351 }
2197} 2352}
2198 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2199sub swap_out { 2362sub swap_out {
2200 my ($self) = @_; 2363 my ($self) = @_;
2201 2364
2202 # save first because save cedes
2203 $self->save;
2204
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2207 return if $self->players; 2369 return if $self->players;
2208 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
2209 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2210 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
2211 $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};
2212 2421
2213 $self->deactivate; 2422 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2215 $self->clear; 2424 $self->clear;
2216}
2217
2218sub reset_at {
2219 my ($self) = @_;
2220
2221 # TODO: safety, remove and allow resettable per-player maps
2222 return 1e99 if $self->{deny_reset};
2223
2224 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2225 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2226
2227 $time + $to
2228}
2229
2230sub should_reset {
2231 my ($self) = @_;
2232
2233 $self->reset_at <= $cf::RUNTIME
2234}
2235
2236sub reset {
2237 my ($self) = @_;
2238
2239 my $lock = cf::lock_acquire "map_data:$self->{path}";
2240
2241 return if $self->players;
2242
2243 warn "resetting map ", $self->path;
2244
2245 $self->in_memory (cf::MAP_SWAPPED);
2246
2247 # need to save uniques path
2248 unless ($self->{deny_save}) {
2249 my $uniq = $self->uniq_path; utf8::encode $uniq;
2250
2251 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2252 if $uniq;
2253 }
2254
2255 delete $cf::MAP{$self->path};
2256
2257 $self->deactivate;
2258 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->clear;
2260 2425
2261 $self->unlink_save; 2426 $self->unlink_save;
2262 $self->destroy; 2427 $self->destroy;
2263} 2428}
2264 2429
2272 2437
2273 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2274 2439
2275 $self->unlink_save; 2440 $self->unlink_save;
2276 2441
2277 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2278 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2279 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2280 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2282 2447
2331 2496
2332sub unique_maps() { 2497sub unique_maps() {
2333 [ 2498 [
2334 map { 2499 map {
2335 utf8::decode $_; 2500 utf8::decode $_;
2336 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2337 ? normalise $_ 2504 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2506 ]
2341} 2507}
2342 2508
2343package 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}
2344 2540
2345=back 2541=back
2346 2542
2347=head3 cf::object 2543=head3 cf::object
2348 2544
2352 2548
2353=over 4 2549=over 4
2354 2550
2355=item $ob->inv_recursive 2551=item $ob->inv_recursive
2356 2552
2357Returns 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.
2358 2555
2359=cut 2556=cut
2360 2557
2361sub inv_recursive_; 2558sub inv_recursive_;
2362sub inv_recursive_ { 2559sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2368} 2565}
2369 2566
2370=item $ref = $ob->ref 2567=item $ref = $ob->ref
2371 2568
2372creates 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.
2373 2570
2374=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2375 2572
2376returns 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,
2377even if the object actually exists. May block. 2574even if the object actually exists. May block.
2409can 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
2410dialogue with the given NPC character. 2607dialogue with the given NPC character.
2411 2608
2412=cut 2609=cut
2413 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
2414# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2626# with dialog boxes.
2416#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
2417sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2430 $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));
2431 2642
2432 } else { 2643 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2646 }
2436 } 2647 }
2437} 2648}
2438 2649
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2675
2465=item $player_object->enter_link 2676=item $player_object->enter_link
2466 2677
2467Freezes 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}>).
2468 2679
2469The 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.
2470I<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.
2471 2684
2472Will never block. 2685Will never block.
2473 2686
2474=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2475 2688
2495sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2496 my ($self) = @_; 2709 my ($self) = @_;
2497 2710
2498 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2499 2712
2713 ++$self->{_link_recursion};
2714
2500 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2501 2716
2502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2503 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2504 2719
2505 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2506} 2721}
2507 2722
2508sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2509 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2510 2725
2527 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2529 2744
2530 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2533 2748
2534 $map->load; 2749 $map->load;
2535 $map->load_neighbours;
2536 2750
2537 return unless $self->contr->active; 2751 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2752
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2542} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2543 2760
2761}
2762
2544=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)]])
2545 2764
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2550be called at the end of this process. 2769be called at the end of this process.
2551 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
2552=cut 2774=cut
2553 2775
2554our $GOTOGEN; 2776our $GOTOGEN;
2555 2777
2556sub cf::object::player::goto { 2778sub cf::object::player::goto {
2557 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 }
2558 2786
2559 # 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
2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2561 2789
2562 $self->enter_link; 2790 $self->enter_link;
2582 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2583 } 2811 }
2584 } 2812 }
2585 2813
2586 my $map = eval { 2814 my $map = eval {
2587 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2588 2816
2589 if ($map) { 2817 if ($map) {
2590 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2591 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2592 } else { 2820 } else {
2593 $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);
2594 } 2822 }
2595 2823
2596 $map 2824 $map
2604 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2605 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2606 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2607 } 2835 }
2608 2836
2609 $done->() if $done; 2837 $done->($self) if $done;
2610 })->prio (1); 2838 })->prio (1);
2611} 2839}
2612 2840
2613=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2614 2842
2634} 2862}
2635 2863
2636sub prepare_random_map { 2864sub prepare_random_map {
2637 my ($exit) = @_; 2865 my ($exit) = @_;
2638 2866
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2869 # that depends on the exit object
2644 2870
2645 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2873 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2652 } 2880 }
2653 2881
2654 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2655 2883
2656 my $data = cf::encode_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2659 2887
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2890 undef $fh;
2663 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2664 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2667 } 2899 }
2668} 2900}
2669 2901
2670sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2672 2904
2673 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2674 2906
2675 if ($exit->slaying eq "/!") {
2676 #TODO: this should de-fi-ni-te-ly not be a sync-job
2677 # the problem is that $exit might not survive long enough
2678 # so it needs to be done right now, right here
2679 cf::sync_job { prepare_random_map $exit };
2680 }
2681
2682 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2683 my $hp = $exit->stats->hp;
2684 my $sp = $exit->stats->sp;
2685
2686 $self->enter_link; 2907 $self->enter_link;
2687 2908
2688 # if exit is damned, update players death & WoR home-position
2689 $self->contr->savebed ($slaying, $hp, $sp)
2690 if $exit->flag (FLAG_DAMNED);
2691
2692 (async { 2909 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2910 $Coro::current->{desc} = "enter_exit";
2694 2911
2695 $self->deactivate_recursive; # just to be sure
2696 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
2697 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2698 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
2699 1; 2948 1
2700 }) { 2949 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "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. "
2703 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2954
2706 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 2956 $self->leave_link;
2708 } 2957 }
2709 })->prio (1); 2958 })->prio (1);
2710} 2959}
2711 2960
2723sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2725 2974
2726 utf8::encode $text; 2975 utf8::encode $text;
2727 $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);
2728} 3002}
2729 3003
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 3005
2732Send 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
2736 3010
2737=cut 3011=cut
2738 3012
2739# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2741 "c/identify" => { 3021 "c/identify" => {
2742 id => "infobox", 3022 id => "infobox",
2743 title => "Identify", 3023 title => "Identify",
2744 reply => undef, 3024 reply => undef,
2745 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2747 "c/examine" => { 3027 "c/examine" => {
2748 id => "infobox", 3028 id => "infobox",
2749 title => "Examine", 3029 title => "Examine",
2750 reply => undef, 3030 reply => undef,
2751 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",
2752 }, 3038 },
2753 "c/book" => { 3039 "c/book" => {
2754 id => "infobox", 3040 id => "infobox",
2755 title => "Book", 3041 title => "Book",
2756 reply => undef, 3042 reply => undef,
2772 id => "infobox", 3058 id => "infobox",
2773 title => "Body Parts", 3059 title => "Body Parts",
2774 reply => undef, 3060 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3061 tooltip => "Shows which body parts you posess and are available",
2776 }, 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 },
2777 "c/uptime" => { 3099 "c/uptime" => {
2778 id => "infobox", 3100 id => "infobox",
2779 title => "Uptime", 3101 title => "Uptime",
2780 reply => undef, 3102 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 3103 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 3106 id => "infobox",
2785 title => "Map Info", 3107 title => "Map Info",
2786 reply => undef, 3108 reply => undef,
2787 tooltip => "Information related to the maps", 3109 tooltip => "Information related to the maps",
2788 }, 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,
2789); 3125);
2790 3126
2791sub cf::client::send_msg { 3127sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2793 3129
2794 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2795 3132
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 3134
2798 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2801 3138
2802 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2806 3141
2807 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 3147 }
2814 3148
2815 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2816 } 3150 }
2817 3151
2818 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2819 3153
2820 if ($self->can_msg) {
2821 # default colour, mask it out 3154 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2824 3157
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 3161 );
2828 if ($color >= 0) {
2829 # replace some tags by gcfclient-compatible ones
2830 for ($msg) {
2831 1 while
2832 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2833 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2834 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2835 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2836 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2837 }
2838 3162
2839 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2840
2841 utf8::encode $msg;
2842
2843 if (0 && $msg =~ /\[/) {
2844 # COMMAND/INFO
2845 $self->send_packet ("drawextinfo $color 10 8 $msg")
2846 } else {
2847 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2848 $self->send_packet ("drawinfo $color $msg")
2849 }
2850 }
2851 }
2852} 3164}
2853 3165
2854=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2855 3167
2856Sends an ext event to the client. 3168Sends an ext event to the client.
2859 3171
2860sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2862 3174
2863 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 3180 }
2869} 3181}
2870 3182
2871=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2872 3184
2875=cut 3187=cut
2876 3188
2877sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2879 3191
2880 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 }
2887} 3195}
2888 3196
2889=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2890 3198
2891Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2946 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2947 3255
2948 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2949 3257
2950 if (ref $msg) { 3258 if (ref $msg) {
2951 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2952 "ARRAY" eq ref $msg
2953 ? @$msg
2954 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2955 3260
2956 my @reply; 3261 my @reply;
2957 3262
2958 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2959 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2961 3266
2962 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2963 if $reply; 3268 if $reply;
2964 3269
2965 } else { 3270 } else {
2966 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";
2967 } 3272 }
2968 3273
2969 cf::override; 3274 cf::override;
2970 }, 3275 },
2971); 3276);
2991 3296
2992 $coro 3297 $coro
2993} 3298}
2994 3299
2995cf::client->attach ( 3300cf::client->attach (
2996 on_destroy => sub { 3301 on_client_destroy => sub {
2997 my ($ns) = @_; 3302 my ($ns) = @_;
2998 3303
2999 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3000 }, 3305 },
3001); 3306);
3017our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3018 3323
3019$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3020 3325
3021$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3024 sort time 3329 sort time
3025)); 3330));
3026 3331
3027# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3030 3335
3031The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
3032 3337
3033 cf::object 3338 cf::object
3034 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
3035 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
3036 3342
3037 cf::object::player 3343 cf::object::player
3038 player 3344 player
3039 3345
3040 cf::player 3346 cf::player
3045 3351
3046=cut 3352=cut
3047 3353
3048for ( 3354for (
3049 ["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
3050 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3055) { 3361) {
3056 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3059 for @funs; 3364 for @funs;
3060} 3365}
3061 3366
3076 3381
3077 my $qcode = $code; 3382 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3080 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
3081 local $_; 3389 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3390
3084 my $eval = 3391 my $eval =
3085 "do {\n" 3392 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3395 . $code
3089 . "\n}" 3396 . "\n}"
3090 ; 3397 ;
3091 3398
3399 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 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 }
3095 3408
3096 if ($@) { 3409 if ($@) {
3097 warn "$@"; 3410 warn "$@",
3098 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3100 } 3413 }
3101 3414
3102 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3103} 3416}
3104 3417
3118=cut 3431=cut
3119 3432
3120sub register_script_function { 3433sub register_script_function {
3121 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3122 3435
3123 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3124 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3125} 3438}
3126 3439
3127=back 3440=back
3128 3441
3129=cut 3442=cut
3138 # for this (global event?) 3451 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3140 3453
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142 3455
3143 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3144 3457
3145 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3146 0 < aio_load $path, $facedata
3147 or die "$path: $!";
3148
3149 $facedata = Coro::Storable::thaw $facedata;
3150 3459
3151 $facedata->{version} == 2 3460 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153 3462
3154 # 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]);
3155 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC, 3466 type => FT_RSRC,
3157 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),
3158 }; 3469 };
3159 cf::cede_to_tick; 3470 cf::cede_to_tick;
3160 3471
3161 { 3472 {
3162 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3164 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3477
3167 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 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} ;
3171 3483
3172 cf::cede_to_tick; 3484 cf::cede_to_tick;
3173 } 3485 }
3174 3486
3175 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3180 3492
3181 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3184 } else { 3496 } else {
3185 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3186 } 3498 }
3187 3499
3188 cf::cede_to_tick; 3500 cf::cede_to_tick;
3189 } 3501 }
3190 } 3502 }
3199 3511
3200 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3201 } 3513 }
3202 3514
3203 { 3515 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3207 3517
3208 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3521
3213 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3214 # prepend meta info
3215
3216 my $meta = $enc->encode ({
3217 name => $name,
3218 %{ $info->{meta} || {} },
3219 });
3220
3221 $data = pack "(w/a*)*", $meta, $info->{data};
3222 } else {
3223 $data = $info->{data};
3224 }
3225
3226 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3227 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3228 } else { 3524 } else {
3229 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3230 } 3526 }
3231 3527
3232 cf::cede_to_tick; 3528 cf::cede_to_tick;
3233 } 3529 }
3234 } 3530 }
3235 3531
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237 3533
3238 1 3534 1
3239} 3535}
3240
3241cf::global->attach (on_resource_update => sub {
3242 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3243 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3244
3245 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3246 my $sound = $soundconf->{compat}[$_]
3247 or next;
3248
3249 my $face = cf::face::find "sound/$sound->[1]";
3250 cf::sound::set $sound->[0] => $face;
3251 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3252 }
3253
3254 while (my ($k, $v) = each %{$soundconf->{event}}) {
3255 my $face = cf::face::find "sound/$v";
3256 cf::sound::set $k => $face;
3257 }
3258 }
3259});
3260 3536
3261register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3263 3539
3264 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3541 $ns->fx_want ($k, $v);
3266 } 3542 }
3267}; 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}
3268 3554
3269sub reload_regions { 3555sub reload_regions {
3270 # 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
3271 # for this (global event?) 3557 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3558 %ext::player_env::MUSIC_FACE_CACHE = ();
3286} 3572}
3287 3573
3288sub reload_archetypes { 3574sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
3291 #d# NEED to laod twice to resolve forward references
3292 # this really needs to be done in an extra post-pass
3293 # (which needs to be synchronous, so solve it differently)
3294 load_resource_file "$DATADIR/archetypes"
3295 or die "unable to load archetypes\n";
3296} 3577}
3297 3578
3298sub reload_treasures { 3579sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3301} 3582}
3302 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
3303sub reload_resources { 3604sub reload_resources {
3304 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3305 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
3306 reload_regions; 3612 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3613 reload_treasures;
3311 3614
3312 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3313}
3314
3315sub init {
3316 reload_resources;
3317} 3616}
3318 3617
3319sub reload_config { 3618sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3321 or return;
3322 3620
3323 local $/; 3621 my $config = load_file "$CONFDIR/config";
3324 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3325 3624
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3327 3626
3328 $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};
3329 $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};
3330 3629
3331 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3335 }; 3634 };
3336 warn $@ if $@; 3635 warn $@ if $@;
3337 } 3636 }
3338} 3637}
3339 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
3340sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2011 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
3341 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3343 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#
3344 (async { 3680 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3682 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3348 }; 3684 };
3349 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;
3350 reload_config; 3698 reload_config;
3351 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
3352 load_extensions; 3709 load_extensions;
3353 3710
3354 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3712
3356 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;
3357} 3728}
3358 3729
3359############################################################################# 3730#############################################################################
3360# initialisation and cleanup 3731# initialisation and cleanup
3361 3732
3362# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3363BEGIN { 3734BEGIN {
3364 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3365 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3366 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3367 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3368 }; 3739 };
3369 } 3740 }
3370} 3741}
3371 3742
3372sub write_runtime { 3743sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
3374 3745
3375 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3377 3748
3378 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3750
3380 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3381 3752
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3383 or return; 3754 or return;
3384 3755
3385 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
3398 3769
3399 close $fh 3770 close $fh
3400 or return; 3771 or return;
3401 3772
3402 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3774 and return;
3404 3775
3405 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3406 3777
3407 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 };
3408} 3829}
3409 3830
3410sub emergency_save() { 3831sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3412 3833
3413 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;
3414 3840
3415 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3416 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3850 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3852 $pl->save;
3425 } 3853 }
3426 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3427 3855
3428 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";
3429 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3861 $map->valid or next;
3432 $map->save; 3862 $map->save;
3433 } 3863 }
3434 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3435 3865
3436 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";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3438 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
3439 }; 3894 };
3440 3895
3441 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3442} 3897}
3443 3898
3444sub post_cleanup { 3899sub post_cleanup {
3445 my ($make_core) = @_; 3900 my ($make_core) = @_;
3446 3901
3902 IO::AIO::flush;
3903
3447 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3448 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 }
3449} 3934}
3450 3935
3451sub do_reload_perl() { 3936sub do_reload_perl() {
3452 # can/must only be called in main 3937 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3454 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3455 return; 3940 return;
3456 } 3941 }
3457 3942
3458 warn "reloading..."; 3943 return if $RELOAD++;
3459 3944
3460 warn "entering sync_job"; 3945 my $t1 = AE::time;
3461 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
3462 cf::sync_job { 3953 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark
3464 cf::emergency_save; 3954 #cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark
3466 3955
3467 warn "syncing database to disk";
3468 BDB::db_env_txn_checkpoint $DB_ENV;
3469
3470 # if anything goes wrong in here, we should simply crash as we already saved
3471
3472 warn "flushing outstanding aio requests";
3473 for (;;) {
3474 BDB::flush;
3475 IO::AIO::flush;
3476 Coro::cede_notself;
3477 last unless IO::AIO::nreqs || BDB::nreqs;
3478 warn "iterate...";
3479 }
3480
3481 ++$RELOAD;
3482
3483 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = (); 3958 %EXT_CORO = ();
3486 3959
3487 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3488 %COMMAND = (); 3961 %COMMAND = ();
3489 3962
3490 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3491 %EXTCMD = (); 3964 %EXTCMD = ();
3492 %EXTICMD = (); 3965 %EXTICMD = ();
3493 3966
3494 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3495 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3497 3970
3498 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3499 eval { 3972 eval {
3500 $cb->($pkg); 3973 $cb->($pkg);
3501 1 3974 1
3502 } 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;
3503 } 3980 }
3504 3981
3505 warn "... nuking $pkg";
3506 Symbol::delete_package $pkg;
3507 }
3508
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3510 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3985
3513 warn "... unloading $k"; 3986 trace "... unloading $k";
3514 delete $INC{$k}; 3987 delete $INC{$k};
3515 3988
3516 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3518 3991
3519 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3520 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3521 } 3997 }
3522 3998
3523 Symbol::delete_package $k;
3524 }
3525
3526 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3528 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);
3529 4002
3530 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 4006
3534 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3535 # and global variables created in xs 4008 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3537 4010
3538 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3539 4012
3540 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3541 require cf; 4014 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3543 4016
3544 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3545 cf::reload_config; 4018 cf::reload_config;
3546 4019
3547 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3548 cf::load_extensions; 4021 cf::load_extensions;
3549 4022
4023 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3553 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3556 4031
3557 warn "leaving sync_job"; 4032 cf::_post_init 1;
3558 4033
4034 trace "perl_reload: leaving sync_job";
4035
3559 1 4036 1
3560 } or do { 4037 } or do {
3561 warn $@; 4038 error $@;
3562 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
4040 };
4041
4042 --$RELOAD;
3563 }; 4043 }
3564 4044
3565 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3566}; 4047};
3567 4048
3568our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3569 4050
3570sub reload_perl() { 4051sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3573 4054
4055 $RELOAD_WATCHER ||= cf::async {
4056 Coro::AIO::aio_wait cache_extensions;
4057
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 4059 do_reload_perl;
3576 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
4061 };
3577 }; 4062 };
3578} 4063}
3579 4064
3580register_command "reload" => sub { 4065register_command "reload" => sub {
3581 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3587 reload_perl; 4072 reload_perl;
3588 }; 4073 };
3589 } 4074 }
3590}; 4075};
3591 4076
3592unshift @INC, $LIBDIR; 4077#############################################################################
3593 4078
3594my $bug_warning = 0; 4079my $bug_warning = 0;
3595 4080
3596our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN;
3598
3599sub wait_for_tick { 4081sub wait_for_tick() {
3600 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3601 return if $Coro::current == $Coro::main;
3602 4083
3603 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3604 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait;
3606} 4085}
3607 4086
3608sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3609 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3610 return if $Coro::current == $Coro::main;
3611 4089
3612 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 4092 $signal->wait;
3615} 4093}
3616 4094
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4095sub tick {
3618 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3619 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"
3620 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3621 return; 4099 return;
3622 } 4100 }
3623 4101
3624 $NOW = $tick_start = EV::now; 4102 cf::one_tick; # one server iteration
3625 4103
3626 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 4105
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $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.;
3633 Coro::async_pool { 4108 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 4110 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3637 }; 4112 };
3638 } 4113 }
3639 4114
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3641 $sig->send; 4116 $sig->send;
3642 } 4117 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3644 $sig->send;
3645 }
3646 4119
3647 $LOAD = ($NOW - $tick_start) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 4122
3650 _post_tick; 4123 if (0) {
3651}; 4124 if ($NEXT_TICK) {
3652$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}
3653 4131
3654{ 4132{
3655 # configure BDB 4133 # configure BDB
3656 4134
3657 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3658 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3660 4138
3661 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | 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;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 4146
3668 cf::sync_job { 4147 cf::sync_job {
3669 eval { 4148 eval {
3695{ 4174{
3696 # configure IO::AIO 4175 # configure IO::AIO
3697 4176
3698 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 4179 undef $AnyEvent::AIO::WATCHER;
3701} 4180}
3702 4181
3703my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3704 4184
3705sub _log_backtrace { 4185sub _log_backtrace {
3706 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3707 4187
3708 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3709 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3710 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3712 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3713 async { 4198 async {
3714 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3715 4200
3716 my @bt = fork_call { 4201 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4213 }
3729 4214
3730 @funcs 4215 @funcs
3731 }; 4216 };
3732 4217
3733 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4221 --$_log_backtrace;
3736 }; 4222 };
3737 } else { 4223 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3740 } 4226 }
3741} 4227}
3742 4228
3743# load additional modules 4229# load additional modules
3744use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3745 4232
3746END { cf::emergency_save } 4233END { cf::emergency_save }
3747 4234
37481 42351
3749 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines