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.410 by root, Tue Jan 15 12:02:24 2008 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 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
71our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
72 120
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 123our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
85 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
90our $NOW; 137our $NOW;
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 145
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
101our $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 :)
102 155
103binmode STDOUT; 156binmode STDOUT;
104binmode STDERR; 157binmode STDERR;
105 158
106# read virtual server time, if available 159# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
111} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
112 167
113mkdir $_ 168mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 170
116our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
117 172
118sub 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::"} };
119 189
120############################################################################# 190#############################################################################
121 191
122=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
123 193
165from wherever your confdir points to. 235from wherever your confdir points to.
166 236
167=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
168 238
169These 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
170returns 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
171per 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.
172 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
173=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
174 249
175This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 252that call.
178 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
179=back 260=back
180 261
181=cut 262=cut
182 263
183BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 271 my $msg = join "", @_;
186 272
187 $msg .= "\n" 273 $msg .= "\n"
188 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
189 275
190 $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;
191 277
192 LOG llevError, $msg; 278 LOG llevWarn, $msg;
193 }; 279};
194}
195 280
196$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
198 283
199 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 288 return;#d#
202 }#d# 289 }#d#
203 290
204 # kill coroutine otherwise 291 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 292 Coro::terminate
207}; 293};
208
209$SIG{__DIE__} = sub { }; #d#?
210 294
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 305for my $pkg (qw(
222 cf::global cf::attachable 306 cf::global cf::attachable
223 cf::object cf::object::player 307 cf::object cf::object::player
224 cf::client cf::player 308 cf::client cf::player
225 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
226 cf::map cf::party cf::region 311 cf::party cf::region
227)) { 312)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 314}
231 315
232$EV::DIED = sub { 316$EV::DIED = sub {
233 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
234}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
235 324
236############################################################################# 325#############################################################################
237 326
238=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
239 328
260 $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;
261 $d 350 $d
262 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
263} 352}
264 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
265=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
266 369
267Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
268 371
269=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
275our $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
276 379
277sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
279 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}
444
280=item cf::lock_wait $string 445=item cf::lock_wait $string
281 446
282Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
283 448
284=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
285 450
286Wait 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
287a 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,
288for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
289returned. 454returned.
290 455
291Locks 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
292deadlocked coro. 457deadlocked coro.
298 463
299Return 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.
300 465
301=cut 466=cut
302 467
303our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 469
306sub lock_wait($) { 470sub lock_wait($) {
307 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 472}
320 473
321sub lock_acquire($) { 474sub lock_acquire($) {
322 my ($key) = @_; 475 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 476}
336 477
337sub lock_active($) { 478sub lock_active($) {
338 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 480}
342 481
343sub freeze_mainloop { 482sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
345 484
346 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 486}
352 487
353=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
354 489
355Like 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
356get spread over timer. 491get spread over time.
357 492
358=cut 493=cut
359 494
360sub periodic($$) { 495sub periodic($$) {
361 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
365 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
366} 501}
367 502
368=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
369 504
370Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
371This 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
372of 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.
373 512
374The 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
375used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
376 515
377Useful for short background jobs. 516Useful for short background jobs.
378 517
379=cut 518=cut
380 519
381our @SLOT_QUEUE; 520our @SLOT_QUEUE;
382our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
383 523
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
387 527
388 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
389 530
390 while () { 531 while () {
391 next_job: 532 next_job:
533
392 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 535
394 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 540 $job->[2]->send;
398 Coro::cede; 541 Coro::cede;
399 goto next_job; 542 goto next_job;
400 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 545 }
402 } 546 }
403 547
404 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
405 # 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
406 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait; 551 $signal->wait;
408 } else { 552 } else {
553 $busy = 0;
409 Coro::schedule; 554 Coro::schedule;
410 } 555 }
411 } 556 }
412}; 557};
413 558
414sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
415 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
416 563
417 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
418 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
419 567
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
448=cut 596=cut
449 597
450sub sync_job(&) { 598sub sync_job(&) {
451 my ($job) = @_; 599 my ($job) = @_;
452 600
453 if ($Coro::current == $Coro::main) { 601 if (in_main) {
454 my $time = EV::time; 602 my $time = AE::time;
455 603
456 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
458 606
459 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
460 608
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
464 610
465 my $busy = 1; 611 my $busy = 1;
466 my @res; 612 my @res;
467 613
468 (async { 614 (async {
469 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 616 @res = eval { $job->() };
471 warn $@ if $@; 617 error $@ if $@;
472 undef $busy; 618 undef $busy;
473 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
474 620
475 while ($busy) { 621 while ($busy) {
476 if (Coro::nready) { 622 if (Coro::nready) {
478 } else { 624 } else {
479 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
480 } 626 }
481 } 627 }
482 628
483 $time = EV::time - $time; 629 my $time = AE::time - $time;
484 630
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
489 632
490 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
491 } else { 634 } else {
492 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
493 636
513 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
514 657
515 $coro 658 $coro
516} 659}
517 660
518=item fork_call { }, $args 661=item fork_call { }, @args
519 662
520Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling. 666never block itself or use any form of event handling.
524 667
525=cut 668=cut
526 669
670sub post_fork {
671 reset_signals;
672}
673
527sub fork_call(&@) { 674sub fork_call(&@) {
528 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
529 676
530 # 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,
531 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
533 680
534 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
535 reset_signals; 682 cf::post_fork;
536 &$cb 683 &$cb
537 }, @args; 684 } @args;
538 685
539 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
540} 725}
541 726
542=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
543 728
544Returns a single value from the environment database. 729Returns a single value from the environment database.
554within each server. 739within each server.
555 740
556=cut 741=cut
557 742
558sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
559 my ($name) = @_; 747 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
561 749
562 eval { 750 eval {
563 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
573} 761}
574 762
575our $DB; 763our $DB;
576 764
577sub db_init { 765sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
580 };
581} 767}
582 768
583sub db_get($$) { 769sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
585 771
586 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
587 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
588 776
589 $! ? () 777 $! ? ()
590 : $data 778 : $data
591 }
592} 779}
593 780
594sub db_put($$$) { 781sub db_put($$$) {
595 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
624 811
625 my @data; 812 my @data;
626 my $md5; 813 my $md5;
627 814
628 for (0 .. $#$src) { 815 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
630 or Carp::croak "$src->[$_]: $!";
631 } 817 }
632 818
633 # if processing is expensive, check 819 # if processing is expensive, check
634 # checksum first 820 # checksum first
635 if (1) { 821 if (1) {
652 838
653 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data); 840 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
656 842
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 844
659 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
662 848
672 858
673=cut 859=cut
674 860
675sub datalog($@) { 861sub datalog($@) {
676 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 864}
679 865
680=back 866=back
681 867
682=cut 868=cut
683 869
684############################################################################# 870#############################################################################
685 871
686=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
687 873
688Many 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
689attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
691 877
692In 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>
693C<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
743=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
744 930
745Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
747 933
748Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
749that 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.
750 936
751These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
752 938
753=over 4 939=over 4
877 1063
878 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 1066
881 } elsif (ref $type) { 1067 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
883 1069
884 } else { 1070 } else {
885 shift @arg; 1071 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
887 } 1073 }
888 } 1074 }
889} 1075}
890 1076
891sub _object_attach { 1077sub _object_attach {
901 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
902 } 1088 }
903 1089
904 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
905 } else { 1091 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1093 }
908 1094
909 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
910} 1096}
911 1097
970 1156
971 for (@$callbacks) { 1157 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
973 1159
974 if ($@) { 1160 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1162 override;
978 } 1163 }
979 1164
980 return 1 if $override; 1165 return 1 if $override;
981 } 1166 }
1044 1229
1045sub reattach { 1230sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1232 my ($obj) = @_;
1048 1233
1234 # no longer needed after getting rid of delete_package?
1049 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
1050 1236
1051 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1052 1238
1053 @$registry = (); 1239 @$registry = ();
1054 1240
1059 for (@$attach) { 1245 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1062 } 1248 }
1063 } else { 1249 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1251 }
1066 } 1252 }
1067} 1253}
1068 1254
1069cf::attachable->attach ( 1255cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1097 1283
1098 sync_job { 1284 sync_job {
1099 if (length $$rdata) { 1285 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1103 1290
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 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 }
1108 close $fh; 1298 aio_close $fh;
1109 1299
1110 if (@$objs) { 1300 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1115 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 }
1116 close $fh; 1309 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1311 }
1119 } else { 1312 } else {
1120 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1121 } 1314 }
1122 1315
1123 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1320 } else {
1125 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1126 } 1322 }
1127 } else { 1323 } else {
1128 aio_unlink $filename; 1324 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1130 } 1326 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1351 $av = $st->{objs};
1156 } 1352 }
1157 1353
1158 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1161 1358
1162 ($data, $av) 1359 ($data, $av)
1163} 1360}
1164 1361
1165=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1221 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1222 1419
1223 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1224} 1421}
1225 1422
1423use File::Glob ();
1424
1226cf::player->attach ( 1425cf::player->attach (
1227 on_command => sub { 1426 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1229 1428
1230 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1231 or return; 1430 or return;
1232 1431
1255 1454
1256 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1257 if $reply; 1456 if $reply;
1258 1457
1259 } else { 1458 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1460 }
1262 1461
1263 cf::override; 1462 cf::override;
1264 }, 1463 },
1265); 1464);
1266 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
1267sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1268 cf::sync_job { 1482 cf::sync_job {
1269 my %todo; 1483 my %todo;
1270 1484
1271 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1486 next unless -r $path;
1290 1504
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1507
1294 $ext{source} = 1508 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1297 . $source 1511 . $source
1298 . "\n};\n1"; 1512 . "\n};\n1";
1299 1513
1300 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1301 } 1515 }
1302 1516
1517 my $pass = 0;
1303 my %done; 1518 my %done;
1304 while (%todo) { 1519 while (%todo) {
1305 my $progress; 1520 my $progress;
1306 1521
1522 ++$pass;
1523
1524 ext:
1307 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1527 next ext
1310 unless exists $done{$_}; 1528 unless exists $done{$_};
1311 } 1529 }
1312 1530
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1532
1315 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1319 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1320 warn $msg; 1540
1321 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1322 exit 1; 1542 delete $todo{$k};
1323 } 1543 } else {
1324 1544 $done{$k} = delete $todo{$k};
1325 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1326 } 1550 }
1327
1328 $done{$k} = delete $todo{$k};
1329 push @EXTS, $v->{pkg};
1330 $progress = 1;
1331 } 1551 }
1332 1552
1333 skip: 1553 unless ($progress) {
1334 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1335 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 }
1336 } 1563 }
1337 }; 1564 };
1338} 1565}
1339 1566
1340############################################################################# 1567#############################################################################
1341 1568
1342=back 1569=back
1343 1570
1344=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1345 1572
1346Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1347 1574
1348=cut 1575=cut
1349 1576
1350package cf::player; 1577package cf::player;
1351 1578
1394 1621
1395sub exists($) { 1622sub exists($) {
1396 my ($login) = @_; 1623 my ($login) = @_;
1397 1624
1398 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1400} 1627}
1401 1628
1402sub find($) { 1629sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1631 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1644 or return;
1418 1645
1419 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1420 or return; 1647 or return;
1648
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1424 } 1652 }
1425 } 1653 }
1426} 1654}
1427 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
1428sub save($) { 1669sub save($) {
1429 my ($pl) = @_; 1670 my ($pl) = @_;
1430 1671
1431 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1432 1673
1435 1676
1436 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1437 1678
1438 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1439 $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];
1440 1686
1441 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1688 cf::cede_to_tick;
1443} 1689}
1444 1690
1476 my ($pl) = @_; 1722 my ($pl) = @_;
1477 1723
1478 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1479 1725
1480 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1481 $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
1482 1728
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1484 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1486 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1487 1737
1488 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1490 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1528 1778
1529 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1530 my $path = path $login; 1780 my $path = path $login;
1531 1781
1532 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1788 }
1538 1789
1542 1793
1543 \@logins 1794 \@logins
1544} 1795}
1545 1796
1546=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1547 1800
1548Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1549player. May block. 1802player. May block.
1550 1803
1551=cut 1804=cut
1569 } 1822 }
1570 1823
1571 \@paths 1824 \@paths
1572} 1825}
1573 1826
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1828
1576Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666 1830
1667=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1668 1832
1669Sends an ext reply to the player. 1833Sends an ext reply to the player.
1670 1834
1702 1866
1703=cut 1867=cut
1704 1868
1705sub find_by_path($) { 1869sub find_by_path($) {
1706 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1707 1873
1708 my ($match, $specificity); 1874 my ($match, $specificity);
1709 1875
1710 for my $region (list) { 1876 for my $region (list) {
1711 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1737our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1739 1905
1740sub generate_random_map { 1906sub generate_random_map {
1741 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1742 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1743 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1747 $rmp->{exit_on_final_map},
1748 $rmp->{xsize}, $rmp->{ysize},
1749 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1750 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1752 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1753 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1754 (cf::region::find $rmp->{region}), $rmp->{custom}
1755 )
1756} 1912}
1757 1913
1758=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1759 1915
1760Register 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
1765 1921
1766sub register { 1922sub register {
1767 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1768 my $pkg = caller; 1924 my $pkg = caller;
1769 1925
1770 no strict;
1771 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1772 1927
1773 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1774} 1929}
1775 1930
1776# also paths starting with '/' 1931# also paths starting with '/'
1777$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1778 1933
1779sub thawer_merge { 1934sub thawer_merge {
1780 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1781 1936
1782 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1787} 1942}
1788 1943
1789sub normalise { 1944sub normalise {
1790 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1791 1946
1792 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1793 1948
1794 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1795 1950
1796 # map plan: 1951 # map plan:
1797 # 1952 #
1799 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1800 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1801 # ?random/... random maps 1956 # ?random/... random maps
1802 # /... normal maps 1957 # /... normal maps
1803 # ~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
1804 1960
1805 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1806 1962
1807 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1808 # something that looks reasonable 1964 # something that looks reasonable
1809 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1810 $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'";
1811 1967
1812 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1813 $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;
1814 } 1984 }
1815 1985
1816 for ($path) { 1986 for ($path) {
1817 redo if s{//}{/};
1818 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1819 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1820 } 1989 }
1821 1990
1822 $path 1991 $path
1836 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1837 return $self; 2006 return $self;
1838 } 2007 }
1839 } 2008 }
1840 2009
1841 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1842 () 2011 ()
1843} 2012}
1844 2013
2014# may re-bless or do other evil things
1845sub init { 2015sub init {
1846 my ($self) = @_; 2016 my ($self) = @_;
1847 2017
1848 $self 2018 $self
1849} 2019}
1868 2038
1869# the temporary/swap location 2039# the temporary/swap location
1870sub save_path { 2040sub save_path {
1871 my ($self) = @_; 2041 my ($self) = @_;
1872 2042
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1875} 2045}
1876 2046
1877# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1878sub uniq_path { 2048sub uniq_path {
1879 my ($self) = @_; 2049 my ($self) = @_;
1880 2050
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1883}
1884
1885# and all this just because we cannot iterate over
1886# all maps in C++...
1887sub change_all_map_light {
1888 my ($change) = @_;
1889
1890 $_->change_map_light ($change)
1891 for grep $_->outdoor, values %cf::MAP;
1892} 2053}
1893 2054
1894sub decay_objects { 2055sub decay_objects {
1895 my ($self) = @_; 2056 my ($self) = @_;
1896 2057
1923 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1924 2085
1925 1 2086 1
1926} 2087}
1927 2088
2089# used to laod the header of an original map
1928sub load_header_orig { 2090sub load_header_orig {
1929 my ($self) = @_; 2091 my ($self) = @_;
1930 2092
1931 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1932} 2094}
1933 2095
2096# used to laod the header of an instantiated map
1934sub load_header_temp { 2097sub load_header_temp {
1935 my ($self) = @_; 2098 my ($self) = @_;
1936 2099
1937 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1938} 2101}
1939 2102
2103# called after loading the header from an instantiated map
1940sub prepare_temp { 2104sub prepare_temp {
1941 my ($self) = @_; 2105 my ($self) = @_;
1942 2106
1943 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1945 # safety 2109 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2112}
1949 2113
2114# called after loading the header from an original map
1950sub prepare_orig { 2115sub prepare_orig {
1951 my ($self) = @_; 2116 my ($self) = @_;
1952 2117
1953 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
1978 2143
1979sub find; 2144sub find;
1980sub find { 2145sub find {
1981 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1982 2147
2148 cf::cede_to_tick;
2149
1983 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1984 2151
1985 cf::lock_wait "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2154
1988 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1992 my $map = new_from_path cf::map $path 2156 my $map = new_from_path cf::map $path
1993 or return; 2157 or return;
1994 2158
1995 $map->{last_save} = $cf::RUNTIME; 2159 $map->{last_save} = $cf::RUNTIME;
1996 2160
1998 or return; 2162 or return;
1999 2163
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2164 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2165 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2166 #$cf::WAIT_FOR_TICK->wait;
2167 undef $guard2;
2003 undef $guard1; 2168 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2169 $map->reset;
2006 return find $path; 2170 return find $path;
2007 } 2171 }
2008 2172
2009 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
2010 } 2174 }
2011} 2175}
2012 2176
2013sub pre_load { } 2177sub pre_load { }
2014sub post_load { } 2178#sub post_load { } # XS
2015 2179
2016sub load { 2180sub load {
2017 my ($self) = @_; 2181 my ($self) = @_;
2018 2182
2019 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
2031 $self->alloc; 2195 $self->alloc;
2032 2196
2033 $self->pre_load; 2197 $self->pre_load;
2034 cf::cede_to_tick; 2198 cf::cede_to_tick;
2035 2199
2200 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2202 $f->skip_block;
2038 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
2039 or return; 2204 or return;
2040 2205
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2206 $self->post_load_original
2042 if delete $self->{load_original}; 2207 if delete $self->{load_original};
2043 2208
2044 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2210 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2213 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
2051 } 2217 }
2052 } 2218 }
2053 }
2054 2219
2055 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2056 2225
2057 cf::cede_to_tick; 2226 cf::cede_to_tick;
2058 # now do the right thing for maps 2227 # now do the right thing for maps
2059 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2233 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2234 $self->decay_objects;
2066 $self->fix_auto_apply; 2235 $self->fix_auto_apply;
2067 $self->update_buttons; 2236 $self->update_buttons;
2068 cf::cede_to_tick; 2237 cf::cede_to_tick;
2069 $self->set_darkness_map;
2070 cf::cede_to_tick;
2071 $self->activate; 2238 $self->activate;
2072 } 2239 }
2073 2240
2074 $self->{last_save} = $cf::RUNTIME; 2241 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2242 $self->last_access ($cf::RUNTIME);
2076 2243
2077 $self->in_memory (cf::MAP_IN_MEMORY); 2244 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2245 }
2079 2246
2080 $self->post_load; 2247 $self->post_load;
2081}
2082 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
2083sub customise_for { 2255sub customise_for {
2084 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
2085 2257
2086 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2259 if $self->per_player;
2103 or next; 2275 or next;
2104 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
2105 or next; 2277 or next;
2106 $neigh->load; 2278 $neigh->load;
2107 2279
2280 # now find the diagonal neighbours
2108 push @neigh, 2281 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 } 2284 }
2112 2285
2119} 2292}
2120 2293
2121sub find_sync { 2294sub find_sync {
2122 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
2123 2296
2124 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
2125} 2301}
2126 2302
2127sub do_load_sync { 2303sub do_load_sync {
2128 my ($map) = @_; 2304 my ($map) = @_;
2129 2305
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2307 if $Coro::current == $Coro::main;
2132 2308
2133 cf::sync_job { $map->load }; 2309 $map->load;
2134} 2310}
2135 2311
2136our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2138 2314
2139sub find_async { 2315sub find_async {
2140 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2141 2317
2142 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2143 2319
2144 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2146 } 2322 }
2147 2323
2148 $MAP_PREFETCH{$path} |= $load; 2324 $MAP_PREFETCH{$path} |= $load;
2149 2325
2150 $MAP_PREFETCHER ||= cf::async { 2326 $MAP_PREFETCHER ||= cf::async {
2164 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
2165 2341
2166 () 2342 ()
2167} 2343}
2168 2344
2345# common code, used by both ->save and ->swapout
2169sub save { 2346sub _save {
2170 my ($self) = @_; 2347 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2348
2174 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
2175 2350
2176 return unless $self->dirty; 2351 return unless $self->dirty;
2177 2352
2186 2361
2187 cf::async { 2362 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2363 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2364 $_->contr->save for $self->players;
2190 }; 2365 };
2366
2367 cf::get_slot 0.02;
2191 2368
2192 if ($uniq) { 2369 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2370 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2371 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2372 } else {
2196 $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);
2197 } 2374 }
2198} 2375}
2199 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
2200sub swap_out { 2385sub swap_out {
2201 my ($self) = @_; 2386 my ($self) = @_;
2202 2387
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2389
2390 return if $self->in_memory != cf::MAP_ACTIVE;
2391 return if $self->{deny_save};
2208 return if $self->players; 2392 return if $self->players;
2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2210 return if $self->{deny_save};
2211 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2212 $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};
2213 2444
2214 $self->deactivate; 2445 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2446 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2447 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path;
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2448
2262 $self->unlink_save; 2449 $self->unlink_save;
2263 $self->destroy; 2450 $self->destroy;
2264} 2451}
2265 2452
2273 2460
2274 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
2275 2462
2276 $self->unlink_save; 2463 $self->unlink_save;
2277 2464
2278 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2470
2332 2519
2333sub unique_maps() { 2520sub unique_maps() {
2334 [ 2521 [
2335 map { 2522 map {
2336 utf8::decode $_; 2523 utf8::decode $_;
2337 /\.map$/ 2524 s/\.map$//; # TODO future compatibility hack
2525 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2526 ? ()
2338 ? normalise $_ 2527 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2529 ]
2342} 2530}
2343 2531
2344package 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}
2345 2563
2346=back 2564=back
2347 2565
2348=head3 cf::object 2566=head3 cf::object
2349 2567
2353 2571
2354=over 4 2572=over 4
2355 2573
2356=item $ob->inv_recursive 2574=item $ob->inv_recursive
2357 2575
2358Returns 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.
2359 2578
2360=cut 2579=cut
2361 2580
2362sub inv_recursive_; 2581sub inv_recursive_;
2363sub inv_recursive_ { 2582sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2587 inv_recursive_ inv $_[0]
2369} 2588}
2370 2589
2371=item $ref = $ob->ref 2590=item $ref = $ob->ref
2372 2591
2373creates 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.
2374 2593
2375=item $ob = cf::object::deref ($refstring) 2594=item $ob = cf::object::deref ($refstring)
2376 2595
2377returns 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,
2378even if the object actually exists. May block. 2597even if the object actually exists. May block.
2410can 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
2411dialogue with the given NPC character. 2630dialogue with the given NPC character.
2412 2631
2413=cut 2632=cut
2414 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
2415# rough implementation of a future "reply" method that works 2648# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2649# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2651sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2652 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2663 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2665
2433 } else { 2666 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2667 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2668 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2669 }
2437 } 2670 }
2438} 2671}
2439 2672
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2673=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2698
2466=item $player_object->enter_link 2699=item $player_object->enter_link
2467 2700
2468Freezes 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}>).
2469 2702
2470The 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.
2471I<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.
2472 2707
2473Will never block. 2708Will never block.
2474 2709
2475=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
2476 2711
2496sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2497 my ($self) = @_; 2732 my ($self) = @_;
2498 2733
2499 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2500 2735
2736 ++$self->{_link_recursion};
2737
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2739
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2505 2742
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2744}
2508 2745
2509sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2511 2748
2528 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2530 2767
2531 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2534 2771
2535 $map->load; 2772 $map->load;
2536 $map->load_neighbours; 2773 $map->load_neighbours;
2537 2774
2538 return unless $self->contr->active; 2775 return unless $self->contr->active;
2539 $self->activate_recursive;
2540 2776
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2543} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2544 2784
2785}
2786
2545=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)]])
2546 2788
2547Moves 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
2548her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2549that 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
2550the 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
2551be called at the end of this process. 2793be called at the end of this process.
2552 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
2553=cut 2798=cut
2554 2799
2555our $GOTOGEN; 2800our $GOTOGEN;
2556 2801
2557sub cf::object::player::goto { 2802sub cf::object::player::goto {
2558 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 }
2559 2810
2560 # 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
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2813
2563 $self->enter_link; 2814 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2834 ($path, $x, $y) = (undef, undef, undef);
2584 } 2835 }
2585 } 2836 }
2586 2837
2587 my $map = eval { 2838 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2840
2590 if ($map) { 2841 if ($map) {
2591 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2844 } else {
2594 $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);
2595 } 2846 }
2596 2847
2597 $map 2848 $map
2605 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2608 } 2859 }
2609 2860
2610 $done->() if $done; 2861 $done->($self) if $done;
2611 })->prio (1); 2862 })->prio (1);
2612} 2863}
2613 2864
2614=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2615 2866
2635} 2886}
2636 2887
2637sub prepare_random_map { 2888sub prepare_random_map {
2638 my ($exit) = @_; 2889 my ($exit) = @_;
2639 2890
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2891 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2892 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2893 # that depends on the exit object
2645 2894
2646 my $rmp = parse_random_map_params $exit->msg; 2895 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2897 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2898 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2899 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2900 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2901 $rmp->{origin_y} = $exit->y;
2902
2903 $exit->map->touch;
2653 } 2904 }
2654 2905
2655 $rmp->{random_seed} ||= $exit->random_seed; 2906 $rmp->{random_seed} ||= $exit->random_seed;
2656 2907
2657 my $data = cf::encode_json $rmp; 2908 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2909 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2910 my $meta = "$RANDOMDIR/$md5.meta";
2660 2911
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2912 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2913 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2914 undef $fh;
2664 aio_rename "$meta~", $meta; 2915 aio_rename "$meta~", $meta;
2665 2916
2917 my $slaying = "?random/$md5";
2918
2919 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2920 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2921 $exit->msg (undef);
2922 }
2668 } 2923 }
2669} 2924}
2670 2925
2671sub cf::object::player::enter_exit { 2926sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2927 my ($self, $exit) = @_;
2673 2928
2674 return unless $self->type == cf::PLAYER; 2929 return unless $self->type == cf::PLAYER;
2675 2930
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2931 $self->enter_link;
2688 2932
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2933 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2934 $Coro::current->{desc} = "enter_exit";
2695 2935
2696 $self->deactivate_recursive; # just to be sure
2697 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
2698 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2699 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
2700 1; 2957 1
2701 }) { 2958 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2963
2707 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2965 $self->leave_link;
2709 } 2966 }
2710 })->prio (1); 2967 })->prio (1);
2711} 2968}
2712 2969
2724sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2726 2983
2727 utf8::encode $text; 2984 utf8::encode $text;
2728 $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);
2729} 3011}
2730 3012
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3014
2733Send 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
2737 3019
2738=cut 3020=cut
2739 3021
2740# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2742 "c/identify" => { 3030 "c/identify" => {
2743 id => "infobox", 3031 id => "infobox",
2744 title => "Identify", 3032 title => "Identify",
2745 reply => undef, 3033 reply => undef,
2746 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2748 "c/examine" => { 3036 "c/examine" => {
2749 id => "infobox", 3037 id => "infobox",
2750 title => "Examine", 3038 title => "Examine",
2751 reply => undef, 3039 reply => undef,
2752 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",
2753 }, 3047 },
2754 "c/book" => { 3048 "c/book" => {
2755 id => "infobox", 3049 id => "infobox",
2756 title => "Book", 3050 title => "Book",
2757 reply => undef, 3051 reply => undef,
2773 id => "infobox", 3067 id => "infobox",
2774 title => "Body Parts", 3068 title => "Body Parts",
2775 reply => undef, 3069 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 3070 tooltip => "Shows which body parts you posess and are available",
2777 }, 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 },
2778 "c/uptime" => { 3108 "c/uptime" => {
2779 id => "infobox", 3109 id => "infobox",
2780 title => "Uptime", 3110 title => "Uptime",
2781 reply => undef, 3111 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 3112 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 3115 id => "infobox",
2786 title => "Map Info", 3116 title => "Map Info",
2787 reply => undef, 3117 reply => undef,
2788 tooltip => "Information related to the maps", 3118 tooltip => "Information related to the maps",
2789 }, 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,
2790); 3134);
2791 3135
2792sub cf::client::send_msg { 3136sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2794 3138
2795 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2796 3141
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 3143
2799 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2802 3147
2803 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2807 3150
2808 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2813 if $self->can_msg;
2814 } 3156 }
2815 3157
2816 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2817 } 3159 }
2818 3160
2819 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2820 3162
2821 if ($self->can_msg) {
2822 # default colour, mask it out 3163 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2825 3166
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3167 my $pkt = "msg "
3168 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2828 } else { 3170 );
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839 3171
2840 $color &= cf::NDI_COLOR_MASK; 3172 $self->send_big_packet ($pkt);
2841
2842 utf8::encode $msg;
2843
2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 }
2853} 3173}
2854 3174
2855=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2856 3176
2857Sends an ext event to the client. 3177Sends an ext event to the client.
2860 3180
2861sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2862 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2863 3183
2864 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2867 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 } 3189 }
2870} 3190}
2871 3191
2872=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2873 3193
2877 3197
2878sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2880 3200
2881 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove 3204 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 } 3207 }
2888} 3208}
2889 3209
2890=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2891 3211
2962 3282
2963 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
2964 if $reply; 3284 if $reply;
2965 3285
2966 } else { 3286 } else {
2967 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";
2968 } 3288 }
2969 3289
2970 cf::override; 3290 cf::override;
2971 }, 3291 },
2972); 3292);
2992 3312
2993 $coro 3313 $coro
2994} 3314}
2995 3315
2996cf::client->attach ( 3316cf::client->attach (
2997 on_destroy => sub { 3317 on_client_destroy => sub {
2998 my ($ns) = @_; 3318 my ($ns) = @_;
2999 3319
3000 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3001 }, 3321 },
3002); 3322);
3018our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3019 3339
3020$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3021 3341
3022$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3024 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3025 sort time 3345 sort time
3026)); 3346));
3027 3347
3028# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3031 3351
3032The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
3033 3353
3034 cf::object 3354 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3356 insert remove name archname title slaying race decrease split
3357 value
3037 3358
3038 cf::object::player 3359 cf::object::player
3039 player 3360 player
3040 3361
3041 cf::player 3362 cf::player
3046 3367
3047=cut 3368=cut
3048 3369
3049for ( 3370for (
3050 ["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
3051 insert remove inv name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3053 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
3055 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3056) { 3377) {
3057 no strict 'refs';
3058 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3059 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3060 for @funs; 3380 for @funs;
3061} 3381}
3062 3382
3077 3397
3078 my $qcode = $code; 3398 my $qcode = $code;
3079 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3080 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3081 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
3082 local $_; 3405 local $_;
3083 local @safe::cf::_safe_eval_args = values %vars;
3084 3406
3085 my $eval = 3407 my $eval =
3086 "do {\n" 3408 "do {\n"
3087 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3088 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3089 . $code 3411 . $code
3090 . "\n}" 3412 . "\n}"
3091 ; 3413 ;
3092 3414
3415 if ($CFG{safe_eval}) {
3093 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3094 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3095 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 }
3096 3424
3097 if ($@) { 3425 if ($@) {
3098 warn "$@"; 3426 warn "$@",
3099 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3100 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3101 } 3429 }
3102 3430
3103 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3104} 3432}
3105 3433
3119=cut 3447=cut
3120 3448
3121sub register_script_function { 3449sub register_script_function {
3122 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3123 3451
3124 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3125 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3126} 3454}
3127 3455
3128=back 3456=back
3129 3457
3130=cut 3458=cut
3139 # for this (global event?) 3467 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3141 3469
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143 3471
3144 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3145 3473
3146 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3147 0 < aio_load $path, $facedata
3148 or die "$path: $!";
3149
3150 $facedata = Coro::Storable::thaw $facedata;
3151 3475
3152 $facedata->{version} == 2 3476 $facedata->{version} == 2
3153 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3154 3478
3155 # 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]);
3156 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC, 3482 type => FT_RSRC,
3158 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),
3159 }; 3485 };
3160 cf::cede_to_tick; 3486 cf::cede_to_tick;
3161 3487
3162 { 3488 {
3163 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3165 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3166 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167 3493
3168 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3171 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} ;
3172 3499
3173 cf::cede_to_tick; 3500 cf::cede_to_tick;
3174 } 3501 }
3175 3502
3176 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3181 3508
3182 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3185 } else { 3512 } else {
3186 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3187 } 3514 }
3188 3515
3189 cf::cede_to_tick; 3516 cf::cede_to_tick;
3190 } 3517 }
3191 } 3518 }
3200 3527
3201 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3202 } 3529 }
3203 3530
3204 { 3531 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3208 3533
3209 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213 3537
3214 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3229 } else { 3540 } else {
3230 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3231 } 3542 }
3232 3543
3233 cf::cede_to_tick; 3544 cf::cede_to_tick;
3234 } 3545 }
3235 } 3546 }
3236 3547
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238 3549
3239 1 3550 1
3240} 3551}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261 3552
3262register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3264 3555
3265 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3557 $ns->fx_want ($k, $v);
3267 } 3558 }
3268}; 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}
3269 3570
3270sub reload_regions { 3571sub reload_regions {
3271 # 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
3272 # for this (global event?) 3573 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3574 %ext::player_env::MUSIC_FACE_CACHE = ();
3287} 3588}
3288 3589
3289sub reload_archetypes { 3590sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3591 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3592 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
3297} 3593}
3298 3594
3299sub reload_treasures { 3595sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3302} 3598}
3303 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
3304sub reload_resources { 3620sub reload_resources {
3305 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3306 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
3307 reload_regions; 3628 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3629 reload_treasures;
3312 3630
3313 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3632}
3319 3633
3320sub reload_config { 3634sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3322 or return;
3323 3636
3324 local $/; 3637 my $config = load_file "$CONFDIR/config";
3325 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3326 3640
3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3328 3642
3329 $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};
3330 $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};
3331 3645
3332 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3336 }; 3650 };
3337 warn $@ if $@; 3651 warn $@ if $@;
3338 } 3652 }
3339} 3653}
3340 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
3341sub 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
3342 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3344 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#
3345 (async { 3696 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3698 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
3349 }; 3700 };
3350 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;
3351 reload_config; 3714 reload_config;
3352 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
3353 load_extensions; 3725 load_extensions;
3354 3726
3355 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3728
3357 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;
3358} 3745}
3359 3746
3360############################################################################# 3747#############################################################################
3361# initialisation and cleanup 3748# initialisation and cleanup
3362 3749
3363# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3364BEGIN { 3751BEGIN {
3365 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3366 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3367 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3368 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3369 }; 3756 };
3370 } 3757 }
3371} 3758}
3372 3759
3373sub write_runtime { 3760sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
3375 3762
3376 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3378 3765
3379 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3767
3381 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3382 3769
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3384 or return; 3771 or return;
3385 3772
3386 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
3399 3786
3400 close $fh 3787 close $fh
3401 or return; 3788 or return;
3402 3789
3403 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3791 and return;
3405 3792
3406 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3407 3794
3408 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 };
3409} 3846}
3410 3847
3411sub emergency_save() { 3848sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3413 3850
3414 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;
3415 3857
3416 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3417 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3418 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3419 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3420 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3421 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3422 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3423 $pl->valid or next; 3867 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3425 $pl->save; 3869 $pl->save;
3426 } 3870 }
3427 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3428 3872
3429 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";
3430 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3431 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3432 $map->valid or next; 3878 $map->valid or next;
3433 $map->save; 3879 $map->save;
3434 } 3880 }
3435 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3436 3882
3437 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";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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
3440 }; 3911 };
3441 3912
3442 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3443} 3914}
3444 3915
3445sub post_cleanup { 3916sub post_cleanup {
3446 my ($make_core) = @_; 3917 my ($make_core) = @_;
3447 3918
3919 IO::AIO::flush;
3920
3448 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3449 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 }
3450} 3951}
3451 3952
3452sub do_reload_perl() { 3953sub do_reload_perl() {
3453 # can/must only be called in main 3954 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3455 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3456 return; 3957 return;
3457 } 3958 }
3458 3959
3459 warn "reloading..."; 3960 return if $RELOAD++;
3460 3961
3461 warn "entering sync_job"; 3962 my $t1 = AE::time;
3462 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
3463 cf::sync_job { 3970 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark
3465 cf::emergency_save; 3971 #cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark
3467 3972
3468 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV;
3470
3471 # if anything goes wrong in here, we should simply crash as we already saved
3472
3473 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs;
3479 warn "iterate...";
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = (); 3975 %EXT_CORO = ();
3487 3976
3488 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3489 %COMMAND = (); 3978 %COMMAND = ();
3490 3979
3491 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3492 %EXTCMD = (); 3981 %EXTCMD = ();
3493 %EXTICMD = (); 3982 %EXTICMD = ();
3494 3983
3495 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3496 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3498 3987
3499 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3500 eval { 3989 eval {
3501 $cb->($pkg); 3990 $cb->($pkg);
3502 1 3991 1
3503 } 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;
3504 } 3997 }
3505 3998
3506 warn "... nuking $pkg";
3507 Symbol::delete_package $pkg;
3508 }
3509
3510 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3511 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 4002
3514 warn "... unloading $k"; 4003 trace "... unloading $k";
3515 delete $INC{$k}; 4004 delete $INC{$k};
3516 4005
3517 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3519 4008
3520 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3521 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3522 } 4014 }
3523 4015
3524 Symbol::delete_package $k;
3525 }
3526
3527 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3529 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);
3530 4019
3531 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3534 4023
3535 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3536 # and global variables created in xs 4025 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3538 4027
3539 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3540 4029
3541 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3542 require cf; 4031 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3544 4033
3545 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3546 cf::reload_config; 4035 cf::reload_config;
3547 4036
3548 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3549 cf::load_extensions; 4038 cf::load_extensions;
3550 4039
4040 if ($REATTACH_ON_RELOAD) {
3551 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3554 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3557 4048
3558 warn "leaving sync_job"; 4049 cf::_post_init 1;
3559 4050
4051 trace "perl_reload: leaving sync_job";
4052
3560 1 4053 1
3561 } or do { 4054 } or do {
3562 warn $@; 4055 error $@;
3563 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3564 exit 1; 4057 };
4058
4059 --$RELOAD;
3565 }; 4060 }
3566 4061
3567 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3568}; 4064};
3569 4065
3570our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3571 4067
3572sub reload_perl() { 4068sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3575 4071
4072 $RELOAD_WATCHER ||= cf::async {
4073 Coro::AIO::aio_wait cache_extensions;
4074
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 4076 do_reload_perl;
3578 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
4078 };
3579 }; 4079 };
3580} 4080}
3581 4081
3582register_command "reload" => sub { 4082register_command "reload" => sub {
3583 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3589 reload_perl; 4089 reload_perl;
3590 }; 4090 };
3591 } 4091 }
3592}; 4092};
3593 4093
3594unshift @INC, $LIBDIR; 4094#############################################################################
3595 4095
3596my $bug_warning = 0; 4096my $bug_warning = 0;
3597 4097
3598our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3600 4100
3601sub wait_for_tick { 4101sub wait_for_tick() {
3602 return unless $TICK_WATCHER->is_active;
3603 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3604 4103
3605 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3606 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait; 4106 $signal->wait;
3608} 4107}
3609 4108
3610sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3611 return unless $TICK_WATCHER->is_active;
3612 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3613 4111
3614 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 4114 $signal->wait;
3617} 4115}
3618 4116
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4117sub tick {
3620 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3623 return; 4121 return;
3624 } 4122 }
3625 4123
3626 $NOW = $tick_start = EV::now;
3627
3628 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3629 4125
3630 $RUNTIME += $TICK; 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3631 $NEXT_TICK = $_[0]->at;
3632 4127
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 4130 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 4132 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3639 }; 4134 };
3640 } 4135 }
3641 4136
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3643 $sig->send; 4138 $sig->send;
3644 } 4139 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3646 $sig->send; 4141 $sig->send;
3647 } 4142 }
3648 4143
3649 $LOAD = ($NOW - $tick_start) / $TICK; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 4146
3652 _post_tick; 4147 if (0) {
3653}; 4148 if ($NEXT_TICK) {
3654$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}
3655 4155
3656{ 4156{
3657 # configure BDB 4157 # configure BDB
3658 4158
3659 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3660 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3662 4162
3663 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | 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;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 4170
3670 cf::sync_job { 4171 cf::sync_job {
3671 eval { 4172 eval {
3697{ 4198{
3698 # configure IO::AIO 4199 # configure IO::AIO
3699 4200
3700 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 4203 undef $AnyEvent::AIO::WATCHER;
3703} 4204}
3704 4205
3705my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3706 4208
3707sub _log_backtrace { 4209sub _log_backtrace {
3708 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3709 4211
3710 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3711 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3712 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3714 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3715 async { 4222 async {
3716 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3717 4224
3718 my @bt = fork_call { 4225 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3730 } 4237 }
3731 4238
3732 @funcs 4239 @funcs
3733 }; 4240 };
3734 4241
3735 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 4245 --$_log_backtrace;
3738 }; 4246 };
3739 } else { 4247 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3741 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3742 } 4250 }
3743} 4251}
3744 4252
3745# load additional modules 4253# load additional modules
3746use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3747 4256
3748END { cf::emergency_save } 4257END { cf::emergency_save }
3749 4258
37501 42591
3751 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines