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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 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 1.86; 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.32 (); 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 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
552} 747}
553 748
554=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
555 750
556Returns a single value from the environment database. 751Returns a single value from the environment database.
566within each server. 761within each server.
567 762
568=cut 763=cut
569 764
570sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
571 my ($name) = @_; 769 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
573 771
574 eval { 772 eval {
575 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
585} 783}
586 784
587our $DB; 785our $DB;
588 786
589sub db_init { 787sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
592 };
593} 789}
594 790
595sub db_get($$) { 791sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
597 793
598 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
599 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
600 798
601 $! ? () 799 $! ? ()
602 : $data 800 : $data
603 }
604} 801}
605 802
606sub db_put($$$) { 803sub db_put($$$) {
607 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
636 833
637 my @data; 834 my @data;
638 my $md5; 835 my $md5;
639 836
640 for (0 .. $#$src) { 837 for (0 .. $#$src) {
641 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
642 or Carp::croak "$src->[$_]: $!";
643 } 839 }
644 840
645 # if processing is expensive, check 841 # if processing is expensive, check
646 # checksum first 842 # checksum first
647 if (1) { 843 if (1) {
664 860
665 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
666 my $data = $process->(\@data); 862 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
668 864
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 866
671 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
674 870
684 880
685=cut 881=cut
686 882
687sub datalog($@) { 883sub datalog($@) {
688 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 886}
691 887
692=back 888=back
693 889
694=cut 890=cut
695 891
696############################################################################# 892#############################################################################
697 893
698=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
699 895
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
703 899
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
756 952
757Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
759 955
760Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 958
763These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
764 960
765=over 4 961=over 4
889 1085
890 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 1088
893 } elsif (ref $type) { 1089 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
895 1091
896 } else { 1092 } else {
897 shift @arg; 1093 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
899 } 1095 }
900 } 1096 }
901} 1097}
902 1098
903sub _object_attach { 1099sub _object_attach {
913 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
914 } 1110 }
915 1111
916 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
917 } else { 1113 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1115 }
920 1116
921 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
922} 1118}
923 1119
982 1178
983 for (@$callbacks) { 1179 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
985 1181
986 if ($@) { 1182 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1184 override;
990 } 1185 }
991 1186
992 return 1 if $override; 1187 return 1 if $override;
993 } 1188 }
1056 1251
1057sub reattach { 1252sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1254 my ($obj) = @_;
1060 1255
1256 # no longer needed after getting rid of delete_package?
1061 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
1062 1258
1063 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1064 1260
1065 @$registry = (); 1261 @$registry = ();
1066 1262
1071 for (@$attach) { 1267 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1074 } 1270 }
1075 } else { 1271 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1273 }
1078 } 1274 }
1079} 1275}
1080 1276
1081cf::attachable->attach ( 1277cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1109 1305
1110 sync_job { 1306 sync_job {
1111 if (length $$rdata) { 1307 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1115 1312
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1320 aio_close $fh;
1121 1321
1122 if (@$objs) { 1322 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1331 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1333 }
1131 } else { 1334 } else {
1132 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1133 } 1336 }
1134 1337
1135 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1342 } else {
1137 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1138 } 1344 }
1139 } else { 1345 } else {
1140 aio_unlink $filename; 1346 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1142 } 1348 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1373 $av = $st->{objs};
1168 } 1374 }
1169 1375
1170 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1173 1380
1174 ($data, $av) 1381 ($data, $av)
1175} 1382}
1176 1383
1177=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1233 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1234 1441
1235 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1236} 1443}
1237 1444
1445use File::Glob ();
1446
1238cf::player->attach ( 1447cf::player->attach (
1239 on_command => sub { 1448 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1241 1450
1242 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1243 or return; 1452 or return;
1244 1453
1267 1476
1268 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1269 if $reply; 1478 if $reply;
1270 1479
1271 } else { 1480 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1482 }
1274 1483
1275 cf::override; 1484 cf::override;
1276 }, 1485 },
1277); 1486);
1278 1487
1488# "readahead" all extensions
1489sub cache_extensions {
1490 my $grp = IO::AIO::aio_group;
1491
1492 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1493 for (grep /\.ext$/, @{$_[0]}) {
1494 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1495 }
1496 };
1497
1498 $grp
1499}
1500
1279sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1280 cf::sync_job { 1504 cf::sync_job {
1281 my %todo; 1505 my %todo;
1282 1506
1283 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1508 next unless -r $path;
1302 1526
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1529
1306 $ext{source} = 1530 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1309 . $source 1533 . $source
1310 . "\n};\n1"; 1534 . "\n};\n1";
1311 1535
1312 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1313 } 1537 }
1314 1538
1539 my $pass = 0;
1315 my %done; 1540 my %done;
1316 while (%todo) { 1541 while (%todo) {
1317 my $progress; 1542 my $progress;
1318 1543
1544 ++$pass;
1545
1546 ext:
1319 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1549 next ext
1322 unless exists $done{$_}; 1550 unless exists $done{$_};
1323 } 1551 }
1324 1552
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1554
1327 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1559
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1561 if exists $v->{meta}{mandatory};
1335 1562
1336 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1337 } 1572 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1573 }
1343 1574
1344 skip: 1575 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1347 } 1585 }
1348 }; 1586 };
1349} 1587}
1350 1588
1351############################################################################# 1589#############################################################################
1352 1590
1353=back 1591=back
1354 1592
1355=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1356 1594
1357Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1358 1596
1359=cut 1597=cut
1360 1598
1361package cf::player; 1599package cf::player;
1362 1600
1405 1643
1406sub exists($) { 1644sub exists($) {
1407 my ($login) = @_; 1645 my ($login) = @_;
1408 1646
1409 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1411} 1649}
1412 1650
1413sub find($) { 1651sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1653 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1666 or return;
1429 1667
1430 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1431 or return; 1669 or return;
1670
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1435 } 1674 }
1436 } 1675 }
1437} 1676}
1438 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1439sub save($) { 1691sub save($) {
1440 my ($pl) = @_; 1692 my ($pl) = @_;
1441 1693
1442 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1443 1695
1446 1698
1447 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1448 1700
1449 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1703
1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1451 1708
1452 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1710 cf::cede_to_tick;
1454} 1711}
1455 1712
1487 my ($pl) = @_; 1744 my ($pl) = @_;
1488 1745
1489 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1490 1747
1491 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1750
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1495 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1497 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1498 1759
1499 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1539 1800
1540 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1541 my $path = path $login; 1802 my $path = path $login;
1542 1803
1543 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1810 }
1549 1811
1553 1815
1554 \@logins 1816 \@logins
1555} 1817}
1556 1818
1557=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1558 1822
1559Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1560player. May block. 1824player. May block.
1561 1825
1562=cut 1826=cut
1580 } 1844 }
1581 1845
1582 \@paths 1846 \@paths
1583} 1847}
1584 1848
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1850
1587Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1852
1678=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1679 1854
1680Sends an ext reply to the player. 1855Sends an ext reply to the player.
1681 1856
1713 1888
1714=cut 1889=cut
1715 1890
1716sub find_by_path($) { 1891sub find_by_path($) {
1717 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1718 1895
1719 my ($match, $specificity); 1896 my ($match, $specificity);
1720 1897
1721 for my $region (list) { 1898 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1750 1927
1751sub generate_random_map { 1928sub generate_random_map {
1752 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1753 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1754 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1763 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1764 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1765 (cf::region::find $rmp->{region}), $rmp->{custom}
1766 )
1767} 1934}
1768 1935
1769=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1770 1937
1771Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1776 1943
1777sub register { 1944sub register {
1778 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 1946 my $pkg = caller;
1780 1947
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 1949
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 1951}
1786 1952
1787# also paths starting with '/' 1953# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 1955
1790sub thawer_merge { 1956sub thawer_merge {
1791 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1792 1958
1793 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1798} 1964}
1799 1965
1800sub normalise { 1966sub normalise {
1801 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1802 1968
1803 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1804 1970
1805 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1806 1972
1807 # map plan: 1973 # map plan:
1808 # 1974 #
1823 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1824 $path = "$base/$path"; 1990 $path = "$base/$path";
1825 } 1991 }
1826 1992
1827 for ($path) { 1993 for ($path) {
1828 redo if s{//}{/};
1829 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1830 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1831 } 1996 }
1832 1997
1833 $path 1998 $path
1847 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1848 return $self; 2013 return $self;
1849 } 2014 }
1850 } 2015 }
1851 2016
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 2018 ()
1854} 2019}
1855 2020
2021# may re-bless or do other evil things
1856sub init { 2022sub init {
1857 my ($self) = @_; 2023 my ($self) = @_;
1858 2024
1859 $self 2025 $self
1860} 2026}
1879 2045
1880# the temporary/swap location 2046# the temporary/swap location
1881sub save_path { 2047sub save_path {
1882 my ($self) = @_; 2048 my ($self) = @_;
1883 2049
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1886} 2052}
1887 2053
1888# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1889sub uniq_path { 2055sub uniq_path {
1890 my ($self) = @_; 2056 my ($self) = @_;
1891 2057
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 2060}
1904 2061
1905sub decay_objects { 2062sub decay_objects {
1906 my ($self) = @_; 2063 my ($self) = @_;
1907 2064
1934 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1935 2092
1936 1 2093 1
1937} 2094}
1938 2095
2096# used to laod the header of an original map
1939sub load_header_orig { 2097sub load_header_orig {
1940 my ($self) = @_; 2098 my ($self) = @_;
1941 2099
1942 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1943} 2101}
1944 2102
2103# used to laod the header of an instantiated map
1945sub load_header_temp { 2104sub load_header_temp {
1946 my ($self) = @_; 2105 my ($self) = @_;
1947 2106
1948 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1949} 2108}
1950 2109
2110# called after loading the header from an instantiated map
1951sub prepare_temp { 2111sub prepare_temp {
1952 my ($self) = @_; 2112 my ($self) = @_;
1953 2113
1954 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1956 # safety 2116 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2119}
1960 2120
2121# called after loading the header from an original map
1961sub prepare_orig { 2122sub prepare_orig {
1962 my ($self) = @_; 2123 my ($self) = @_;
1963 2124
1964 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1989 2150
1990sub find; 2151sub find;
1991sub find { 2152sub find {
1992 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1993 2154
2155 cf::cede_to_tick;
2156
1994 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1995 2158
1996 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2161
1999 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
2004 or return; 2164 or return;
2005 2165
2006 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
2007 2167
2009 or return; 2169 or return;
2010 2170
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
2014 undef $guard1; 2175 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2176 $map->reset;
2017 return find $path; 2177 return find $path;
2018 } 2178 }
2019 2179
2020 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
2021 } 2181 }
2022} 2182}
2023 2183
2024sub pre_load { } 2184sub pre_load { }
2025sub post_load { } 2185#sub post_load { } # XS
2026 2186
2027sub load { 2187sub load {
2028 my ($self) = @_; 2188 my ($self) = @_;
2029 2189
2030 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2033 2193
2034 { 2194 {
2035 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2036 2196
2037 return unless $self->valid; 2197 return unless $self->valid;
2038 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2039
2040 $self->in_memory (cf::MAP_LOADING);
2041 2199
2042 $self->alloc; 2200 $self->alloc;
2043 2201
2044 $self->pre_load; 2202 $self->pre_load;
2045 cf::cede_to_tick; 2203 cf::cede_to_tick;
2046 2204
2205 if (exists $self->{load_path}) {
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2207 $f->skip_block;
2049 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2050 or return; 2209 or return;
2051 2210
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2053 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2054 2213
2055 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2215 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2059 $self->clear_unique_items; 2218 $self->clear_unique_items;
2060 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2062 } 2222 }
2063 } 2223 }
2064 }
2065 2224
2066 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2067 2232
2068 cf::cede_to_tick; 2233 cf::cede_to_tick;
2069 # now do the right thing for maps 2234 # now do the right thing for maps
2070 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2071 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2074 2239
2075 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2241 $self->decay_objects;
2077 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2078 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
2079 cf::cede_to_tick; 2245 cf::cede_to_tick;
2080 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2081 cf::cede_to_tick;
2082 $self->activate;
2083 } 2247 }
2084 2248
2085 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2087
2088 $self->in_memory (cf::MAP_IN_MEMORY);
2089 } 2251 }
2090 2252
2091 $self->post_load; 2253 $self->post_load;
2092}
2093 2254
2255 1
2256}
2257
2258# customize the map for a given player, i.e.
2259# return the _real_ map. used by e.g. per-player
2260# maps to change the path to ~playername/mappath
2094sub customise_for { 2261sub customise_for {
2095 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2096 2263
2097 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2265 if $self->per_player;
2114 or next; 2281 or next;
2115 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2116 or next; 2283 or next;
2117 $neigh->load; 2284 $neigh->load;
2118 2285
2286 # now find the diagonal neighbours
2119 push @neigh, 2287 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 } 2290 }
2123 2291
2130} 2298}
2131 2299
2132sub find_sync { 2300sub find_sync {
2133 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2134 2302
2135 cf::sync_job { find $path, $origin } 2303 # it's a bug to call this from the main context
2304 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2305 if $Coro::current == $Coro::main;
2306
2307 find $path, $origin
2136} 2308}
2137 2309
2138sub do_load_sync { 2310sub do_load_sync {
2139 my ($map) = @_; 2311 my ($map) = @_;
2140 2312
2313 # it's a bug to call this from the main context
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2143 2316
2144 cf::sync_job { $map->load }; 2317 $map->load;
2145} 2318}
2146 2319
2147our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2149 2322
2150sub find_async { 2323sub find_async {
2151 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2152 2325
2153 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2154 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2155 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2331 return $map if !$load || $map->linkable;
2157 } 2332 }
2158 2333
2159 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2160 2335
2161 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2176 2351
2177 () 2352 ()
2178} 2353}
2179 2354
2355# common code, used by both ->save and ->swapout
2180sub save { 2356sub _save {
2181 my ($self) = @_; 2357 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2358
2185 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2186 2360
2187 return unless $self->dirty; 2361 return unless $self->dirty;
2188 2362
2197 2371
2198 cf::async { 2372 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2373 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2374 $_->contr->save for $self->players;
2201 }; 2375 };
2376
2377 cf::get_slot 0.02;
2202 2378
2203 if ($uniq) { 2379 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2381 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2382 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2208 } 2384 }
2209} 2385}
2210 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2211sub swap_out { 2395sub swap_out {
2212 my ($self) = @_; 2396 my ($self) = @_;
2213 2397
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2219 return if $self->players; 2402 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2221 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2222 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2223 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2224 2454
2225 $self->deactivate; 2455 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2457 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2458
2273 $self->unlink_save; 2459 $self->unlink_save;
2274 $self->destroy; 2460 $self->destroy;
2275} 2461}
2276 2462
2284 2470
2285 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2286 2472
2287 $self->unlink_save; 2473 $self->unlink_save;
2288 2474
2289 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2480
2343 2529
2344sub unique_maps() { 2530sub unique_maps() {
2345 [ 2531 [
2346 map { 2532 map {
2347 utf8::decode $_; 2533 utf8::decode $_;
2348 /\.map$/ 2534 s/\.map$//; # TODO future compatibility hack
2535 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2536 ? ()
2349 ? normalise $_ 2537 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2539 ]
2353} 2540}
2354 2541
2355package cf; 2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2356 2573
2357=back 2574=back
2358 2575
2359=head3 cf::object 2576=head3 cf::object
2360 2577
2364 2581
2365=over 4 2582=over 4
2366 2583
2367=item $ob->inv_recursive 2584=item $ob->inv_recursive
2368 2585
2369Returns the inventory of the object _and_ their inventories, recursively. 2586Returns the inventory of the object I<and> their inventories, recursively,
2587but I<not> the object itself.
2370 2588
2371=cut 2589=cut
2372 2590
2373sub inv_recursive_; 2591sub inv_recursive_;
2374sub inv_recursive_ { 2592sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2597 inv_recursive_ inv $_[0]
2380} 2598}
2381 2599
2382=item $ref = $ob->ref 2600=item $ref = $ob->ref
2383 2601
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2602Creates and returns a persistent reference to an object that can be stored as a string.
2385 2603
2386=item $ob = cf::object::deref ($refstring) 2604=item $ob = cf::object::deref ($refstring)
2387 2605
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2606returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2607even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2640dialogue with the given NPC character.
2423 2641
2424=cut 2642=cut
2425 2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2657
2426# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2659# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2662 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2675
2444 } else { 2676 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2679 }
2448 } 2680 }
2449} 2681}
2450 2682
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2708
2477=item $player_object->enter_link 2709=item $player_object->enter_link
2478 2710
2479Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2480 2712
2481The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2483 2717
2484Will never block. 2718Will never block.
2485 2719
2486=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2487 2721
2507sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2508 my ($self) = @_; 2742 my ($self) = @_;
2509 2743
2510 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2511 2745
2746 ++$self->{_link_recursion};
2747
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2749
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2516 2752
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2754}
2519 2755
2520sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2522 2758
2539 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2541 2777
2542 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2545 2781
2546 $map->load; 2782 $map->load;
2547 $map->load_neighbours; 2783 $map->load_neighbours;
2548 2784
2549 return unless $self->contr->active; 2785 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2786
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2554} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2555 2794
2795}
2796
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2798
2558Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2803be called at the end of this process.
2563 2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2807
2564=cut 2808=cut
2565 2809
2566our $GOTOGEN; 2810our $GOTOGEN;
2567 2811
2568sub cf::object::player::goto { 2812sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2570 2820
2571 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2823
2574 $self->enter_link; 2824 $self->enter_link;
2594 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2595 } 2845 }
2596 } 2846 }
2597 2847
2598 my $map = eval { 2848 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2600 2850
2601 if ($map) { 2851 if ($map) {
2602 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2854 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2856 }
2607 2857
2608 $map 2858 $map
2616 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2619 } 2869 }
2620 2870
2621 $done->() if $done; 2871 $done->($self) if $done;
2622 })->prio (1); 2872 })->prio (1);
2623} 2873}
2624 2874
2625=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2626 2876
2646} 2896}
2647 2897
2648sub prepare_random_map { 2898sub prepare_random_map {
2649 my ($exit) = @_; 2899 my ($exit) = @_;
2650 2900
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2903 # that depends on the exit object
2656 2904
2657 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2907 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2664 } 2914 }
2665 2915
2666 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2667 2917
2668 my $data = cf::encode_json $rmp; 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2671 2921
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2924 undef $fh;
2675 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2676 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2679 } 2933 }
2680} 2934}
2681 2935
2682sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2684 2938
2685 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2686 2940
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2941 $self->enter_link;
2699 2942
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2943 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2944 $Coro::current->{desc} = "enter_exit";
2706 2945
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2709 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2710 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2711 1; 2982 1
2712 }) { 2983 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2988
2718 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2990 $self->leave_link;
2720 } 2991 }
2721 })->prio (1); 2992 })->prio (1);
2722} 2993}
2723 2994
2735sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2737 3008
2738 utf8::encode $text; 3009 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2740} 3036}
2741 3037
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3039
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3044
2749=cut 3045=cut
2750 3046
2751# non-persistent channels (usually the info channel) 3047# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2753 "c/identify" => { 3055 "c/identify" => {
2754 id => "infobox", 3056 id => "infobox",
2755 title => "Identify", 3057 title => "Identify",
2756 reply => undef, 3058 reply => undef,
2757 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2759 "c/examine" => { 3061 "c/examine" => {
2760 id => "infobox", 3062 id => "infobox",
2761 title => "Examine", 3063 title => "Examine",
2762 reply => undef, 3064 reply => undef,
2763 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3072 },
2765 "c/book" => { 3073 "c/book" => {
2766 id => "infobox", 3074 id => "infobox",
2767 title => "Book", 3075 title => "Book",
2768 reply => undef, 3076 reply => undef,
2784 id => "infobox", 3092 id => "infobox",
2785 title => "Body Parts", 3093 title => "Body Parts",
2786 reply => undef, 3094 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3095 tooltip => "Shows which body parts you posess and are available",
2788 }, 3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
2789 "c/uptime" => { 3133 "c/uptime" => {
2790 id => "infobox", 3134 id => "infobox",
2791 title => "Uptime", 3135 title => "Uptime",
2792 reply => undef, 3136 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3137 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3140 id => "infobox",
2797 title => "Map Info", 3141 title => "Map Info",
2798 reply => undef, 3142 reply => undef,
2799 tooltip => "Information related to the maps", 3143 tooltip => "Information related to the maps",
2800 }, 3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2801); 3159);
2802 3160
2803sub cf::client::send_msg { 3161sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3163
2806 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2807 3166
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3168
2810 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2813 3172
2814 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2818 3175
2819 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3181 }
2826 3182
2827 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2828 } 3184 }
2829 3185
2830 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2831 3187
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3188 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2836 3191
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3195 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3196
2851 $color &= cf::NDI_COLOR_MASK; 3197 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3198}
2865 3199
2866=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2867 3201
2868Sends an ext event to the client. 3202Sends an ext event to the client.
2871 3205
2872sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2874 3208
2875 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3214 }
2881} 3215}
2882 3216
2883=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2884 3218
2888 3222
2889sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2891 3225
2892 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove 3229 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 } 3232 }
2899} 3233}
2900 3234
2901=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2902 3236
2973 3307
2974 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2975 if $reply; 3309 if $reply;
2976 3310
2977 } else { 3311 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3313 }
2980 3314
2981 cf::override; 3315 cf::override;
2982 }, 3316 },
2983); 3317);
3003 3337
3004 $coro 3338 $coro
3005} 3339}
3006 3340
3007cf::client->attach ( 3341cf::client->attach (
3008 on_destroy => sub { 3342 on_client_destroy => sub {
3009 my ($ns) = @_; 3343 my ($ns) = @_;
3010 3344
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3346 },
3013); 3347);
3029our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
3030 3364
3031$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
3032 3366
3033$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
3036 sort time 3370 sort time
3037)); 3371));
3038 3372
3039# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
3042 3376
3043The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
3044 3378
3045 cf::object 3379 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3381 insert remove name archname title slaying race decrease split
3382 value
3048 3383
3049 cf::object::player 3384 cf::object::player
3050 player 3385 player
3051 3386
3052 cf::player 3387 cf::player
3057 3392
3058=cut 3393=cut
3059 3394
3060for ( 3395for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3398 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
3067) { 3402) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3405 for @funs;
3072} 3406}
3073 3407
3088 3422
3089 my $qcode = $code; 3423 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
3092 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
3093 local $_; 3430 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3431
3096 my $eval = 3432 my $eval =
3097 "do {\n" 3433 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3436 . $code
3101 . "\n}" 3437 . "\n}"
3102 ; 3438 ;
3103 3439
3440 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3107 3449
3108 if ($@) { 3450 if ($@) {
3109 warn "$@"; 3451 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3112 } 3454 }
3113 3455
3114 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3115} 3457}
3116 3458
3130=cut 3472=cut
3131 3473
3132sub register_script_function { 3474sub register_script_function {
3133 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3134 3476
3135 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3137} 3479}
3138 3480
3139=back 3481=back
3140 3482
3141=cut 3483=cut
3150 # for this (global event?) 3492 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3152 3494
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3496
3155 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3156 3498
3157 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3158 0 < aio_load $path, $facedata
3159 or die "$path: $!";
3160
3161 $facedata = Coro::Storable::thaw $facedata;
3162 3500
3163 $facedata->{version} == 2 3501 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3165 3503
3166 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3167 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC, 3507 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3170 }; 3510 };
3171 cf::cede_to_tick; 3511 cf::cede_to_tick;
3172 3512
3173 { 3513 {
3174 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3176 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3518
3179 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3183 3524
3184 cf::cede_to_tick; 3525 cf::cede_to_tick;
3185 } 3526 }
3186 3527
3187 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3192 3533
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3537 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3539 }
3199 3540
3200 cf::cede_to_tick; 3541 cf::cede_to_tick;
3201 } 3542 }
3202 } 3543 }
3211 3552
3212 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3213 } 3554 }
3214 3555
3215 { 3556 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3219 3558
3220 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3560 if (defined $info->{type}) {
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3562
3225 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3564 cf::face::set_type $idx, $info->{type};
3240 } else { 3565 } else {
3241 $RESOURCE{$name} = $info; 3566 $RESOURCE{$name} = $info; # unused
3242 } 3567 }
3243 3568
3244 cf::cede_to_tick; 3569 cf::cede_to_tick;
3245 } 3570 }
3246 } 3571 }
3247 3572
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3574
3250 1 3575 1
3251} 3576}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3577
3273register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3579 my ($ns, $want) = @_;
3275 3580
3276 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3582 $ns->fx_want ($k, $v);
3278 } 3583 }
3279}; 3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3280 3595
3281sub reload_regions { 3596sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3597 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3598 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3298} 3613}
3299 3614
3300sub reload_archetypes { 3615sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3616 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3617 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3618}
3309 3619
3310sub reload_treasures { 3620sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3313} 3623}
3314 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3315sub reload_resources { 3645sub reload_resources {
3316 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3317 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
3318 reload_regions; 3653 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3654 reload_treasures;
3323 3655
3324 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3657}
3330 3658
3331sub reload_config { 3659sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3333 or return;
3334 3661
3335 local $/; 3662 my $config = load_file "$CONFDIR/config";
3336 *CFG = YAML::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3337 3665
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3667
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3670
3343 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3347 }; 3675 };
3348 warn $@ if $@; 3676 warn $@ if $@;
3349 } 3677 }
3350} 3678}
3351 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3352sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3353 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3721 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3723 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3360 }; 3725 };
3361 3726
3727 evthread_start IO::AIO::poll_fileno;
3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3362 reload_config; 3739 reload_config;
3363 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3364 load_extensions; 3750 load_extensions;
3365 3751
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3752 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3753
3368 EV::loop; 3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3369} 3770}
3370 3771
3371############################################################################# 3772#############################################################################
3372# initialisation and cleanup 3773# initialisation and cleanup
3373 3774
3374# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3375BEGIN { 3776BEGIN {
3376 our %SIGWATCHER = (); 3777 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3380 }; 3781 };
3381 } 3782 }
3382} 3783}
3383 3784
3384sub write_runtime { 3785sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3386 3787
3387 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3389 3790
3390 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3792
3392 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3393 3794
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 3796 or return;
3396 3797
3397 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3410 3811
3411 close $fh 3812 close $fh
3412 or return; 3813 or return;
3413 3814
3414 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3816 and return;
3416 3817
3417 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 3819
3419 1 3820 1
3821}
3822
3823our $uuid_lock;
3824our $uuid_skip;
3825
3826sub write_uuid_sync($) {
3827 $uuid_skip ||= $_[0];
3828
3829 return if $uuid_lock;
3830 local $uuid_lock = 1;
3831
3832 my $uuid = "$LOCALDIR/uuid";
3833
3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3835 or return;
3836
3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3845 $uuid_skip = 0;
3846
3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3848 and return;
3849
3850 # always fsync - this file is important
3851 aio_fsync $fh
3852 and return;
3853
3854 close $fh
3855 or return;
3856
3857 aio_rename "$uuid~", $uuid
3858 and return;
3859
3860 trace "uuid file written ($value).\n";
3861
3862 1
3863
3864}
3865
3866sub write_uuid($$) {
3867 my ($skip, $sync) = @_;
3868
3869 $sync ? write_uuid_sync $skip
3870 : async { write_uuid_sync $skip };
3420} 3871}
3421 3872
3422sub emergency_save() { 3873sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3424 3875
3425 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3426 3882
3427 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3428 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3892 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3894 $pl->save;
3437 } 3895 }
3438 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3439 3897
3440 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3903 $map->valid or next;
3444 $map->save; 3904 $map->save;
3445 } 3905 }
3446 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3447 3907
3448 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3913
3914 info "emergency_perl_save: begin write uuid\n";
3915 write_uuid_sync 1;
3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 3936 };
3452 3937
3453 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3454} 3939}
3455 3940
3456sub post_cleanup { 3941sub post_cleanup {
3457 my ($make_core) = @_; 3942 my ($make_core) = @_;
3458 3943
3944 IO::AIO::flush;
3945
3459 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3461} 3976}
3462 3977
3463sub do_reload_perl() { 3978sub do_reload_perl() {
3464 # can/must only be called in main 3979 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3466 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3467 return; 3982 return;
3468 } 3983 }
3469 3984
3470 warn "reloading..."; 3985 return if $RELOAD++;
3471 3986
3472 warn "entering sync_job"; 3987 my $t1 = AE::time;
3473 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3474 cf::sync_job { 3995 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 3996 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 3997
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 4000 %EXT_CORO = ();
3498 4001
3499 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3500 %COMMAND = (); 4003 %COMMAND = ();
3501 4004
3502 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3503 %EXTCMD = (); 4006 %EXTCMD = ();
3504 %EXTICMD = (); 4007 %EXTICMD = ();
3505 4008
3506 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3509 4012
3510 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3511 eval { 4014 eval {
3512 $cb->($pkg); 4015 $cb->($pkg);
3513 1 4016 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3515 } 4022 }
3516 4023
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 4027
3525 warn "... unloading $k"; 4028 trace "... unloading $k";
3526 delete $INC{$k}; 4029 delete $INC{$k};
3527 4030
3528 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3530 4033
3531 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3533 } 4039 }
3534 4040
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 4044
3542 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 4048
3546 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3547 # and global variables created in xs 4050 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3549 4052
3550 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3551 4054
3552 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3553 require cf; 4056 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3555 4058
3556 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3557 cf::reload_config; 4060 cf::reload_config;
3558 4061
3559 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3560 cf::load_extensions; 4063 cf::load_extensions;
3561 4064
4065 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3565 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3568 4073
3569 warn "leaving sync_job"; 4074 cf::_post_init 1;
3570 4075
4076 trace "perl_reload: leaving sync_job";
4077
3571 1 4078 1
3572 } or do { 4079 } or do {
3573 warn $@; 4080 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
4082 };
4083
4084 --$RELOAD;
3575 }; 4085 }
3576 4086
3577 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3578}; 4089};
3579 4090
3580our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3581 4092
3582sub reload_perl() { 4093sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3585 4096
4097 $RELOAD_WATCHER ||= cf::async {
4098 Coro::AIO::aio_wait cache_extensions;
4099
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4101 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
4103 };
3589 }; 4104 };
3590} 4105}
3591 4106
3592register_command "reload" => sub { 4107register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3599 reload_perl; 4114 reload_perl;
3600 }; 4115 };
3601 } 4116 }
3602}; 4117};
3603 4118
3604unshift @INC, $LIBDIR; 4119#############################################################################
3605 4120
3606my $bug_warning = 0; 4121my $bug_warning = 0;
3607 4122
3608our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN;
3610
3611sub wait_for_tick { 4123sub wait_for_tick() {
3612 return if tick_inhibit; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3613 return if $Coro::current == $Coro::main;
3614 4125
3615 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3616 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait;
3618} 4127}
3619 4128
3620sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3621 return if tick_inhibit; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3622 return if $Coro::current == $Coro::main;
3623 4131
3624 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4134 $signal->wait;
3627} 4135}
3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3632 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3633 return; 4141 return;
3634 } 4142 }
3635 4143
3636 cf::server_tick; # one server iteration 4144 cf::one_tick; # one server iteration
4145
4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3637 4147
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4150 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4152 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3644 }; 4154 };
3645 } 4155 }
3646 4156
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4158 $sig->send;
3649 } 4159 }
3650 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3651 $sig->send;
3652 }
3653 4161
3654 $LOAD = ($NOW - $TICK_START) / $TICK; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3656 4164
3657 if (0) { 4165 if (0) {
3658 if ($NEXT_TICK) { 4166 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4167 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4169 debug "jitter $JITTER\n";#d#
3662 } 4170 }
3663 } 4171 }
3664} 4172}
3665 4173
3666{ 4174{
3667 # configure BDB 4175 # configure BDB
3668 4176
3669 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4179 $AnyEvent::BDB::WATCHER->priority (1);
3672 4180
3673 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4188
3680 cf::sync_job { 4189 cf::sync_job {
3681 eval { 4190 eval {
3707{ 4216{
3708 # configure IO::AIO 4217 # configure IO::AIO
3709 4218
3710 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4221 undef $AnyEvent::AIO::WATCHER;
3713} 4222}
3714 4223
3715my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3716 4226
3717sub _log_backtrace { 4227sub _log_backtrace {
3718 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3719 4229
3720 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3721 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3722 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3724 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3725 async { 4240 async {
3726 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3727 4242
3728 my @bt = fork_call { 4243 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4255 }
3741 4256
3742 @funcs 4257 @funcs
3743 }; 4258 };
3744 4259
3745 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4263 --$_log_backtrace;
3748 }; 4264 };
3749 } else { 4265 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3752 } 4268 }
3753} 4269}
3754 4270
3755# load additional modules 4271# load additional modules
3756use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3757 4274
3758END { cf::emergency_save } 4275END { cf::emergency_save }
3759 4276
37601 42771
3761 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines