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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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
68 69
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 71
71{ 72# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86} 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 78
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
92 85
93our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
103our $DATADIR = datadir; 99our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
106our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
107our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
108our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
110our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
111our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
112our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 112
116our %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;
117 120
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 123our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
122 125
123our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 129our $DB_ENV;
127 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME;
132our $NOW; 137our $NOW;
140 145
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 148our $JITTER; # average jitter
144our $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 :)
145 155
146binmode STDOUT; 156binmode STDOUT;
147binmode STDERR; 157binmode STDERR;
148 158
149# read virtual server time, if available 159# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
154} 164}
155 165
166eval "sub TICK() { $TICK } 1" or die;
167
156mkdir $_ 168mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 170
159our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
160 172
161sub 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::"} };
162 189
163############################################################################# 190#############################################################################
164 191
165=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
166 193
208from wherever your confdir points to. 235from wherever your confdir points to.
209 236
210=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
211 238
212These 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
213returns 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
214per 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.
215 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
216=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
217 249
218This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
219C<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
220that call. 252that call.
221 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
222=back 260=back
223 261
224=cut 262=cut
225 263
226BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
227 *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 {
228 my $msg = join "", @_; 271 my $msg = join "", @_;
229 272
230 $msg .= "\n" 273 $msg .= "\n"
231 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
232 275
233 $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;
234 277
235 LOG llevError, $msg; 278 LOG llevWarn, $msg;
236 }; 279};
237}
238 280
239$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
241 283
242 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 288 return;#d#
245 }#d# 289 }#d#
246 290
247 # kill coroutine otherwise 291 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 292 Coro::terminate
250}; 293};
251
252$SIG{__DIE__} = sub { }; #d#?
253 294
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 312)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 314}
274 315
275$EV::DIED = sub { 316$EV::DIED = sub {
276 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
277}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
278 324
279############################################################################# 325#############################################################################
280 326
281=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
282 328
303 $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;
304 $d 350 $d
305 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
306} 352}
307 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
308=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
309 369
310Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
311 371
312=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
318our $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
319 379
320sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
322 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
323=item cf::lock_wait $string 445=item cf::lock_wait $string
324 446
325Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
326 448
327=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
328 450
329Wait 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
330a 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,
331for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
332returned. 454returned.
333 455
334Locks 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
335deadlocked coro. 457deadlocked coro.
341 463
342Return 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.
343 465
344=cut 466=cut
345 467
346our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 469
349sub lock_wait($) { 470sub lock_wait($) {
350 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 472}
363 473
364sub lock_acquire($) { 474sub lock_acquire($) {
365 my ($key) = @_; 475 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 476}
379 477
380sub lock_active($) { 478sub lock_active($) {
381 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 480}
385 481
386sub freeze_mainloop { 482sub freeze_mainloop {
387 tick_inhibit_inc; 483 tick_inhibit_inc;
388 484
389 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
390} 486}
391 487
392=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
393 489
394Like 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
395get spread over timer. 491get spread over time.
396 492
397=cut 493=cut
398 494
399sub periodic($$) { 495sub periodic($$) {
400 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
404 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
405} 501}
406 502
407=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
408 504
409Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
410This 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
411of 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.
412 512
413The 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
414used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
415 515
416Useful for short background jobs. 516Useful for short background jobs.
417 517
418=cut 518=cut
419 519
420our @SLOT_QUEUE; 520our @SLOT_QUEUE;
421our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
422 523
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
426 527
427 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
428 530
429 while () { 531 while () {
430 next_job: 532 next_job:
533
431 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 535
433 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 540 $job->[2]->send;
437 Coro::cede; 541 Coro::cede;
438 goto next_job; 542 goto next_job;
439 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 545 }
441 } 546 }
442 547
443 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
444 # 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
445 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 551 $signal->wait;
447 } else { 552 } else {
553 $busy = 0;
448 Coro::schedule; 554 Coro::schedule;
449 } 555 }
450 } 556 }
451}; 557};
452 558
453sub get_slot($;$$) { 559sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
455 561
456 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
457 563
458 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
459 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
460 567
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
489=cut 596=cut
490 597
491sub sync_job(&) { 598sub sync_job(&) {
492 my ($job) = @_; 599 my ($job) = @_;
493 600
494 if ($Coro::current == $Coro::main) { 601 if (in_main) {
495 my $time = EV::time; 602 my $time = AE::time;
496 603
497 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
499 606
500 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
501 608
502 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
503 610
504 my $busy = 1; 611 my $busy = 1;
505 my @res; 612 my @res;
506 613
507 (async { 614 (async {
508 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
509 @res = eval { $job->() }; 616 @res = eval { $job->() };
510 warn $@ if $@; 617 error $@ if $@;
511 undef $busy; 618 undef $busy;
512 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
513 620
514 while ($busy) { 621 while ($busy) {
515 if (Coro::nready) { 622 if (Coro::nready) {
517 } else { 624 } else {
518 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
519 } 626 }
520 } 627 }
521 628
522 my $time = EV::time - $time; 629 my $time = AE::time - $time;
523 630
524 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
525 632
526 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
527 } else { 634 } else {
549 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
550 657
551 $coro 658 $coro
552} 659}
553 660
554=item fork_call { }, $args 661=item fork_call { }, @args
555 662
556Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
557process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
558Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
559never block itself or use any form of event handling. 666never block itself or use any form of event handling.
560 667
561=cut 668=cut
562 669
670sub post_fork {
671 reset_signals;
672}
673
563sub fork_call(&@) { 674sub fork_call(&@) {
564 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
565 676
566 # 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,
567 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
568 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
569 680
570 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
571 reset_signals; 682 cf::post_fork;
572 &$cb 683 &$cb
573 }, @args; 684 } @args;
574 685
575 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 )
576} 698}
577 699
578=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
579 701
580=cut 702=cut
617within each server. 739within each server.
618 740
619=cut 741=cut
620 742
621sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
622 my ($name) = @_; 747 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
624 749
625 eval { 750 eval {
626 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
636} 761}
637 762
638our $DB; 763our $DB;
639 764
640sub db_init { 765sub db_init {
641 cf::sync_job {
642 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
643 };
644} 767}
645 768
646sub db_get($$) { 769sub db_get($$) {
647 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
648 771
649 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
650 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
651 776
652 $! ? () 777 $! ? ()
653 : $data 778 : $data
654 }
655} 779}
656 780
657sub db_put($$$) { 781sub db_put($$$) {
658 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
659 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
687 811
688 my @data; 812 my @data;
689 my $md5; 813 my $md5;
690 814
691 for (0 .. $#$src) { 815 for (0 .. $#$src) {
692 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
693 or Carp::croak "$src->[$_]: $!";
694 } 817 }
695 818
696 # if processing is expensive, check 819 # if processing is expensive, check
697 # checksum first 820 # checksum first
698 if (1) { 821 if (1) {
715 838
716 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
717 my $data = $process->(\@data); 840 my $data = $process->(\@data);
718 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
719 842
720 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
721 844
722 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
723 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
724 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
725 848
735 858
736=cut 859=cut
737 860
738sub datalog($@) { 861sub datalog($@) {
739 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
740 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
741} 864}
742 865
743=back 866=back
744 867
745=cut 868=cut
940 1063
941 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
942 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
943 1066
944 } elsif (ref $type) { 1067 } elsif (ref $type) {
945 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
946 1069
947 } else { 1070 } else {
948 shift @arg; 1071 shift @arg;
949 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
950 } 1073 }
951 } 1074 }
952} 1075}
953 1076
954sub _object_attach { 1077sub _object_attach {
964 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
965 } 1088 }
966 1089
967 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
968 } else { 1091 } else {
969 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
970 } 1093 }
971 1094
972 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
973} 1096}
974 1097
1033 1156
1034 for (@$callbacks) { 1157 for (@$callbacks) {
1035 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1036 1159
1037 if ($@) { 1160 if ($@) {
1038 warn "$@";
1039 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1040 override; 1162 override;
1041 } 1163 }
1042 1164
1043 return 1 if $override; 1165 return 1 if $override;
1044 } 1166 }
1123 for (@$attach) { 1245 for (@$attach) {
1124 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1125 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1126 } 1248 }
1127 } else { 1249 } else {
1128 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1129 } 1251 }
1130 } 1252 }
1131} 1253}
1132 1254
1133cf::attachable->attach ( 1255cf::attachable->attach (
1160 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1161 1283
1162 sync_job { 1284 sync_job {
1163 if (length $$rdata) { 1285 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1165 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1166 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1167 1290
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 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 }
1172 aio_close $fh; 1298 aio_close $fh;
1173 1299
1174 if (@$objs) { 1300 if (@$objs) {
1175 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) {
1176 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1179 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 }
1180 aio_close $fh; 1309 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1311 }
1183 } else { 1312 } else {
1184 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1185 } 1314 }
1186 1315
1187 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1320 } else {
1189 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1190 } 1322 }
1191 } else { 1323 } else {
1192 aio_unlink $filename; 1324 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1194 } 1326 }
1218 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs}; 1351 $av = $st->{objs};
1220 } 1352 }
1221 1353
1222 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1223 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1224 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1225 1358
1226 ($data, $av) 1359 ($data, $av)
1227} 1360}
1228 1361
1229=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1285 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1286 1419
1287 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1288} 1421}
1289 1422
1423use File::Glob ();
1424
1290cf::player->attach ( 1425cf::player->attach (
1291 on_command => sub { 1426 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1293 1428
1294 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1295 or return; 1430 or return;
1296 1431
1319 1454
1320 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1456 if $reply;
1322 1457
1323 } else { 1458 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1460 }
1326 1461
1327 cf::override; 1462 cf::override;
1328 }, 1463 },
1329); 1464);
1330 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
1331sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1332 cf::sync_job { 1482 cf::sync_job {
1333 my %todo; 1483 my %todo;
1334 1484
1335 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1336 next unless -r $path; 1486 next unless -r $path;
1354 1504
1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1357 1507
1358 $ext{source} = 1508 $ext{source} =
1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1360 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1361 . $source 1511 . $source
1362 . "\n};\n1"; 1512 . "\n};\n1";
1363 1513
1364 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1365 } 1515 }
1366 1516
1517 my $pass = 0;
1367 my %done; 1518 my %done;
1368 while (%todo) { 1519 while (%todo) {
1369 my $progress; 1520 my $progress;
1370 1521
1522 ++$pass;
1523
1524 ext:
1371 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1527 next ext
1374 unless exists $done{$_}; 1528 unless exists $done{$_};
1375 } 1529 }
1376 1530
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1532
1379 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1537
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1539 if exists $v->{meta}{mandatory};
1387 1540
1388 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1389 } 1550 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1551 }
1395 1552
1396 skip: 1553 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 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 }
1399 } 1563 }
1400 }; 1564 };
1401} 1565}
1402 1566
1403############################################################################# 1567#############################################################################
1457 1621
1458sub exists($) { 1622sub exists($) {
1459 my ($login) = @_; 1623 my ($login) = @_;
1460 1624
1461 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1463} 1627}
1464 1628
1465sub find($) { 1629sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1631 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1488 } 1652 }
1489 } 1653 }
1490} 1654}
1491 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
1492sub save($) { 1669sub save($) {
1493 my ($pl) = @_; 1670 my ($pl) = @_;
1494 1671
1495 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1496 1673
1501 1678
1502 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1504 1681
1505 cf::get_slot 0.01; 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];
1506 1686
1507 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1688 cf::cede_to_tick;
1509} 1689}
1510 1690
1544 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1545 1725
1546 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1548 1728
1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1550 $pl->deactivate; 1730 $pl->deactivate;
1731
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1553 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1554 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1555 1737
1556 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1557 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1558 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1612 \@logins 1794 \@logins
1613} 1795}
1614 1796
1615=item $player->maps 1797=item $player->maps
1616 1798
1799=item cf::player::maps $login
1800
1617Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1618player. May block. 1802player. May block.
1619 1803
1620=cut 1804=cut
1621 1805
1683=cut 1867=cut
1684 1868
1685sub find_by_path($) { 1869sub find_by_path($) {
1686 my ($path) = @_; 1870 my ($path) = @_;
1687 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1688 my ($match, $specificity); 1874 my ($match, $specificity);
1689 1875
1690 for my $region (list) { 1876 for my $region (list) {
1691 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1692 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1720sub generate_random_map { 1906sub generate_random_map {
1721 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1722 1908
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1910
1725 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1734 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1735 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1736 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1737 (cf::region::find $rmp->{region}), $rmp->{custom}
1738 )
1739} 1912}
1740 1913
1741=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1742 1915
1743Register 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
1748 1921
1749sub register { 1922sub register {
1750 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1751 my $pkg = caller; 1924 my $pkg = caller;
1752 1925
1753 no strict;
1754 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1755 1927
1756 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1757} 1929}
1758 1930
1759# also paths starting with '/' 1931# also paths starting with '/'
1760$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1761 1933
1762sub thawer_merge { 1934sub thawer_merge {
1763 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1764 1936
1765 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1770} 1942}
1771 1943
1772sub normalise { 1944sub normalise {
1773 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1774 1946
1775 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1776 1948
1777 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1778 1950
1779 # map plan: 1951 # map plan:
1780 # 1952 #
1795 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1796 $path = "$base/$path"; 1968 $path = "$base/$path";
1797 } 1969 }
1798 1970
1799 for ($path) { 1971 for ($path) {
1800 redo if s{//}{/};
1801 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1802 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1803 } 1974 }
1804 1975
1805 $path 1976 $path
1819 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1820 return $self; 1991 return $self;
1821 } 1992 }
1822 } 1993 }
1823 1994
1824 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1825 () 1996 ()
1826} 1997}
1827 1998
1999# may re-bless or do other evil things
1828sub init { 2000sub init {
1829 my ($self) = @_; 2001 my ($self) = @_;
1830 2002
1831 $self 2003 $self
1832} 2004}
1861sub uniq_path { 2033sub uniq_path {
1862 my ($self) = @_; 2034 my ($self) = @_;
1863 2035
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1866}
1867
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875} 2038}
1876 2039
1877sub decay_objects { 2040sub decay_objects {
1878 my ($self) = @_; 2041 my ($self) = @_;
1879 2042
1961 2124
1962sub find; 2125sub find;
1963sub find { 2126sub find {
1964 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
1965 2128
2129 cf::cede_to_tick;
2130
1966 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1967 2132
1968 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2135
1971 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
1976 or return; 2138 or return;
1977 2139
1978 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
1979 2141
1991 2153
1992 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1993 } 2155 }
1994} 2156}
1995 2157
1996sub pre_load { } 2158sub pre_load { }
1997sub post_load { } 2159#sub post_load { } # XS
1998 2160
1999sub load { 2161sub load {
2000 my ($self) = @_; 2162 my ($self) = @_;
2001 2163
2002 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2014 $self->alloc; 2176 $self->alloc;
2015 2177
2016 $self->pre_load; 2178 $self->pre_load;
2017 cf::cede_to_tick; 2179 cf::cede_to_tick;
2018 2180
2181 if (exists $self->{load_path}) {
2019 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block; 2183 $f->skip_block;
2021 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2022 or return; 2185 or return;
2023 2186
2024 $self->post_load_original 2187 $self->post_load_original
2025 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2026 2189
2027 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2028 utf8::encode $uniq; 2191 utf8::encode $uniq;
2029 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2031 $self->clear_unique_items; 2194 $self->clear_unique_items;
2032 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2034 } 2198 }
2035 } 2199 }
2036 }
2037 2200
2038 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2039 2203
2040 cf::cede_to_tick; 2204 cf::cede_to_tick;
2041 # now do the right thing for maps 2205 # now do the right thing for maps
2042 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2043 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
2047 unless ($self->{deny_activate}) { 2211 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2212 $self->decay_objects;
2049 $self->fix_auto_apply; 2213 $self->fix_auto_apply;
2050 $self->update_buttons; 2214 $self->update_buttons;
2051 cf::cede_to_tick; 2215 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2216 $self->activate;
2055 } 2217 }
2056 2218
2057 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2220 $self->last_access ($cf::RUNTIME);
2059 2221
2060 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2061 } 2223 }
2062 2224
2063 $self->post_load; 2225 $self->post_load;
2064}
2065 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
2066sub customise_for { 2233sub customise_for {
2067 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
2068 2235
2069 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2237 if $self->per_player;
2086 or next; 2253 or next;
2087 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
2088 or next; 2255 or next;
2089 $neigh->load; 2256 $neigh->load;
2090 2257
2258 # now find the diagonal neighbours
2091 push @neigh, 2259 push @neigh,
2092 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2093 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2094 } 2262 }
2095 2263
2102} 2270}
2103 2271
2104sub find_sync { 2272sub find_sync {
2105 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2106 2274
2107 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2108} 2279}
2109 2280
2110sub do_load_sync { 2281sub do_load_sync {
2111 my ($map) = @_; 2282 my ($map) = @_;
2112 2283
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2115 2286
2116 cf::sync_job { $map->load }; 2287 $map->load;
2117} 2288}
2118 2289
2119our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2120our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2121 2292
2147 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
2148 2319
2149 () 2320 ()
2150} 2321}
2151 2322
2323# common code, used by both ->save and ->swapout
2152sub save { 2324sub _save {
2153 my ($self) = @_; 2325 my ($self) = @_;
2154
2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2156 2326
2157 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2158 2328
2159 return unless $self->dirty; 2329 return unless $self->dirty;
2160 2330
2180 } else { 2350 } else {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2182 } 2352 }
2183} 2353}
2184 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2185sub swap_out { 2363sub swap_out {
2186 my ($self) = @_; 2364 my ($self) = @_;
2187 2365
2188 # save first because save cedes
2189 $self->save;
2190
2191 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2192 2367
2193 return if $self->players;
2194 return if $self->in_memory != cf::MAP_ACTIVE; 2368 return if $self->in_memory != cf::MAP_ACTIVE;
2195 return if $self->{deny_save}; 2369 return if $self->{deny_save};
2370 return if $self->players;
2196 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2381 $self->clear;
2382}
2383
2384sub reset_at {
2385 my ($self) = @_;
2386
2387 # TODO: safety, remove and allow resettable per-player maps
2388 return 1e99 if $self->{deny_reset};
2389
2390 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2391 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2392
2393 $time + $to
2394}
2395
2396sub should_reset {
2397 my ($self) = @_;
2398
2399 $self->reset_at <= $cf::RUNTIME
2400}
2401
2402sub reset {
2403 my ($self) = @_;
2404
2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2406
2407 return if $self->players;
2408
2409 cf::trace "resetting map ", $self->path, "\n";
2410
2411 $self->in_memory (cf::MAP_SWAPPED);
2412
2413 # need to save uniques path
2414 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416
2417 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2418 if $uniq;
2419 }
2420
2421 delete $cf::MAP{$self->path};
2198 2422
2199 $self->deactivate; 2423 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP; 2424 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->clear; 2425 $self->clear;
2202}
2203
2204sub reset_at {
2205 my ($self) = @_;
2206
2207 # TODO: safety, remove and allow resettable per-player maps
2208 return 1e99 if $self->{deny_reset};
2209
2210 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2211 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2212
2213 $time + $to
2214}
2215
2216sub should_reset {
2217 my ($self) = @_;
2218
2219 $self->reset_at <= $cf::RUNTIME
2220}
2221
2222sub reset {
2223 my ($self) = @_;
2224
2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226
2227 return if $self->players;
2228
2229 warn "resetting map ", $self->path;
2230
2231 $self->in_memory (cf::MAP_SWAPPED);
2232
2233 # need to save uniques path
2234 unless ($self->{deny_save}) {
2235 my $uniq = $self->uniq_path; utf8::encode $uniq;
2236
2237 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2238 if $uniq;
2239 }
2240
2241 delete $cf::MAP{$self->path};
2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2245 $self->clear;
2246 2426
2247 $self->unlink_save; 2427 $self->unlink_save;
2248 $self->destroy; 2428 $self->destroy;
2249} 2429}
2250 2430
2258 2438
2259 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2260 2440
2261 $self->unlink_save; 2441 $self->unlink_save;
2262 2442
2263 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2264 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2265 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2266 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2268 2448
2325 : normalise $_ 2505 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2507 ]
2328} 2508}
2329 2509
2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2541
2330=back 2542=back
2331 2543
2332=head3 cf::object 2544=head3 cf::object
2333 2545
2334=cut 2546=cut
2399 2611
2400our $SAY_CHANNEL = { 2612our $SAY_CHANNEL = {
2401 id => "say", 2613 id => "say",
2402 title => "Map", 2614 title => "Map",
2403 reply => "say ", 2615 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2616 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2617};
2406 2618
2407our $CHAT_CHANNEL = { 2619our $CHAT_CHANNEL = {
2408 id => "chat", 2620 id => "chat",
2409 title => "Chat", 2621 title => "Chat",
2466 2678
2467Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2468 2680
2469The player should be reasonably safe there for short amounts of time (e.g. 2681The player should be reasonably safe there for short amounts of time (e.g.
2470for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link 2683though, as the player cannot control the character while it is on the link
2472map. 2684map.
2473 2685
2474Will never block. 2686Will never block.
2475 2687
2476=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2497sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2498 my ($self) = @_; 2710 my ($self) = @_;
2499 2711
2500 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2501 2713
2714 ++$self->{_link_recursion};
2715
2502 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2503 2717
2504 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2505 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2506 2720
2507 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2508} 2722}
2509 2723
2510sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2511 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2512 2726
2529 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2531 2745
2532 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2535 2749
2536 $map->load; 2750 $map->load;
2537 $map->load_neighbours; 2751 $map->load_neighbours;
2538 2752
2539 return unless $self->contr->active; 2753 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2754
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2545} 2757 # entering was successful
2758 delete $self->{_link_recursion};
2759 # only activate afterwards, to support waiting in hooks
2760 $self->activate_recursive;
2761 }
2546 2762
2763}
2764
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2766
2549Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2769that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2770the new (success) or old (failed) map position. In either case, $done will
2559 2777
2560our $GOTOGEN; 2778our $GOTOGEN;
2561 2779
2562sub cf::object::player::goto { 2780sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2564 2788
2565 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2791
2568 $self->enter_link; 2792 $self->enter_link;
2592 my $map = eval { 2816 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2817 my $map = defined $path ? cf::map::find $path : undef;
2594 2818
2595 if ($map) { 2819 if ($map) {
2596 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2822 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2824 }
2601 2825
2602 $map 2826 $map
2610 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2613 } 2837 }
2614 2838
2615 $done->() if $done; 2839 $done->($self) if $done;
2616 })->prio (1); 2840 })->prio (1);
2617} 2841}
2618 2842
2619=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2620 2844
2713 $self->message ("Something went wrong deep within the deliantra server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2941
2718 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2943 $self->leave_link;
2720 } 2944 }
2721 })->prio (1); 2945 })->prio (1);
2722} 2946}
2723 2947
2735sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2737 2961
2738 utf8::encode $text; 2962 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2740} 2989}
2741 2990
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2992
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send a drawinfo or msg packet to the client, formatting the msg for the
2748 2997
2749=cut 2998=cut
2750 2999
2751# non-persistent channels (usually the info channel) 3000# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
2753 "c/identify" => { 3008 "c/identify" => {
2754 id => "infobox", 3009 id => "infobox",
2755 title => "Identify", 3010 title => "Identify",
2756 reply => undef, 3011 reply => undef,
2757 tooltip => "Items recently identified", 3012 tooltip => "Items recently identified",
2759 "c/examine" => { 3014 "c/examine" => {
2760 id => "infobox", 3015 id => "infobox",
2761 title => "Examine", 3016 title => "Examine",
2762 reply => undef, 3017 reply => undef,
2763 tooltip => "Signs and other items you examined", 3018 tooltip => "Signs and other items you examined",
3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3025 },
2765 "c/book" => { 3026 "c/book" => {
2766 id => "infobox", 3027 id => "infobox",
2767 title => "Book", 3028 title => "Book",
2768 reply => undef, 3029 reply => undef,
2784 id => "infobox", 3045 id => "infobox",
2785 title => "Body Parts", 3046 title => "Body Parts",
2786 reply => undef, 3047 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3048 tooltip => "Shows which body parts you posess and are available",
2788 }, 3049 },
3050 "c/statistics" => {
3051 id => "infobox",
3052 title => "Statistics",
3053 reply => undef,
3054 tooltip => "Shows your primary statistics",
3055 },
3056 "c/skills" => {
3057 id => "infobox",
3058 title => "Skills",
3059 reply => undef,
3060 tooltip => "Shows your experience per skill and item power",
3061 },
3062 "c/shopitems" => {
3063 id => "infobox",
3064 title => "Shop Items",
3065 reply => undef,
3066 tooltip => "Shows the items currently for sale in this shop",
3067 },
3068 "c/resistances" => {
3069 id => "infobox",
3070 title => "Resistances",
3071 reply => undef,
3072 tooltip => "Shows your resistances",
3073 },
3074 "c/pets" => {
3075 id => "infobox",
3076 title => "Pets",
3077 reply => undef,
3078 tooltip => "Shows information abotu your pets/a specific pet",
3079 },
3080 "c/perceiveself" => {
3081 id => "infobox",
3082 title => "Perceive Self",
3083 reply => undef,
3084 tooltip => "You gained detailed knowledge about yourself",
3085 },
2789 "c/uptime" => { 3086 "c/uptime" => {
2790 id => "infobox", 3087 id => "infobox",
2791 title => "Uptime", 3088 title => "Uptime",
2792 reply => undef, 3089 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3090 tooltip => "How long the server has been running since last restart",
2802 id => "party", 3099 id => "party",
2803 title => "Party", 3100 title => "Party",
2804 reply => "gsay ", 3101 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 3102 tooltip => "Messages and chat related to your party",
2806 }, 3103 },
3104 "c/death" => {
3105 id => "death",
3106 title => "Death",
3107 reply => undef,
3108 tooltip => "Reason for and more info about your most recent death",
3109 },
3110 "c/say" => $SAY_CHANNEL,
3111 "c/chat" => $CHAT_CHANNEL,
2807); 3112);
2808 3113
2809sub cf::client::send_msg { 3114sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 3115 my ($self, $channel, $msg, $color, @extra) = @_;
2811 3116
2816 3121
2817 # check predefined channels, for the benefit of C 3122 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 3123 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 3124 $channel = $CHANNEL{$channel};
2820 3125
2821 $self->ext_msg (channel_info => $channel) 3126 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3127 $channel = $channel->{id};
2825 3128
2826 } elsif (ref $channel) { 3129 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3130 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3131 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3132 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3133 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3134 }
2833 3135
2834 $channel = $channel->{id}; 3136 $channel = $channel->{id};
2835 } 3137 }
2836 3138
2837 return unless @extra || length $msg; 3139 return unless @extra || length $msg;
2838 3140
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3141 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3142 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3143 if $color & cf::NDI_DEF;
2843 3144
2844 my $pkt = "msg " 3145 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3146 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3148 );
2848 3149
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3150 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3151}
2886 3152
2887=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2888 3154
2889Sends an ext event to the client. 3155Sends an ext event to the client.
2892 3158
2893sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2895 3161
2896 if ($self->extcmd == 2) { 3162 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3167 }
2902} 3168}
2903 3169
2904=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2905 3171
2909 3175
2910sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2912 3178
2913 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3182 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3185 }
2920} 3186}
2921 3187
2922=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2923 3189
2994 3260
2995 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
2996 if $reply; 3262 if $reply;
2997 3263
2998 } else { 3264 } else {
2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3000 } 3266 }
3001 3267
3002 cf::override; 3268 cf::override;
3003 }, 3269 },
3004); 3270);
3024 3290
3025 $coro 3291 $coro
3026} 3292}
3027 3293
3028cf::client->attach ( 3294cf::client->attach (
3029 on_destroy => sub { 3295 on_client_destroy => sub {
3030 my ($ns) = @_; 3296 my ($ns) = @_;
3031 3297
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3299 },
3034); 3300);
3050our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
3051 3317
3052$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
3053 3319
3054$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
3057 sort time 3323 sort time
3058)); 3324));
3059 3325
3060# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3330The following functions and methods are available within a safe environment:
3065 3331
3066 cf::object 3332 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3333 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3334 insert remove name archname title slaying race decrease split
3335 value
3069 3336
3070 cf::object::player 3337 cf::object::player
3071 player 3338 player
3072 3339
3073 cf::player 3340 cf::player
3079=cut 3346=cut
3080 3347
3081for ( 3348for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3349 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3350 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3351 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3353 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
3088) { 3355) {
3089 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3092 for @funs; 3358 for @funs;
3093} 3359}
3094 3360
3109 3375
3110 my $qcode = $code; 3376 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
3113 3379
3380 %vars = (_dummy => 0) unless %vars;
3381
3382 my @res;
3114 local $_; 3383 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3384
3117 my $eval = 3385 my $eval =
3118 "do {\n" 3386 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3389 . $code
3122 . "\n}" 3390 . "\n}"
3123 ; 3391 ;
3124 3392
3393 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
3128 3402
3129 if ($@) { 3403 if ($@) {
3130 warn "$@"; 3404 warn "$@",
3131 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
3133 } 3407 }
3134 3408
3135 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
3136} 3410}
3137 3411
3151=cut 3425=cut
3152 3426
3153sub register_script_function { 3427sub register_script_function {
3154 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
3155 3429
3156 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
3158} 3432}
3159 3433
3160=back 3434=back
3161 3435
3162=cut 3436=cut
3171 # for this (global event?) 3445 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3173 3447
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175 3449
3176 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3177 3451
3178 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3179 0 < aio_load $path, $facedata
3180 or die "$path: $!";
3181
3182 $facedata = Coro::Storable::thaw $facedata;
3183 3453
3184 $facedata->{version} == 2 3454 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3456
3187 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3460 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3463 };
3192 cf::cede_to_tick; 3464 cf::cede_to_tick;
3193 3465
3194 { 3466 {
3195 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3471
3200 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3204 3477
3205 cf::cede_to_tick; 3478 cf::cede_to_tick;
3206 } 3479 }
3207 3480
3208 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
3213 3486
3214 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
3215 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3217 } else { 3490 } else {
3218 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3219 } 3492 }
3220 3493
3221 cf::cede_to_tick; 3494 cf::cede_to_tick;
3222 } 3495 }
3223 } 3496 }
3232 3505
3233 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
3234 } 3507 }
3235 3508
3236 { 3509 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
3240 3511
3241 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3513 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3515
3246 if ($info->{type} & 1) { 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3517 cf::face::set_type $idx, $info->{type};
3261 } else { 3518 } else {
3262 $RESOURCE{$name} = $info; 3519 $RESOURCE{$name} = $info; # unused
3263 } 3520 }
3264 3521
3265 cf::cede_to_tick; 3522 cf::cede_to_tick;
3266 } 3523 }
3267 } 3524 }
3268 3525
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3270 3527
3271 1 3528 1
3272} 3529}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
3293 3530
3294register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3295 my ($ns, $want) = @_; 3532 my ($ns, $want) = @_;
3296 3533
3297 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
3336sub reload_treasures { 3573sub reload_treasures {
3337 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3338 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3339} 3576}
3340 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3341sub reload_resources { 3598sub reload_resources {
3342 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3343 3600
3601 reload_exp_table;
3602 reload_materials;
3344 reload_facedata; 3603 reload_facedata;
3604 reload_sound;
3345 reload_archetypes; 3605 reload_archetypes;
3346 reload_regions; 3606 reload_regions;
3347 reload_treasures; 3607 reload_treasures;
3348 3608
3349 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358} 3610}
3359 3611
3360sub reload_config { 3612sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3613 trace "reloading config file...\n";
3362 or return;
3363 3614
3364 local $/; 3615 my $config = load_file "$CONFDIR/config";
3365 *CFG = YAML::Load <$fh>; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3366 3618
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3368 3620
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3371 3623
3372 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3395 3647
3396 seek $fh, 0, 0; 3648 seek $fh, 0, 0;
3397 print $fh $$; 3649 print $fh $$;
3398} 3650}
3399 3651
3652sub main_loop {
3653 trace "EV::loop starting\n";
3654 if (1) {
3655 EV::loop;
3656 }
3657 trace "EV::loop returned\n";
3658 goto &main_loop unless $REALLY_UNLOOP;
3659}
3660
3400sub main { 3661sub main {
3401 atomic; 3662 cf::init_globals; # initialise logging
3663
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668
3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3670
3403 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3673 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3674 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3675 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3676 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3677 })->prio (Coro::PRIO_MAX);
3410 }; 3678 };
3411 3679
3412 { 3680 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3681
3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3691 reload_resources;
3414 reload_config; 3692 reload_config;
3415 db_init; 3693 db_init;
3694
3695 cf::init_uuid;
3696 cf::init_signals;
3697 cf::init_skills;
3698
3699 cf::init_beforeplay;
3700
3701 atomic;
3702
3416 load_extensions; 3703 load_extensions;
3417 3704
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3705 utime time, time, $RUNTIMEFILE;
3422 3706
3423 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3708 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3710
3426 EV::loop; 3711 cf::_post_init 0;
3712 };
3713
3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3722 goto &main_loop;
3427} 3723}
3428 3724
3429############################################################################# 3725#############################################################################
3430# initialisation and cleanup 3726# initialisation and cleanup
3431 3727
3432# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3433BEGIN { 3729BEGIN {
3434 our %SIGWATCHER = (); 3730 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3732 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3733 cf::cleanup "SIG$signal";
3438 }; 3734 };
3439 } 3735 }
3440} 3736}
3441 3737
3442sub write_runtime_sync { 3738sub write_runtime_sync {
3739 my $t0 = AE::time;
3740
3443 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3445 3743
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3745
3448 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3449 3747
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3749 or return;
3452 3750
3453 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3468 or return; 3766 or return;
3469 3767
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3769 and return;
3472 3770
3473 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3772
3475 1 3773 1
3476} 3774}
3477 3775
3478our $uuid_lock; 3776our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3785 my $uuid = "$LOCALDIR/uuid";
3488 3786
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3787 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3788 or return;
3491 3789
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3790 my $value = uuid_seq uuid_cur;
3791
3792 unless ($value) {
3793 info "cowardly refusing to write zero uuid value!\n";
3794 return;
3795 }
3796
3797 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3798 $uuid_skip = 0;
3494 3799
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3800 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3801 and return;
3497 3802
3503 or return; 3808 or return;
3504 3809
3505 aio_rename "$uuid~", $uuid 3810 aio_rename "$uuid~", $uuid
3506 and return; 3811 and return;
3507 3812
3508 warn "uuid file written ($value).\n"; 3813 trace "uuid file written ($value).\n";
3509 3814
3510 1 3815 1
3511 3816
3512} 3817}
3513 3818
3519} 3824}
3520 3825
3521sub emergency_save() { 3826sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3523 3828
3524 warn "enter emergency perl save\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3525 3835
3526 cf::sync_job { 3836 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838
3527 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3845 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3847 $pl->save;
3536 } 3848 }
3537 warn "end emergency player save\n"; 3849 info "emergency_perl_save: end player save\n";
3538 3850
3539 warn "begin emergency map save\n"; 3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 info "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3856 $map->valid or next;
3543 $map->save; 3857 $map->save;
3544 } 3858 }
3545 warn "end emergency map save\n"; 3859 info "emergency_perl_save: end map save\n";
3546 3860
3547 warn "begin emergency database checkpoint\n"; 3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3863 info "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3550 3866
3551 warn "begin write uuid\n"; 3867 info "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3868 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3554 }; 3889 };
3555 3890
3556 warn "leave emergency perl save\n"; 3891 info "emergency_perl_save: leave\n";
3557} 3892}
3558 3893
3559sub post_cleanup { 3894sub post_cleanup {
3560 my ($make_core) = @_; 3895 my ($make_core) = @_;
3561 3896
3897 IO::AIO::flush;
3898
3562 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3563 if $make_core; 3900 if $make_core;
3564 3901
3565 my $fh = pidfile; 3902 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$; 3903 unlink $PIDFILE if <$fh> == $$;
3567} 3904}
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3925 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3926 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3928 }
3592 warn "cleared package #$pkg\n";#d#
3593} 3929}
3594
3595our $RELOAD; # how many times to reload
3596 3930
3597sub do_reload_perl() { 3931sub do_reload_perl() {
3598 # can/must only be called in main 3932 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3600 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3601 return; 3935 return;
3602 } 3936 }
3603 3937
3604 return if $RELOAD++; 3938 return if $RELOAD++;
3605 3939
3940 my $t1 = AE::time;
3941
3606 while ($RELOAD) { 3942 while ($RELOAD) {
3607 warn "reloading..."; 3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3608 3945
3609 warn "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3610 3947
3611 cf::sync_job { 3948 cf::sync_job {
3612 cf::write_runtime_sync; # external watchdog should not bark
3613 cf::emergency_save; 3949 #cf::emergency_save;
3614 cf::write_runtime_sync; # external watchdog should not bark
3615 3950
3616 warn "syncing database to disk";
3617 BDB::db_env_txn_checkpoint $DB_ENV;
3618
3619 # if anything goes wrong in here, we should simply crash as we already saved
3620
3621 warn "flushing outstanding aio requests";
3622 while (IO::AIO::nreqs || BDB::nreqs) {
3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3624 }
3625
3626 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3627 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3628 %EXT_CORO = (); 3953 %EXT_CORO = ();
3629 3954
3630 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3631 %COMMAND = (); 3956 %COMMAND = ();
3632 3957
3633 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3634 %EXTCMD = (); 3959 %EXTCMD = ();
3635 %EXTICMD = (); 3960 %EXTICMD = ();
3636 3961
3637 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3638 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3639 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3640 3965
3641 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3642 eval { 3967 eval {
3643 $cb->($pkg); 3968 $cb->($pkg);
3644 1 3969 1
3645 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3646 } 3971 }
3647 3972
3648 warn "... clearing $pkg"; 3973 trace "... clearing $pkg";
3649 clear_package $pkg; 3974 clear_package $pkg;
3650 } 3975 }
3651 3976
3652 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655 3980
3656 warn "... unloading $k"; 3981 trace "... unloading $k";
3657 delete $INC{$k}; 3982 delete $INC{$k};
3658 3983
3659 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3661 3986
3664 } 3989 }
3665 3990
3666 clear_package $k; 3991 clear_package $k;
3667 } 3992 }
3668 3993
3669 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3670 clear_package "safe::$_" 3995 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3997
3673 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 4001
3677 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3678 # and global variables created in xs 4003 # and global variables created in xs
3679 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3680 4005
3681 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3682 4007
3683 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3684 require cf; 4009 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3686 4011
3687 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3688 cf::reload_config; 4013 cf::reload_config;
3689 4014
3690 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3691 cf::load_extensions; 4016 cf::load_extensions;
3692 4017
4018 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3696 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
4025 }
3699 4026
3700 warn "leaving sync_job"; 4027 cf::_post_init 1;
4028
4029 trace "perl_reload: leaving sync_job";
3701 4030
3702 1 4031 1
3703 } or do { 4032 } or do {
3704 warn $@; 4033 error $@;
3705 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3706 }; 4035 };
3707 4036
3708 warn "reloaded";
3709 --$RELOAD; 4037 --$RELOAD;
3710 } 4038 }
4039
4040 $t1 = AE::time - $t1;
4041 info "perl_reload: completed in ${t1}s\n";
3711}; 4042};
3712 4043
3713our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3714 4045
3715sub reload_perl() { 4046sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 4047 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3718 4049
4050 $RELOAD_WATCHER ||= cf::async {
4051 Coro::AIO::aio_wait cache_extensions;
4052
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 4054 do_reload_perl;
3721 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
4056 };
3722 }; 4057 };
3723} 4058}
3724 4059
3725register_command "reload" => sub { 4060register_command "reload" => sub {
3726 my ($who, $arg) = @_; 4061 my ($who, $arg) = @_;
3732 reload_perl; 4067 reload_perl;
3733 }; 4068 };
3734 } 4069 }
3735}; 4070};
3736 4071
3737unshift @INC, $LIBDIR; 4072#############################################################################
3738 4073
3739my $bug_warning = 0; 4074my $bug_warning = 0;
3740 4075
3741our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3743 4078
3744sub wait_for_tick { 4079sub wait_for_tick() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4081
3747 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 4084 $signal->wait;
3750} 4085}
3751 4086
3752sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 4089
3755 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 4092 $signal->wait;
3758} 4093}
3764 return; 4099 return;
3765 } 4100 }
3766 4101
3767 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3768 4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 4108 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3773 write_runtime_sync 4110 write_runtime_sync
3774 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3775 }; 4112 };
3776 } 4113 }
3777 4114
3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3779 $sig->send; 4116 $sig->send;
3787 4124
3788 if (0) { 4125 if (0) {
3789 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3790 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3793 } 4130 }
3794 } 4131 }
3795} 4132}
3796 4133
3797{ 4134{
3798 # configure BDB 4135 # configure BDB
3799 4136
3800 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4139 $AnyEvent::BDB::WATCHER->priority (1);
3803 4140
3804 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3842 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3843 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3844 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3845} 4182}
3846 4183
3847my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3848 4186
3849sub _log_backtrace { 4187sub _log_backtrace {
3850 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3851 4189
3852 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3853 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3854 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3855 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3856 ++$_log_backtrace; 4198 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3858 async { 4200 async {
3859 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3860 4202
3880 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3881 --$_log_backtrace; 4223 --$_log_backtrace;
3882 }; 4224 };
3883 } else { 4225 } else {
3884 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3886 } 4228 }
3887} 4229}
3888 4230
3889# load additional modules 4231# load additional modules
3890use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3891 4234
3892END { cf::emergency_save } 4235END { cf::emergency_save }
3893 4236
38941 42371
3895 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines