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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines