ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines