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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines