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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines