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.397 by root, Mon Nov 19 15:47:14 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines