ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines