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.574 by root, Sun May 8 21:51:27 2011 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
1255 1476
1256 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1257 if $reply; 1478 if $reply;
1258 1479
1259 } else { 1480 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1482 }
1262 1483
1263 cf::override; 1484 cf::override;
1264 }, 1485 },
1265); 1486);
1266 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1267sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1268 cf::sync_job { 1504 cf::sync_job {
1269 my %todo; 1505 my %todo;
1270 1506
1271 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1508 next unless -r $path;
1290 1526
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1529
1294 $ext{source} = 1530 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1297 . $source 1533 . $source
1298 . "\n};\n1"; 1534 . "\n};\n1";
1299 1535
1300 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1301 } 1537 }
1302 1538
1539 my $pass = 0;
1303 my %done; 1540 my %done;
1304 while (%todo) { 1541 while (%todo) {
1305 my $progress; 1542 my $progress;
1306 1543
1544 ++$pass;
1545
1546 ext:
1307 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1549 next ext
1310 unless exists $done{$_}; 1550 unless exists $done{$_};
1311 } 1551 }
1312 1552
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1554
1315 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1559
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1322 } 1561 if exists $v->{meta}{mandatory};
1323 1562
1324 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1325 } 1572 }
1326
1327 $done{$k} = delete $todo{$k};
1328 push @EXTS, $v->{pkg};
1329 $progress = 1;
1330 } 1573 }
1331 1574
1332 skip: 1575 unless ($progress) {
1333 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1334 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1335 } 1585 }
1336 }; 1586 };
1337} 1587}
1338 1588
1339############################################################################# 1589#############################################################################
1340 1590
1341=back 1591=back
1342 1592
1343=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1344 1594
1345Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1346 1596
1347=cut 1597=cut
1348 1598
1349package cf::player; 1599package cf::player;
1350 1600
1393 1643
1394sub exists($) { 1644sub exists($) {
1395 my ($login) = @_; 1645 my ($login) = @_;
1396 1646
1397 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1398 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1399} 1649}
1400 1650
1401sub find($) { 1651sub find($) {
1402 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1403 my $login = $_[0]; 1653 my $login = $_[0];
1415 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1416 or return; 1666 or return;
1417 1667
1418 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1419 or return; 1669 or return;
1670
1420 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1421 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1422 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1423 } 1674 }
1424 } 1675 }
1425} 1676}
1426 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1427sub save($) { 1691sub save($) {
1428 my ($pl) = @_; 1692 my ($pl) = @_;
1429 1693
1430 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1431 1695
1434 1698
1435 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1436 1700
1437 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1438 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1703
1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1439 1708
1440 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1441 cf::cede_to_tick; 1710 cf::cede_to_tick;
1442} 1711}
1443 1712
1475 my ($pl) = @_; 1744 my ($pl) = @_;
1476 1745
1477 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1478 1747
1479 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1480 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1481 1750
1482 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1483 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1484 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1485 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1486 1759
1487 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1488 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1489 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1527 1800
1528 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1529 my $path = path $login; 1802 my $path = path $login;
1530 1803
1531 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1532 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1533 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1534 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1535 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1536 } 1810 }
1537 1811
1541 1815
1542 \@logins 1816 \@logins
1543} 1817}
1544 1818
1545=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1546 1822
1547Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1548player. May block. 1824player. May block.
1549 1825
1550=cut 1826=cut
1568 } 1844 }
1569 1845
1570 \@paths 1846 \@paths
1571} 1847}
1572 1848
1573=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1574 1850
1575Expand crossfire pod fragments into protocol xml. 1851Expand 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 1852
1666=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1667 1854
1668Sends an ext reply to the player. 1855Sends an ext reply to the player.
1669 1856
1701 1888
1702=cut 1889=cut
1703 1890
1704sub find_by_path($) { 1891sub find_by_path($) {
1705 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1706 1895
1707 my ($match, $specificity); 1896 my ($match, $specificity);
1708 1897
1709 for my $region (list) { 1898 for my $region (list) {
1710 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1736our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1737our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1738 1927
1739sub generate_random_map { 1928sub generate_random_map {
1740 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1741 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1742 $self->_create_random_map ( 1933 $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} 1934}
1756 1935
1757=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1758 1937
1759Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1764 1943
1765sub register { 1944sub register {
1766 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1767 my $pkg = caller; 1946 my $pkg = caller;
1768 1947
1769 no strict;
1770 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1771 1949
1772 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1773} 1951}
1774 1952
1775# also paths starting with '/' 1953# also paths starting with '/'
1776$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1777 1955
1778sub thawer_merge { 1956sub thawer_merge {
1779 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1780 1958
1781 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1786} 1964}
1787 1965
1788sub normalise { 1966sub normalise {
1789 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1790 1968
1791 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1792 1970
1793 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1794 1972
1795 # map plan: 1973 # map plan:
1796 # 1974 #
1811 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1812 $path = "$base/$path"; 1990 $path = "$base/$path";
1813 } 1991 }
1814 1992
1815 for ($path) { 1993 for ($path) {
1816 redo if s{//}{/};
1817 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1818 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1819 } 1996 }
1820 1997
1821 $path 1998 $path
1835 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1836 return $self; 2013 return $self;
1837 } 2014 }
1838 } 2015 }
1839 2016
1840 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1841 () 2018 ()
1842} 2019}
1843 2020
2021# may re-bless or do other evil things
1844sub init { 2022sub init {
1845 my ($self) = @_; 2023 my ($self) = @_;
1846 2024
1847 $self 2025 $self
1848} 2026}
1867 2045
1868# the temporary/swap location 2046# the temporary/swap location
1869sub save_path { 2047sub save_path {
1870 my ($self) = @_; 2048 my ($self) = @_;
1871 2049
1872 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1873 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1874} 2052}
1875 2053
1876# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1877sub uniq_path { 2055sub uniq_path {
1878 my ($self) = @_; 2056 my ($self) = @_;
1879 2057
1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1881 "$UNIQUEDIR/$path" 2059 "$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} 2060}
1892 2061
1893sub decay_objects { 2062sub decay_objects {
1894 my ($self) = @_; 2063 my ($self) = @_;
1895 2064
1922 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1923 2092
1924 1 2093 1
1925} 2094}
1926 2095
2096# used to laod the header of an original map
1927sub load_header_orig { 2097sub load_header_orig {
1928 my ($self) = @_; 2098 my ($self) = @_;
1929 2099
1930 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1931} 2101}
1932 2102
2103# used to laod the header of an instantiated map
1933sub load_header_temp { 2104sub load_header_temp {
1934 my ($self) = @_; 2105 my ($self) = @_;
1935 2106
1936 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1937} 2108}
1938 2109
2110# called after loading the header from an instantiated map
1939sub prepare_temp { 2111sub prepare_temp {
1940 my ($self) = @_; 2112 my ($self) = @_;
1941 2113
1942 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1943 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1944 # safety 2116 # safety
1945 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1946 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1947} 2119}
1948 2120
2121# called after loading the header from an original map
1949sub prepare_orig { 2122sub prepare_orig {
1950 my ($self) = @_; 2123 my ($self) = @_;
1951 2124
1952 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1953 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1977 2150
1978sub find; 2151sub find;
1979sub find { 2152sub find {
1980 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1981 2154
2155 cf::cede_to_tick;
2156
1982 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1983 2158
1984 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1985 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1986 2161
1987 $cf::MAP{$path} || do { 2162 $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 2163 my $map = new_from_path cf::map $path
1992 or return; 2164 or return;
1993 2165
1994 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1995 2167
1997 or return; 2169 or return;
1998 2170
1999 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2000 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2001 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2002 undef $guard1; 2175 undef $guard1;
2003 undef $guard2;
2004 $map->reset; 2176 $map->reset;
2005 return find $path; 2177 return find $path;
2006 } 2178 }
2007 2179
2008 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2009 } 2181 }
2010} 2182}
2011 2183
2012sub pre_load { } 2184sub pre_load { }
2013sub post_load { } 2185#sub post_load { } # XS
2014 2186
2015sub load { 2187sub load {
2016 my ($self) = @_; 2188 my ($self) = @_;
2017 2189
2018 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2021 2193
2022 { 2194 {
2023 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2024 2196
2025 return unless $self->valid; 2197 return unless $self->valid;
2026 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2027
2028 $self->in_memory (cf::MAP_LOADING);
2029 2199
2030 $self->alloc; 2200 $self->alloc;
2031 2201
2032 $self->pre_load; 2202 $self->pre_load;
2033 cf::cede_to_tick; 2203 cf::cede_to_tick;
2034 2204
2205 if (exists $self->{load_path}) {
2035 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2036 $f->skip_block; 2207 $f->skip_block;
2037 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2038 or return; 2209 or return;
2039 2210
2040 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2041 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2042 2213
2043 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2044 utf8::encode $uniq; 2215 utf8::encode $uniq;
2045 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2046 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2047 $self->clear_unique_items; 2218 $self->clear_unique_items;
2048 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2049 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2050 } 2222 }
2051 } 2223 }
2052 }
2053 2224
2054 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2055 2232
2056 cf::cede_to_tick; 2233 cf::cede_to_tick;
2057 # now do the right thing for maps 2234 # now do the right thing for maps
2058 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2059 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2063 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2064 $self->decay_objects; 2241 $self->decay_objects;
2065 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2066 $self->update_buttons; 2243 $self->update_buttons;
2067 cf::cede_to_tick; 2244 cf::cede_to_tick;
2068 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2069 cf::cede_to_tick;
2070 $self->activate;
2071 } 2246 }
2072 2247
2073 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2075
2076 $self->in_memory (cf::MAP_IN_MEMORY);
2077 } 2250 }
2078 2251
2079 $self->post_load; 2252 $self->post_load;
2080}
2081 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2082sub customise_for { 2260sub customise_for {
2083 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2084 2262
2085 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2264 if $self->per_player;
2089# if $self->per_party; 2267# if $self->per_party;
2090 2268
2091 $self 2269 $self
2092} 2270}
2093 2271
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 { 2272sub find_sync {
2121 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2122 2274
2123 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2124} 2280}
2125 2281
2126sub do_load_sync { 2282sub do_load_sync {
2127 my ($map) = @_; 2283 my ($map) = @_;
2128 2284
2285 # it's a bug to call this from the main context
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2131 2288
2132 cf::sync_job { $map->load }; 2289 $map->load;
2133} 2290}
2134 2291
2135our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2137 2294
2138sub find_async { 2295sub find_async {
2139 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2140 2297
2141 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2142 2299
2143 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2144 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2301 return $map if !$load || $map->linkable;
2145 } 2302 }
2146 2303
2147 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2148 2305
2149 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2163 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2164 2321
2165 () 2322 ()
2166} 2323}
2167 2324
2325# common code, used by both ->save and ->swapout
2168sub save { 2326sub _save {
2169 my ($self) = @_; 2327 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2328
2173 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2174 2330
2175 return unless $self->dirty; 2331 return unless $self->dirty;
2176 2332
2185 2341
2186 cf::async { 2342 cf::async {
2187 $Coro::current->{desc} = "map player save"; 2343 $Coro::current->{desc} = "map player save";
2188 $_->contr->save for $self->players; 2344 $_->contr->save for $self->players;
2189 }; 2345 };
2346
2347 cf::get_slot 0.02;
2190 2348
2191 if ($uniq) { 2349 if ($uniq) {
2192 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2193 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2351 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2194 } else { 2352 } else {
2195 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2196 } 2354 }
2197} 2355}
2198 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2199sub swap_out { 2365sub swap_out {
2200 my ($self) = @_; 2366 my ($self) = @_;
2201 2367
2202 # save first because save cedes
2203 $self->save;
2204
2205 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2206 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2207 return if $self->players; 2372 return if $self->players;
2208 return if $self->in_memory != cf::MAP_IN_MEMORY; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2209 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2210 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2211 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2212 2424
2213 $self->deactivate; 2425 $self->deactivate;
2214 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2215 $self->clear; 2427 $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 2428
2261 $self->unlink_save; 2429 $self->unlink_save;
2262 $self->destroy; 2430 $self->destroy;
2263} 2431}
2264 2432
2272 2440
2273 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2274 2442
2275 $self->unlink_save; 2443 $self->unlink_save;
2276 2444
2277 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2278 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2279 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2280 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2281 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2282 2450
2331 2499
2332sub unique_maps() { 2500sub unique_maps() {
2333 [ 2501 [
2334 map { 2502 map {
2335 utf8::decode $_; 2503 utf8::decode $_;
2336 /\.map$/ 2504 s/\.map$//; # TODO future compatibility hack
2505 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2506 ? ()
2337 ? normalise $_ 2507 : normalise $_
2338 : ()
2339 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2340 ] 2509 ]
2341} 2510}
2342 2511
2343package cf; 2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2344 2543
2345=back 2544=back
2346 2545
2347=head3 cf::object 2546=head3 cf::object
2348 2547
2352 2551
2353=over 4 2552=over 4
2354 2553
2355=item $ob->inv_recursive 2554=item $ob->inv_recursive
2356 2555
2357Returns the inventory of the object _and_ their inventories, recursively. 2556Returns the inventory of the object I<and> their inventories, recursively,
2557but I<not> the object itself.
2358 2558
2359=cut 2559=cut
2360 2560
2361sub inv_recursive_; 2561sub inv_recursive_;
2362sub inv_recursive_ { 2562sub inv_recursive_ {
2367 inv_recursive_ inv $_[0] 2567 inv_recursive_ inv $_[0]
2368} 2568}
2369 2569
2370=item $ref = $ob->ref 2570=item $ref = $ob->ref
2371 2571
2372creates and returns a persistent reference to an objetc that can be stored as a string. 2572Creates and returns a persistent reference to an object that can be stored as a string.
2373 2573
2374=item $ob = cf::object::deref ($refstring) 2574=item $ob = cf::object::deref ($refstring)
2375 2575
2376returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2576returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2377even if the object actually exists. May block. 2577even if the object actually exists. May block.
2409can be C<undef>. Does the right thing when the player is currently in a 2609can be C<undef>. Does the right thing when the player is currently in a
2410dialogue with the given NPC character. 2610dialogue with the given NPC character.
2411 2611
2412=cut 2612=cut
2413 2613
2614our $SAY_CHANNEL = {
2615 id => "say",
2616 title => "Map",
2617 reply => "say ",
2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2619};
2620
2621our $CHAT_CHANNEL = {
2622 id => "chat",
2623 title => "Chat",
2624 reply => "chat ",
2625 tooltip => "Player chat and shouts, global to the server.",
2626};
2627
2414# rough implementation of a future "reply" method that works 2628# rough implementation of a future "reply" method that works
2415# with dialog boxes. 2629# with dialog boxes.
2416#TODO: the first argument must go, split into a $npc->reply_to ( method 2630#TODO: the first argument must go, split into a $npc->reply_to ( method
2417sub cf::object::player::reply($$$;$) { 2631sub cf::object::player::reply($$$;$) {
2418 my ($self, $npc, $msg, $flags) = @_; 2632 my ($self, $npc, $msg, $flags) = @_;
2429 my $dialog = $pl->{npc_dialog}; 2643 my $dialog = $pl->{npc_dialog};
2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2644 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2431 2645
2432 } else { 2646 } else {
2433 $msg = $npc->name . " says: $msg" if $npc; 2647 $msg = $npc->name . " says: $msg" if $npc;
2434 $self->message ($msg, $flags); 2648 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2435 } 2649 }
2436 } 2650 }
2437} 2651}
2438 2652
2439=item $object->send_msg ($channel, $msg, $color, [extra...]) 2653=item $object->send_msg ($channel, $msg, $color, [extra...])
2464 2678
2465=item $player_object->enter_link 2679=item $player_object->enter_link
2466 2680
2467Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2468 2682
2469The player should be reasonably safe there for short amounts of time. You 2683The player should be reasonably safe there for short amounts of time (e.g.
2470I<MUST> call C<leave_link> as soon as possible, though. 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2685though, as the player cannot control the character while it is on the link
2686map.
2471 2687
2472Will never block. 2688Will never block.
2473 2689
2474=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2475 2691
2495sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2496 my ($self) = @_; 2712 my ($self) = @_;
2497 2713
2498 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2499 2715
2716 ++$self->{_link_recursion};
2717
2500 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2501 2719
2502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2503 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2504 2722
2505 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2506} 2724}
2507 2725
2508sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2509 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2510 2728
2527 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2528 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2529 2747
2530 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2531 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2532 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2533 2751
2534 $map->load; 2752 $map->load;
2535 $map->load_neighbours;
2536 2753
2537 return unless $self->contr->active; 2754 return unless $self->contr->active;
2538 $self->activate_recursive;
2539 2755
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2542} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2543 2763
2764}
2765
2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2545 2767
2546Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2547her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2548that has to return the map if sucecssful, and then unfreezes the player on 2770that 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 2771the new (success) or old (failed) map position. In either case, $done will
2550be called at the end of this process. 2772be called at the end of this process.
2551 2773
2774Note that $check will be called with a potentially non-loaded map, so if
2775it needs a loaded map it has to call C<< ->load >>.
2776
2552=cut 2777=cut
2553 2778
2554our $GOTOGEN; 2779our $GOTOGEN;
2555 2780
2556sub cf::object::player::goto { 2781sub cf::object::player::goto {
2557 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2558 2789
2559 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2560 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2561 2792
2562 $self->enter_link; 2793 $self->enter_link;
2582 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2583 } 2814 }
2584 } 2815 }
2585 2816
2586 my $map = eval { 2817 my $map = eval {
2587 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2588 2819
2589 if ($map) { 2820 if ($map) {
2590 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2591 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2592 } else { 2823 } else {
2593 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2594 } 2825 }
2595 2826
2596 $map 2827 $map
2604 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2605 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2606 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2607 } 2838 }
2608 2839
2609 $done->() if $done; 2840 $done->($self) if $done;
2610 })->prio (1); 2841 })->prio (1);
2611} 2842}
2612 2843
2613=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2614 2845
2634} 2865}
2635 2866
2636sub prepare_random_map { 2867sub prepare_random_map {
2637 my ($exit) = @_; 2868 my ($exit) = @_;
2638 2869
2639 my $guard = cf::lock_acquire "exit_prepare:$exit";
2640
2641 # all this does is basically replace the /! path by 2870 # all this does is basically replace the /! path by
2642 # a new random map path (?random/...) with a seed 2871 # a new random map path (?random/...) with a seed
2643 # that depends on the exit object 2872 # that depends on the exit object
2644 2873
2645 my $rmp = parse_random_map_params $exit->msg; 2874 my $rmp = parse_random_map_params $exit->msg;
2647 if ($exit->map) { 2876 if ($exit->map) {
2648 $rmp->{region} = $exit->region->name; 2877 $rmp->{region} = $exit->region->name;
2649 $rmp->{origin_map} = $exit->map->path; 2878 $rmp->{origin_map} = $exit->map->path;
2650 $rmp->{origin_x} = $exit->x; 2879 $rmp->{origin_x} = $exit->x;
2651 $rmp->{origin_y} = $exit->y; 2880 $rmp->{origin_y} = $exit->y;
2881
2882 $exit->map->touch;
2652 } 2883 }
2653 2884
2654 $rmp->{random_seed} ||= $exit->random_seed; 2885 $rmp->{random_seed} ||= $exit->random_seed;
2655 2886
2656 my $data = cf::encode_json $rmp; 2887 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2657 my $md5 = Digest::MD5::md5_hex $data; 2888 my $md5 = Digest::MD5::md5_hex $data;
2658 my $meta = "$RANDOMDIR/$md5.meta"; 2889 my $meta = "$RANDOMDIR/$md5.meta";
2659 2890
2660 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2661 aio_write $fh, 0, (length $data), $data, 0; 2892 aio_write $fh, 0, (length $data), $data, 0;
2662 undef $fh; 2893 undef $fh;
2663 aio_rename "$meta~", $meta; 2894 aio_rename "$meta~", $meta;
2664 2895
2896 my $slaying = "?random/$md5";
2897
2898 if ($exit->valid) {
2665 $exit->slaying ("?random/$md5"); 2899 $exit->slaying ("?random/$md5");
2666 $exit->msg (undef); 2900 $exit->msg (undef);
2901 }
2667 } 2902 }
2668} 2903}
2669 2904
2670sub cf::object::player::enter_exit { 2905sub cf::object::player::enter_exit {
2671 my ($self, $exit) = @_; 2906 my ($self, $exit) = @_;
2672 2907
2673 return unless $self->type == cf::PLAYER; 2908 return unless $self->type == cf::PLAYER;
2674 2909
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; 2910 $self->enter_link;
2687 2911
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 { 2912 (async {
2693 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2913 $Coro::current->{desc} = "enter_exit";
2694 2914
2695 $self->deactivate_recursive; # just to be sure
2696 unless (eval { 2915 unless (eval {
2916 $self->deactivate_recursive; # just to be sure
2917
2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2919 my $x = $exit->stats->hp;
2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2944
2697 $self->goto ($slaying, $hp, $sp); 2945 $self->goto ($map, $x, $y);
2698 2946
2947 # if exit is damned, update players death & WoR home-position
2948 $self->contr->savebed ($map, $x, $y)
2949 if $exit->flag (cf::FLAG_DAMNED);
2950
2699 1; 2951 1
2700 }) { 2952 }) {
2701 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2957
2706 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 2959 $self->leave_link;
2708 } 2960 }
2709 })->prio (1); 2961 })->prio (1);
2710} 2962}
2711 2963
2723sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2725 2977
2726 utf8::encode $text; 2978 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2728} 3005}
2729 3006
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 3008
2732Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2736 3013
2737=cut 3014=cut
2738 3015
2739# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2741 "c/identify" => { 3024 "c/identify" => {
2742 id => "infobox", 3025 id => "infobox",
2743 title => "Identify", 3026 title => "Identify",
2744 reply => undef, 3027 reply => undef,
2745 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2747 "c/examine" => { 3030 "c/examine" => {
2748 id => "infobox", 3031 id => "infobox",
2749 title => "Examine", 3032 title => "Examine",
2750 reply => undef, 3033 reply => undef,
2751 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 3041 },
2753 "c/book" => { 3042 "c/book" => {
2754 id => "infobox", 3043 id => "infobox",
2755 title => "Book", 3044 title => "Book",
2756 reply => undef, 3045 reply => undef,
2772 id => "infobox", 3061 id => "infobox",
2773 title => "Body Parts", 3062 title => "Body Parts",
2774 reply => undef, 3063 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2776 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
3072 "c/skills" => {
3073 id => "infobox",
3074 title => "Skills",
3075 reply => undef,
3076 tooltip => "Shows your experience per skill and item power",
3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
3084 "c/resistances" => {
3085 id => "infobox",
3086 title => "Resistances",
3087 reply => undef,
3088 tooltip => "Shows your resistances",
3089 },
3090 "c/pets" => {
3091 id => "infobox",
3092 title => "Pets",
3093 reply => undef,
3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
3101 },
2777 "c/uptime" => { 3102 "c/uptime" => {
2778 id => "infobox", 3103 id => "infobox",
2779 title => "Uptime", 3104 title => "Uptime",
2780 reply => undef, 3105 reply => undef,
2781 tooltip => "How long the server has been running since last restart", 3106 tooltip => "How long the server has been running since last restart",
2784 id => "infobox", 3109 id => "infobox",
2785 title => "Map Info", 3110 title => "Map Info",
2786 reply => undef, 3111 reply => undef,
2787 tooltip => "Information related to the maps", 3112 tooltip => "Information related to the maps",
2788 }, 3113 },
3114 "c/party" => {
3115 id => "party",
3116 title => "Party",
3117 reply => "gsay ",
3118 tooltip => "Messages and chat related to your party",
3119 },
3120 "c/death" => {
3121 id => "death",
3122 title => "Death",
3123 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death",
3125 },
3126 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL,
2789); 3128);
2790 3129
2791sub cf::client::send_msg { 3130sub cf::client::send_msg {
2792 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2793 3132
2794 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2795 3135
2796 $color &= cf::NDI_CLIENT_MASK; # just in case... 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2797 3137
2798 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2799 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2800 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2801 3141
2802 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804
2805 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2806 3144
2807 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2808 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2809 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2810 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2811 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2812 if $self->can_msg;
2813 } 3150 }
2814 3151
2815 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2816 } 3153 }
2817 3154
2818 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2819 3156
2820 if ($self->can_msg) {
2821 # default colour, mask it out 3157 # default colour, mask it out
2822 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2823 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2824 3160
2825 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3161 my $pkt = "msg "
3162 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 } else { 3164 );
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 3165
2839 $color &= cf::NDI_COLOR_MASK; 3166 $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} 3167}
2853 3168
2854=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2855 3170
2856Sends an ext event to the client. 3171Sends an ext event to the client.
2859 3174
2860sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2861 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2862 3177
2863 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2864 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2865 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2866 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2868 } 3183 }
2869} 3184}
2870 3185
2871=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2872 3187
2876 3191
2877sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2878 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2879 3194
2880 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2882 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2883 #TODO: version 1, remove 3198 #TODO: version 1, remove
2884 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2886 } 3201 }
2887} 3202}
2888 3203
2889=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2890 3205
2961 3276
2962 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2963 if $reply; 3278 if $reply;
2964 3279
2965 } else { 3280 } else {
2966 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2967 } 3282 }
2968 3283
2969 cf::override; 3284 cf::override;
2970 }, 3285 },
2971); 3286);
2991 3306
2992 $coro 3307 $coro
2993} 3308}
2994 3309
2995cf::client->attach ( 3310cf::client->attach (
2996 on_destroy => sub { 3311 on_client_destroy => sub {
2997 my ($ns) = @_; 3312 my ($ns) = @_;
2998 3313
2999 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3000 }, 3315 },
3001); 3316);
3017our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3018 3333
3019$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3020 3335
3021$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3022 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3023 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3024 sort time 3339 sort time
3025)); 3340));
3026 3341
3027# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3030 3345
3031The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3032 3347
3033 cf::object 3348 cf::object
3034 contr pay_amount pay_player map x y force_find force_add destroy 3349 contr pay_amount pay_player map x y force_find force_add destroy
3035 insert remove name archname title slaying race decrease_ob_nr 3350 insert remove name archname title slaying race decrease split
3351 value
3036 3352
3037 cf::object::player 3353 cf::object::player
3038 player 3354 player
3039 3355
3040 cf::player 3356 cf::player
3045 3361
3046=cut 3362=cut
3047 3363
3048for ( 3364for (
3049 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3365 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3050 insert remove inv name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3051 decrease_ob_nr destroy)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3052 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3053 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3054 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3055) { 3371) {
3056 no strict 'refs';
3057 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3058 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3059 for @funs; 3374 for @funs;
3060} 3375}
3061 3376
3076 3391
3077 my $qcode = $code; 3392 my $qcode = $code;
3078 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3079 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3080 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3081 local $_; 3399 local $_;
3082 local @safe::cf::_safe_eval_args = values %vars;
3083 3400
3084 my $eval = 3401 my $eval =
3085 "do {\n" 3402 "do {\n"
3086 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3087 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3088 . $code 3405 . $code
3089 . "\n}" 3406 . "\n}"
3090 ; 3407 ;
3091 3408
3409 if ($CFG{safe_eval}) {
3092 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3093 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3094 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3095 3418
3096 if ($@) { 3419 if ($@) {
3097 warn "$@"; 3420 warn "$@",
3098 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3099 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3100 } 3423 }
3101 3424
3102 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3103} 3426}
3104 3427
3118=cut 3441=cut
3119 3442
3120sub register_script_function { 3443sub register_script_function {
3121 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3122 3445
3123 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3124 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3125} 3448}
3126 3449
3127=back 3450=back
3128 3451
3129=cut 3452=cut
3138 # for this (global event?) 3461 # for this (global event?)
3139 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3140 3463
3141 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3142 3465
3143 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3144 3467
3145 my $facedata; 3468 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 3469
3151 $facedata->{version} == 2 3470 $facedata->{version} == 2
3152 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3153 3472
3154 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3155 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3156 type => FT_RSRC, 3476 type => FT_RSRC,
3157 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3158 }; 3479 };
3159 cf::cede_to_tick; 3480 cf::cede_to_tick;
3160 3481
3161 { 3482 {
3162 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3164 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3165 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3166 3487
3167 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3168 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3169 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3170 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3171 3493
3172 cf::cede_to_tick; 3494 cf::cede_to_tick;
3173 } 3495 }
3174 3496
3175 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3180 3502
3181 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3182 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3183 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3184 } else { 3506 } else {
3185 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3186 } 3508 }
3187 3509
3188 cf::cede_to_tick; 3510 cf::cede_to_tick;
3189 } 3511 }
3190 } 3512 }
3199 3521
3200 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3201 } 3523 }
3202 3524
3203 { 3525 {
3204 # TODO: for gcfclient pleasure, we should give resources
3205 # that gcfclient doesn't grok a >10000 face index.
3206 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3207 3527
3208 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3209 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3210 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3211 my $data;
3212 3531
3213 if ($info->{type} & 1) { 3532 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}; 3533 cf::face::set_type $idx, $info->{type};
3228 } else { 3534 } else {
3229 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3230 } 3536 }
3231 3537
3232 cf::cede_to_tick; 3538 cf::cede_to_tick;
3233 } 3539 }
3234 } 3540 }
3235 3541
3236 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3237 3543
3238 1 3544 1
3239} 3545}
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 3546
3261register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3262 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3263 3549
3264 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3265 $ns->fx_want ($k, $v); 3551 $ns->fx_want ($k, $v);
3266 } 3552 }
3267}; 3553};
3554
3555sub load_resource_file($) {
3556 my $guard = lock_acquire "load_resource_file";
3557
3558 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100;
3560 cf::arch::commit_load;
3561
3562 $status
3563}
3268 3564
3269sub reload_regions { 3565sub reload_regions {
3270 # HACK to clear player env face cache, we need some signal framework 3566 # HACK to clear player env face cache, we need some signal framework
3271 # for this (global event?) 3567 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3568 %ext::player_env::MUSIC_FACE_CACHE = ();
3286} 3582}
3287 3583
3288sub reload_archetypes { 3584sub reload_archetypes {
3289 load_resource_file "$DATADIR/archetypes" 3585 load_resource_file "$DATADIR/archetypes"
3290 or die "unable to load archetypes\n"; 3586 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} 3587}
3297 3588
3298sub reload_treasures { 3589sub reload_treasures {
3299 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3300 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3301} 3592}
3302 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3303sub reload_resources { 3614sub reload_resources {
3304 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3305 3616
3617 reload_exp_table;
3618 reload_materials;
3619 reload_facedata;
3620 reload_sound;
3621 reload_archetypes;
3306 reload_regions; 3622 reload_regions;
3307 reload_facedata;
3308 #reload_archetypes;#d#
3309 reload_archetypes;
3310 reload_treasures; 3623 reload_treasures;
3311 3624
3312 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3313}
3314
3315sub init {
3316 reload_resources;
3317} 3626}
3318 3627
3319sub reload_config { 3628sub reload_config {
3320 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3321 or return;
3322 3630
3323 local $/; 3631 my $config = load_file "$CONFDIR/config";
3324 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3325 3634
3326 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3327 3636
3328 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $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}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3330 3639
3331 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3335 }; 3644 };
3336 warn $@ if $@; 3645 warn $@ if $@;
3337 } 3646 }
3338} 3647}
3339 3648
3649sub pidfile() {
3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3651 or die "$PIDFILE: $!";
3652 flock $fh, &Fcntl::LOCK_EX
3653 or die "$PIDFILE: flock: $!";
3654 $fh
3655}
3656
3657# make sure only one server instance is running at any one time
3658sub atomic {
3659 my $fh = pidfile;
3660
3661 my $pid = <$fh>;
3662 kill 9, $pid if $pid > 0;
3663
3664 seek $fh, 0, 0;
3665 print $fh $$;
3666}
3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
3340sub main { 3677sub main {
3678 cf::init_globals; # initialise logging
3679
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686
3341 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3342 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3343 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3344 (async { 3690 (async {
3345 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3346 EV::loop EV::LOOP_ONESHOT; 3692 EV::loop EV::LOOP_ONESHOT;
3347 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
3348 }; 3694 };
3349 3695
3696 evthread_start IO::AIO::poll_fileno;
3697
3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3707 reload_resources;
3350 reload_config; 3708 reload_config;
3351 db_init; 3709 db_init;
3710
3711 cf::init_uuid;
3712 cf::init_signals;
3713 cf::init_skills;
3714
3715 cf::init_beforeplay;
3716
3717 atomic;
3718
3352 load_extensions; 3719 load_extensions;
3353 3720
3354 $TICK_WATCHER->start; 3721 utime time, time, $RUNTIMEFILE;
3355 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3722
3356 EV::loop; 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3726
3727 cf::_post_init 0;
3728 };
3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 my $free_main; $free_main = EV::idle sub {
3734 undef $free_main;
3735 undef &main; # free gobs of memory :)
3736 };
3737
3738 goto &main_loop;
3357} 3739}
3358 3740
3359############################################################################# 3741#############################################################################
3360# initialisation and cleanup 3742# initialisation and cleanup
3361 3743
3362# install some emergency cleanup handlers 3744# install some emergency cleanup handlers
3363BEGIN { 3745BEGIN {
3364 our %SIGWATCHER = (); 3746 our %SIGWATCHER = ();
3365 for my $signal (qw(INT HUP TERM)) { 3747 for my $signal (qw(INT HUP TERM)) {
3366 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3748 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3367 cf::cleanup "SIG$signal"; 3749 cf::cleanup "SIG$signal";
3368 }; 3750 };
3369 } 3751 }
3370} 3752}
3371 3753
3372sub write_runtime { 3754sub write_runtime_sync {
3373 my $runtime = "$LOCALDIR/runtime"; 3755 my $t0 = AE::time;
3374 3756
3375 # first touch the runtime file to show we are still running: 3757 # first touch the runtime file to show we are still running:
3376 # the fsync below can take a very very long time. 3758 # the fsync below can take a very very long time.
3377 3759
3378 IO::AIO::aio_utime $runtime, undef, undef; 3760 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3379 3761
3380 my $guard = cf::lock_acquire "write_runtime"; 3762 my $guard = cf::lock_acquire "write_runtime";
3381 3763
3382 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3764 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3383 or return; 3765 or return;
3384 3766
3385 my $value = $cf::RUNTIME + 90 + 10; 3767 my $value = $cf::RUNTIME + 90 + 10;
3386 # 10 is the runtime save interval, for a monotonic clock 3768 # 10 is the runtime save interval, for a monotonic clock
3387 # 60 allows for the watchdog to kill the server. 3769 # 60 allows for the watchdog to kill the server.
3397 aio_utime $fh, undef, undef; 3779 aio_utime $fh, undef, undef;
3398 3780
3399 close $fh 3781 close $fh
3400 or return; 3782 or return;
3401 3783
3402 aio_rename "$runtime~", $runtime 3784 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3403 and return; 3785 and return;
3404 3786
3405 warn "runtime file written.\n"; 3787 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3406 3788
3407 1 3789 1
3790}
3791
3792our $uuid_lock;
3793our $uuid_skip;
3794
3795sub write_uuid_sync($) {
3796 $uuid_skip ||= $_[0];
3797
3798 return if $uuid_lock;
3799 local $uuid_lock = 1;
3800
3801 my $uuid = "$LOCALDIR/uuid";
3802
3803 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3804 or return;
3805
3806 my $value = uuid_seq uuid_cur;
3807
3808 unless ($value) {
3809 info "cowardly refusing to write zero uuid value!\n";
3810 return;
3811 }
3812
3813 my $value = uuid_str $value + $uuid_skip;
3814 $uuid_skip = 0;
3815
3816 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3817 and return;
3818
3819 # always fsync - this file is important
3820 aio_fsync $fh
3821 and return;
3822
3823 close $fh
3824 or return;
3825
3826 aio_rename "$uuid~", $uuid
3827 and return;
3828
3829 trace "uuid file written ($value).\n";
3830
3831 1
3832
3833}
3834
3835sub write_uuid($$) {
3836 my ($skip, $sync) = @_;
3837
3838 $sync ? write_uuid_sync $skip
3839 : async { write_uuid_sync $skip };
3408} 3840}
3409 3841
3410sub emergency_save() { 3842sub emergency_save() {
3411 my $freeze_guard = cf::freeze_mainloop; 3843 my $freeze_guard = cf::freeze_mainloop;
3412 3844
3413 warn "enter emergency perl save\n"; 3845 info "emergency_perl_save: enter\n";
3846
3847 # this is a trade-off: we want to be very quick here, so
3848 # save all maps without fsync, and later call a global sync
3849 # (which in turn might be very very slow)
3850 local $USE_FSYNC = 0;
3414 3851
3415 cf::sync_job { 3852 cf::sync_job {
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3416 # use a peculiar iteration method to avoid tripping on perl 3855 # use a peculiar iteration method to avoid tripping on perl
3417 # refcount bugs in for. also avoids problems with players 3856 # refcount bugs in for. also avoids problems with players
3418 # and maps saved/destroyed asynchronously. 3857 # and maps saved/destroyed asynchronously.
3419 warn "begin emergency player save\n"; 3858 info "emergency_perl_save: begin player save\n";
3420 for my $login (keys %cf::PLAYER) { 3859 for my $login (keys %cf::PLAYER) {
3421 my $pl = $cf::PLAYER{$login} or next; 3860 my $pl = $cf::PLAYER{$login} or next;
3422 $pl->valid or next; 3861 $pl->valid or next;
3423 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3862 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3424 $pl->save; 3863 $pl->save;
3425 } 3864 }
3426 warn "end emergency player save\n"; 3865 info "emergency_perl_save: end player save\n";
3427 3866
3428 warn "begin emergency map save\n"; 3867 cf::write_runtime_sync; # external watchdog should not bark
3868
3869 info "emergency_perl_save: begin map save\n";
3429 for my $path (keys %cf::MAP) { 3870 for my $path (keys %cf::MAP) {
3430 my $map = $cf::MAP{$path} or next; 3871 my $map = $cf::MAP{$path} or next;
3431 $map->valid or next; 3872 $map->valid or next;
3432 $map->save; 3873 $map->save;
3433 } 3874 }
3434 warn "end emergency map save\n"; 3875 info "emergency_perl_save: end map save\n";
3435 3876
3436 warn "begin emergency database checkpoint\n"; 3877 cf::write_runtime_sync; # external watchdog should not bark
3878
3879 info "emergency_perl_save: begin database checkpoint\n";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3880 BDB::db_env_txn_checkpoint $DB_ENV;
3438 warn "end emergency database checkpoint\n"; 3881 info "emergency_perl_save: end database checkpoint\n";
3882
3883 info "emergency_perl_save: begin write uuid\n";
3884 write_uuid_sync 1;
3885 info "emergency_perl_save: end write uuid\n";
3886
3887 cf::write_runtime_sync; # external watchdog should not bark
3888
3889 trace "emergency_perl_save: syncing database to disk";
3890 BDB::db_env_txn_checkpoint $DB_ENV;
3891
3892 info "emergency_perl_save: starting sync\n";
3893 IO::AIO::aio_sync sub {
3894 info "emergency_perl_save: finished sync\n";
3895 };
3896
3897 cf::write_runtime_sync; # external watchdog should not bark
3898
3899 trace "emergency_perl_save: flushing outstanding aio requests";
3900 while (IO::AIO::nreqs || BDB::nreqs) {
3901 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3902 }
3903
3904 cf::write_runtime_sync; # external watchdog should not bark
3439 }; 3905 };
3440 3906
3441 warn "leave emergency perl save\n"; 3907 info "emergency_perl_save: leave\n";
3442} 3908}
3443 3909
3444sub post_cleanup { 3910sub post_cleanup {
3445 my ($make_core) = @_; 3911 my ($make_core) = @_;
3446 3912
3913 IO::AIO::flush;
3914
3447 warn Carp::longmess "post_cleanup backtrace" 3915 error Carp::longmess "post_cleanup backtrace"
3448 if $make_core; 3916 if $make_core;
3917
3918 my $fh = pidfile;
3919 unlink $PIDFILE if <$fh> == $$;
3920}
3921
3922# a safer delete_package, copied from Symbol
3923sub clear_package($) {
3924 my $pkg = shift;
3925
3926 # expand to full symbol table name if needed
3927 unless ($pkg =~ /^main::.*::$/) {
3928 $pkg = "main$pkg" if $pkg =~ /^::/;
3929 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3930 $pkg .= '::' unless $pkg =~ /::$/;
3931 }
3932
3933 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3934 my $stem_symtab = *{$stem}{HASH};
3935
3936 defined $stem_symtab and exists $stem_symtab->{$leaf}
3937 or return;
3938
3939 # clear all symbols
3940 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3941 for my $name (keys %$leaf_symtab) {
3942 _gv_clear *{"$pkg$name"};
3943# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3944 }
3449} 3945}
3450 3946
3451sub do_reload_perl() { 3947sub do_reload_perl() {
3452 # can/must only be called in main 3948 # can/must only be called in main
3453 if ($Coro::current != $Coro::main) { 3949 unless (in_main) {
3454 warn "can only reload from main coroutine"; 3950 error "can only reload from main coroutine";
3455 return; 3951 return;
3456 } 3952 }
3457 3953
3458 warn "reloading..."; 3954 return if $RELOAD++;
3459 3955
3460 warn "entering sync_job"; 3956 my $t1 = AE::time;
3461 3957
3958 while ($RELOAD) {
3959 cf::get_slot 0.1, -1, "reload_perl";
3960 info "perl_reload: reloading...";
3961
3962 trace "perl_reload: entering sync_job";
3963
3462 cf::sync_job { 3964 cf::sync_job {
3463 cf::write_runtime; # external watchdog should not bark
3464 cf::emergency_save; 3965 #cf::emergency_save;
3465 cf::write_runtime; # external watchdog should not bark
3466 3966
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"; 3967 trace "perl_reload: cancelling all extension coros";
3484 $_->cancel for values %EXT_CORO; 3968 $_->cancel for values %EXT_CORO;
3485 %EXT_CORO = (); 3969 %EXT_CORO = ();
3486 3970
3487 warn "removing commands"; 3971 trace "perl_reload: removing commands";
3488 %COMMAND = (); 3972 %COMMAND = ();
3489 3973
3490 warn "removing ext/exti commands"; 3974 trace "perl_reload: removing ext/exti commands";
3491 %EXTCMD = (); 3975 %EXTCMD = ();
3492 %EXTICMD = (); 3976 %EXTICMD = ();
3493 3977
3494 warn "unloading/nuking all extensions"; 3978 trace "perl_reload: unloading/nuking all extensions";
3495 for my $pkg (@EXTS) { 3979 for my $pkg (@EXTS) {
3496 warn "... unloading $pkg"; 3980 trace "... unloading $pkg";
3497 3981
3498 if (my $cb = $pkg->can ("unload")) { 3982 if (my $cb = $pkg->can ("unload")) {
3499 eval { 3983 eval {
3500 $cb->($pkg); 3984 $cb->($pkg);
3501 1 3985 1
3502 } or warn "$pkg unloaded, but with errors: $@"; 3986 } or error "$pkg unloaded, but with errors: $@";
3987 }
3988
3989 trace "... clearing $pkg";
3990 clear_package $pkg;
3503 } 3991 }
3504 3992
3505 warn "... nuking $pkg";
3506 Symbol::delete_package $pkg;
3507 }
3508
3509 warn "unloading all perl modules loaded from $LIBDIR"; 3993 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3510 while (my ($k, $v) = each %INC) { 3994 while (my ($k, $v) = each %INC) {
3511 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3995 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3512 3996
3513 warn "... unloading $k"; 3997 trace "... unloading $k";
3514 delete $INC{$k}; 3998 delete $INC{$k};
3515 3999
3516 $k =~ s/\.pm$//; 4000 $k =~ s/\.pm$//;
3517 $k =~ s/\//::/g; 4001 $k =~ s/\//::/g;
3518 4002
3519 if (my $cb = $k->can ("unload_module")) { 4003 if (my $cb = $k->can ("unload_module")) {
3520 $cb->(); 4004 $cb->();
4005 }
4006
4007 clear_package $k;
3521 } 4008 }
3522 4009
3523 Symbol::delete_package $k;
3524 }
3525
3526 warn "getting rid of safe::, as good as possible"; 4010 trace "perl_reload: getting rid of safe::, as good as possible";
3527 Symbol::delete_package "safe::$_" 4011 clear_package "safe::$_"
3528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4012 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3529 4013
3530 warn "unloading cf.pm \"a bit\""; 4014 trace "perl_reload: unloading cf.pm \"a bit\"";
3531 delete $INC{"cf.pm"}; 4015 delete $INC{"cf.pm"};
3532 delete $INC{"cf/pod.pm"}; 4016 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3533 4017
3534 # don't, removes xs symbols, too, 4018 # don't, removes xs symbols, too,
3535 # and global variables created in xs 4019 # and global variables created in xs
3536 #Symbol::delete_package __PACKAGE__; 4020 #clear_package __PACKAGE__;
3537 4021
3538 warn "unload completed, starting to reload now"; 4022 info "perl_reload: unload completed, starting to reload now";
3539 4023
3540 warn "reloading cf.pm"; 4024 trace "perl_reload: reloading cf.pm";
3541 require cf; 4025 require cf;
3542 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4026 cf::_connect_to_perl_1;
3543 4027
3544 warn "loading config and database again"; 4028 trace "perl_reload: loading config and database again";
3545 cf::reload_config; 4029 cf::reload_config;
3546 4030
3547 warn "loading extensions"; 4031 trace "perl_reload: loading extensions";
3548 cf::load_extensions; 4032 cf::load_extensions;
3549 4033
4034 if ($REATTACH_ON_RELOAD) {
3550 warn "reattaching attachments to objects/players"; 4035 trace "perl_reload: reattaching attachments to objects/players";
3551 _global_reattach; # objects, sockets 4036 _global_reattach; # objects, sockets
3552 warn "reattaching attachments to maps"; 4037 trace "perl_reload: reattaching attachments to maps";
3553 reattach $_ for values %MAP; 4038 reattach $_ for values %MAP;
3554 warn "reattaching attachments to players"; 4039 trace "perl_reload: reattaching attachments to players";
3555 reattach $_ for values %PLAYER; 4040 reattach $_ for values %PLAYER;
4041 }
3556 4042
3557 warn "leaving sync_job"; 4043 cf::_post_init 1;
3558 4044
4045 trace "perl_reload: leaving sync_job";
4046
3559 1 4047 1
3560 } or do { 4048 } or do {
3561 warn $@; 4049 error $@;
3562 cf::cleanup "error while reloading, exiting."; 4050 cf::cleanup "perl_reload: error, exiting.";
4051 };
4052
4053 --$RELOAD;
3563 }; 4054 }
3564 4055
3565 warn "reloaded"; 4056 $t1 = AE::time - $t1;
4057 info "perl_reload: completed in ${t1}s\n";
3566}; 4058};
3567 4059
3568our $RELOAD_WATCHER; # used only during reload 4060our $RELOAD_WATCHER; # used only during reload
3569 4061
3570sub reload_perl() { 4062sub reload_perl() {
3571 # doing reload synchronously and two reloads happen back-to-back, 4063 # doing reload synchronously and two reloads happen back-to-back,
3572 # coro crashes during coro_state_free->destroy here. 4064 # coro crashes during coro_state_free->destroy here.
3573 4065
4066 $RELOAD_WATCHER ||= cf::async {
4067 Coro::AIO::aio_wait cache_extensions;
4068
3574 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4069 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3575 do_reload_perl; 4070 do_reload_perl;
3576 undef $RELOAD_WATCHER; 4071 undef $RELOAD_WATCHER;
4072 };
3577 }; 4073 };
3578} 4074}
3579 4075
3580register_command "reload" => sub { 4076register_command "reload" => sub {
3581 my ($who, $arg) = @_; 4077 my ($who, $arg) = @_;
3587 reload_perl; 4083 reload_perl;
3588 }; 4084 };
3589 } 4085 }
3590}; 4086};
3591 4087
3592unshift @INC, $LIBDIR; 4088#############################################################################
3593 4089
3594my $bug_warning = 0; 4090my $bug_warning = 0;
3595 4091
3596our @WAIT_FOR_TICK;
3597our @WAIT_FOR_TICK_BEGIN;
3598
3599sub wait_for_tick { 4092sub wait_for_tick() {
3600 return unless $TICK_WATCHER->is_active; 4093 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3601 return if $Coro::current == $Coro::main;
3602 4094
3603 my $signal = new Coro::Signal; 4095 $WAIT_FOR_TICK->wait;
3604 push @WAIT_FOR_TICK, $signal;
3605 $signal->wait;
3606} 4096}
3607 4097
3608sub wait_for_tick_begin { 4098sub wait_for_tick_begin() {
3609 return unless $TICK_WATCHER->is_active; 4099 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3610 return if $Coro::current == $Coro::main;
3611 4100
3612 my $signal = new Coro::Signal; 4101 my $signal = new Coro::Signal;
3613 push @WAIT_FOR_TICK_BEGIN, $signal; 4102 push @WAIT_FOR_TICK_BEGIN, $signal;
3614 $signal->wait; 4103 $signal->wait;
3615} 4104}
3616 4105
3617$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4106sub tick {
3618 if ($Coro::current != $Coro::main) { 4107 if ($Coro::current != $Coro::main) {
3619 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4108 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3620 unless ++$bug_warning > 10; 4109 unless ++$bug_warning > 10;
3621 return; 4110 return;
3622 } 4111 }
3623 4112
3624 $NOW = $tick_start = EV::now; 4113 cf::one_tick; # one server iteration
3625 4114
3626 cf::server_tick; # one server iteration 4115 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3627
3628 $RUNTIME += $TICK;
3629 $NEXT_TICK = $_[0]->at;
3630 4116
3631 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4117 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3632 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4118 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3633 Coro::async_pool { 4119 Coro::async_pool {
3634 $Coro::current->{desc} = "runtime saver"; 4120 $Coro::current->{desc} = "runtime saver";
3635 write_runtime 4121 write_runtime_sync
3636 or warn "ERROR: unable to write runtime file: $!"; 4122 or error "ERROR: unable to write runtime file: $!";
3637 }; 4123 };
3638 } 4124 }
3639 4125
3640 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4126 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3641 $sig->send; 4127 $sig->send;
3642 } 4128 }
3643 while (my $sig = shift @WAIT_FOR_TICK) { 4129 $WAIT_FOR_TICK->broadcast;
3644 $sig->send;
3645 }
3646 4130
3647 $LOAD = ($NOW - $tick_start) / $TICK; 4131 $LOAD = ($NOW - $TICK_START) / $TICK;
3648 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4132 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3649 4133
3650 _post_tick; 4134 if (0) {
3651}; 4135 if ($NEXT_TICK) {
3652$TICK_WATCHER->priority (EV::MAXPRI); 4136 my $jitter = $TICK_START - $NEXT_TICK;
4137 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4138 debug "jitter $JITTER\n";#d#
4139 }
4140 }
4141}
3653 4142
3654{ 4143{
3655 # configure BDB 4144 # configure BDB
3656 4145
3657 BDB::min_parallel 8; 4146 BDB::min_parallel 16;
3658 BDB::max_poll_reqs $TICK * 0.1; 4147 BDB::max_poll_reqs $TICK * 0.1;
3659 $Coro::BDB::WATCHER->priority (1); 4148 $AnyEvent::BDB::WATCHER->priority (1);
3660 4149
3661 unless ($DB_ENV) { 4150 unless ($DB_ENV) {
3662 $DB_ENV = BDB::db_env_create; 4151 $DB_ENV = BDB::db_env_create;
3663 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4152 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3664 | BDB::LOG_AUTOREMOVE, 1); 4153 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4154 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3665 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4155 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3666 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4156 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3667 4157
3668 cf::sync_job { 4158 cf::sync_job {
3669 eval { 4159 eval {
3695{ 4185{
3696 # configure IO::AIO 4186 # configure IO::AIO
3697 4187
3698 IO::AIO::min_parallel 8; 4188 IO::AIO::min_parallel 8;
3699 IO::AIO::max_poll_time $TICK * 0.1; 4189 IO::AIO::max_poll_time $TICK * 0.1;
3700 $Coro::AIO::WATCHER->priority (1); 4190 undef $AnyEvent::AIO::WATCHER;
3701} 4191}
3702 4192
3703my $_log_backtrace; 4193our $_log_backtrace;
4194our $_log_backtrace_last;
3704 4195
3705sub _log_backtrace { 4196sub _log_backtrace {
3706 my ($msg, @addr) = @_; 4197 my ($msg, @addr) = @_;
3707 4198
3708 $msg =~ s/\n//; 4199 $msg =~ s/\n$//;
3709 4200
4201 if ($_log_backtrace_last eq $msg) {
4202 LOG llevInfo, "[ABT] $msg\n";
4203 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3710 # limit the # of concurrent backtraces 4204 # limit the # of concurrent backtraces
3711 if ($_log_backtrace < 2) { 4205 } elsif ($_log_backtrace < 2) {
4206 $_log_backtrace_last = $msg;
3712 ++$_log_backtrace; 4207 ++$_log_backtrace;
4208 my $perl_bt = Carp::longmess $msg;
3713 async { 4209 async {
3714 $Coro::current->{desc} = "abt $msg"; 4210 $Coro::current->{desc} = "abt $msg";
3715 4211
3716 my @bt = fork_call { 4212 my @bt = fork_call {
3717 @addr = map { sprintf "%x", $_ } @addr; 4213 @addr = map { sprintf "%x", $_ } @addr;
3728 } 4224 }
3729 4225
3730 @funcs 4226 @funcs
3731 }; 4227 };
3732 4228
3733 LOG llevInfo, "[ABT] $msg\n"; 4229 LOG llevInfo, "[ABT] $perl_bt\n";
4230 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3734 LOG llevInfo, "[ABT] $_\n" for @bt; 4231 LOG llevInfo, "[ABT] $_\n" for @bt;
3735 --$_log_backtrace; 4232 --$_log_backtrace;
3736 }; 4233 };
3737 } else { 4234 } else {
3738 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $msg\n";
3739 LOG llevInfo, "[ABT] [suppressed]\n"; 4236 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3740 } 4237 }
3741} 4238}
3742 4239
3743# load additional modules 4240# load additional modules
3744use cf::pod; 4241require "cf/$_.pm" for @EXTRA_MODULES;
4242cf::_connect_to_perl_2;
3745 4243
3746END { cf::emergency_save } 4244END { cf::emergency_save }
3747 4245
37481 42461
3749 4247

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines