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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines