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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines