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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines