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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 149our @POST_INIT;
134 150
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
136 153
137binmode STDOUT; 154binmode STDOUT;
138binmode STDERR; 155binmode STDERR;
139 156
140# read virtual server time, if available 157# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
145} 162}
146 163
164eval "sub TICK() { $TICK } 1" or die;
165
147mkdir $_ 166mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 168
150our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
151 170
152sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
153 187
154############################################################################# 188#############################################################################
155 189
156=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
157 191
204returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
205per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206 240
207=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
208 242
209This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
210C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
211that call. 245that call.
212 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
213=back 253=back
214 254
215=cut 255=cut
216 256
217BEGIN { 257$Coro::State::WARNHOOK = sub {
218 *CORE::GLOBAL::warn = sub {
219 my $msg = join "", @_; 258 my $msg = join "", @_;
220 259
221 $msg .= "\n" 260 $msg .= "\n"
222 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
223 262
224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225 264
226 LOG llevError, $msg; 265 LOG llevError, $msg;
227 }; 266};
228}
229 267
230$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
232 270
233 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 275 return;#d#
236 }#d# 276 }#d#
237 277
238 # kill coroutine otherwise 278 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 279 Coro::terminate
241}; 280};
242
243$SIG{__DIE__} = sub { }; #d#?
244 281
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 299)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 301}
265 302
266$EV::DIED = sub { 303$EV::DIED = sub {
267 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
268}; 305};
269 306
270############################################################################# 307#############################################################################
271 308
272=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
330Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
331 368
332=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
333 370
334Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
337returned. 374returned.
338 375
339Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 377deadlocked coro.
346 383
347Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
348 385
349=cut 386=cut
350 387
351our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 389
354sub lock_wait($) { 390sub lock_wait($) {
355 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 392}
369 393
370sub lock_acquire($) { 394sub lock_acquire($) {
371 my ($key) = @_; 395 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 396}
385 397
386sub lock_active($) { 398sub lock_active($) {
387 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 400}
391 401
392sub freeze_mainloop { 402sub freeze_mainloop {
393 tick_inhibit_inc; 403 tick_inhibit_inc;
394 404
395 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
396} 406}
397 407
398=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
399 409
400Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 411get spread over time.
402 412
403=cut 413=cut
404 414
405sub periodic($$) { 415sub periodic($$) {
406 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
423 433
424=cut 434=cut
425 435
426our @SLOT_QUEUE; 436our @SLOT_QUEUE;
427our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
428 439
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
432 443
433 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
434 446
435 while () { 447 while () {
436 next_job: 448 next_job:
449
437 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 451
439 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 456 $job->[2]->send;
443 Coro::cede; 457 Coro::cede;
444 goto next_job; 458 goto next_job;
445 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 461 }
447 } 462 }
448 463
449 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 467 $signal->wait;
453 } else { 468 } else {
469 $busy = 0;
454 Coro::schedule; 470 Coro::schedule;
455 } 471 }
456 } 472 }
457}; 473};
458 474
459sub get_slot($;$$) { 475sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
461 477
462 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
463 479
464 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
465 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
466 483
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
496 513
497sub sync_job(&) { 514sub sync_job(&) {
498 my ($job) = @_; 515 my ($job) = @_;
499 516
500 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 518 my $time = AE::time;
502 519
503 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
505 522
506 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
523 } else { 540 } else {
524 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
525 } 542 }
526 } 543 }
527 544
528 my $time = EV::time - $time; 545 my $time = AE::time - $time;
529 546
530 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
531 548
532 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
533 } else { 550 } else {
577 reset_signals; 594 reset_signals;
578 &$cb 595 &$cb
579 }, @args; 596 }, @args;
580 597
581 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
582} 610}
583 611
584=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
585 613
586=cut 614=cut
1167 1195
1168 sync_job { 1196 sync_job {
1169 if (length $$rdata) { 1197 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1173 1202
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1178 aio_close $fh; 1210 aio_close $fh;
1179 1211
1180 if (@$objs) { 1212 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1186 aio_close $fh; 1221 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1223 }
1189 } else { 1224 } else {
1190 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1194 1229
1195 $filename =~ s%/[^/]+$%%; 1230 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1231 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1232 } else {
1198 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1199 } 1234 }
1200 } else { 1235 } else {
1201 aio_unlink $filename; 1236 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1203 } 1238 }
1228 $av = $st->{objs}; 1263 $av = $st->{objs};
1229 } 1264 }
1230 1265
1231 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1234 1270
1235 ($data, $av) 1271 ($data, $av)
1236} 1272}
1237 1273
1238=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1297} 1333}
1298 1334
1299use File::Glob (); 1335use File::Glob ();
1300 1336
1301cf::player->attach ( 1337cf::player->attach (
1302 on_command => sub { 1338 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1304 1340
1305 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1306 or return; 1342 or return;
1307 1343
1341 1377
1342# "readahead" all extensions 1378# "readahead" all extensions
1343sub cache_extensions { 1379sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1380 my $grp = IO::AIO::aio_group;
1345 1381
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1383 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1385 }
1350 }; 1386 };
1351 1387
1386 . "\n};\n1"; 1422 . "\n};\n1";
1387 1423
1388 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1389 } 1425 }
1390 1426
1427 my $pass = 0;
1391 my %done; 1428 my %done;
1392 while (%todo) { 1429 while (%todo) {
1393 my $progress; 1430 my $progress;
1394 1431
1432 ++$pass;
1433
1434 ext:
1395 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1437 next ext
1398 unless exists $done{$_}; 1438 unless exists $done{$_};
1399 } 1439 }
1400 1440
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1442
1403 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1447
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1449 if exists $v->{meta}{mandatory};
1411 1450
1412 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1413 } 1460 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1461 }
1419 1462
1420 skip: 1463 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1423 } 1471 }
1424 }; 1472 };
1425} 1473}
1426 1474
1427############################################################################# 1475#############################################################################
1511 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1512 } 1560 }
1513 } 1561 }
1514} 1562}
1515 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1516sub save($) { 1577sub save($) {
1517 my ($pl) = @_; 1578 my ($pl) = @_;
1518 1579
1519 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1520 1581
1525 1586
1526 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1528 1589
1529 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1530 1594
1531 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1596 cf::cede_to_tick;
1533} 1597}
1534 1598
1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1572 1636
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1574 $pl->deactivate; 1638 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1578 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1579 1642
1580 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1636 \@logins 1699 \@logins
1637} 1700}
1638 1701
1639=item $player->maps 1702=item $player->maps
1640 1703
1704=item cf::player::maps $login
1705
1641Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1642player. May block. 1707player. May block.
1643 1708
1644=cut 1709=cut
1645 1710
1707=cut 1772=cut
1708 1773
1709sub find_by_path($) { 1774sub find_by_path($) {
1710 my ($path) = @_; 1775 my ($path) = @_;
1711 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1712 my ($match, $specificity); 1779 my ($match, $specificity);
1713 1780
1714 for my $region (list) { 1781 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748 1815
1749 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1817 $self->_create_random_map (
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1779 1846
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1848}
1782 1849
1783# also paths starting with '/' 1850# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1852
1786sub thawer_merge { 1853sub thawer_merge {
1787 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1788 1855
1789 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1887 1954
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1890} 1957}
1891 1958
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 1959sub decay_objects {
1902 my ($self) = @_; 1960 my ($self) = @_;
1903 1961
1904 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1905 1963
1987sub find { 2045sub find {
1988 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1989 2047
1990 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1991 2049
1992 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2052
1995 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2000 or return; 2055 or return;
2001 2056
2002 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2003 2058
2015 2070
2016 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2017 } 2072 }
2018} 2073}
2019 2074
2020sub pre_load { } 2075sub pre_load { }
2021sub post_load { } 2076#sub post_load { } # XS
2022 2077
2023sub load { 2078sub load {
2024 my ($self) = @_; 2079 my ($self) = @_;
2025 2080
2026 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2071 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2127 $self->decay_objects;
2073 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2074 $self->update_buttons; 2129 $self->update_buttons;
2075 cf::cede_to_tick; 2130 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2131 $self->activate;
2079 } 2132 }
2080 2133
2081 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2085 } 2138 }
2086 2139
2087 $self->post_load; 2140 $self->post_load;
2088} 2141}
2089 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2090sub customise_for { 2146sub customise_for {
2091 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2092 2148
2093 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2150 if $self->per_player;
2110 or next; 2166 or next;
2111 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2112 or next; 2168 or next;
2113 $neigh->load; 2169 $neigh->load;
2114 2170
2171 # now find the diagonal neighbours
2115 push @neigh, 2172 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 } 2175 }
2119 2176
2171 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2172 2229
2173 () 2230 ()
2174} 2231}
2175 2232
2233# common code, used by both ->save and ->swapout
2176sub save { 2234sub _save {
2177 my ($self) = @_; 2235 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2236
2181 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2182 2238
2183 return unless $self->dirty; 2239 return unless $self->dirty;
2184 2240
2204 } else { 2260 } else {
2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206 } 2262 }
2207} 2263}
2208 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2209sub swap_out { 2273sub swap_out {
2210 my ($self) = @_; 2274 my ($self) = @_;
2211 2275
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2277
2217 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2219 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2220 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2221 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2222 2332
2223 $self->deactivate; 2333 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2335 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2336
2271 $self->unlink_save; 2337 $self->unlink_save;
2272 $self->destroy; 2338 $self->destroy;
2273} 2339}
2274 2340
2282 2348
2283 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2284 2350
2285 $self->unlink_save; 2351 $self->unlink_save;
2286 2352
2287 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2358
2349 : normalise $_ 2415 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2417 ]
2352} 2418}
2353 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2354=back 2452=back
2355 2453
2356=head3 cf::object 2454=head3 cf::object
2357 2455
2358=cut 2456=cut
2423 2521
2424our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2425 id => "say", 2523 id => "say",
2426 title => "Map", 2524 title => "Map",
2427 reply => "say ", 2525 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2527};
2430 2528
2431our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2432 id => "chat", 2530 id => "chat",
2433 title => "Chat", 2531 title => "Chat",
2490 2588
2491Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2492 2590
2493The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2496map. 2594map.
2497 2595
2498Will never block. 2596Will never block.
2499 2597
2500=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2522 my ($self) = @_; 2620 my ($self) = @_;
2523 2621
2524 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2525 2623
2624 ++$self->{_link_recursion};
2625
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2627
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2530 2630
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2632}
2533 2633
2534sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2536 2636
2553 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2555 2655
2556 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2559 2659
2560 $map->load; 2660 $map->load;
2561 $map->load_neighbours; 2661 $map->load_neighbours;
2562 2662
2563 return unless $self->contr->active; 2663 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2664
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2569} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2570 2672
2673}
2674
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572 2676
2573Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2574her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2575that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2576the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2583 2687
2584our $GOTOGEN; 2688our $GOTOGEN;
2585 2689
2586sub cf::object::player::goto { 2690sub cf::object::player::goto {
2587 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2588 2698
2589 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2701
2592 $self->enter_link; 2702 $self->enter_link;
2616 my $map = eval { 2726 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2618 2728
2619 if ($map) { 2729 if ($map) {
2620 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2732 } else {
2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624 } 2734 }
2625 2735
2626 $map 2736 $map
2634 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2637 } 2747 }
2638 2748
2639 $done->() if $done; 2749 $done->($self) if $done;
2640 })->prio (1); 2750 })->prio (1);
2641} 2751}
2642 2752
2643=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2644 2754
2761 2871
2762 utf8::encode $text; 2872 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2764} 2874}
2765 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2902
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2769client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2770the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2772 2907
2773=cut 2908=cut
2774 2909
2775# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2777 "c/identify" => { 2918 "c/identify" => {
2778 id => "infobox", 2919 id => "infobox",
2779 title => "Identify", 2920 title => "Identify",
2780 reply => undef, 2921 reply => undef,
2781 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2783 "c/examine" => { 2924 "c/examine" => {
2784 id => "infobox", 2925 id => "infobox",
2785 title => "Examine", 2926 title => "Examine",
2786 reply => undef, 2927 reply => undef,
2787 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2935 },
2789 "c/book" => { 2936 "c/book" => {
2790 id => "infobox", 2937 id => "infobox",
2791 title => "Book", 2938 title => "Book",
2792 reply => undef, 2939 reply => undef,
2808 id => "infobox", 2955 id => "infobox",
2809 title => "Body Parts", 2956 title => "Body Parts",
2810 reply => undef, 2957 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2812 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2813 "c/skills" => { 2966 "c/skills" => {
2814 id => "infobox", 2967 id => "infobox",
2815 title => "Skills", 2968 title => "Skills",
2816 reply => undef, 2969 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2818 }, 2995 },
2819 "c/uptime" => { 2996 "c/uptime" => {
2820 id => "infobox", 2997 id => "infobox",
2821 title => "Uptime", 2998 title => "Uptime",
2822 reply => undef, 2999 reply => undef,
2832 id => "party", 3009 id => "party",
2833 title => "Party", 3010 title => "Party",
2834 reply => "gsay ", 3011 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2836 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2837); 3022);
2838 3023
2839sub cf::client::send_msg { 3024sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3026
2846 3031
2847 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2850 3035
2851 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2855 3038
2856 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3044 }
2863 3045
2864 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2865 } 3047 }
2866 3048
2867 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2868 3050
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3051 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2873 3054
2874 my $pkt = "msg " 3055 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3058 );
2878 3059
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3061}
2916 3062
2917=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2918 3064
2919Sends an ext event to the client. 3065Sends an ext event to the client.
2922 3068
2923sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2925 3071
2926 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3077 }
2932} 3078}
2933 3079
2934=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2935 3081
2939 3085
2940sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2942 3088
2943 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3092 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3095 }
2950} 3096}
2951 3097
2952=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2953 3099
3054 3200
3055 $coro 3201 $coro
3056} 3202}
3057 3203
3058cf::client->attach ( 3204cf::client->attach (
3059 on_destroy => sub { 3205 on_client_destroy => sub {
3060 my ($ns) = @_; 3206 my ($ns) = @_;
3061 3207
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3209 },
3064); 3210);
3080our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3081 3227
3082$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3083 3229
3084$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3087 sort time 3233 sort time
3088)); 3234));
3089 3235
3090# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3095 3241
3096 cf::object 3242 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3099 3246
3100 cf::object::player 3247 cf::object::player
3101 player 3248 player
3102 3249
3103 cf::player 3250 cf::player
3109=cut 3256=cut
3110 3257
3111for ( 3258for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3118) { 3265) {
3119 no strict 'refs'; 3266 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3139 3286
3140 my $qcode = $code; 3287 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3143 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3144 local $_; 3294 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3295
3147 my $eval = 3296 my $eval =
3148 "do {\n" 3297 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3300 . $code
3152 . "\n}" 3301 . "\n}"
3153 ; 3302 ;
3154 3303
3304 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3158 3313
3159 if ($@) { 3314 if ($@) {
3160 warn "$@"; 3315 warn "$@";
3161 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3181=cut 3336=cut
3182 3337
3183sub register_script_function { 3338sub register_script_function {
3184 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3185 3340
3186 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3188} 3343}
3189 3344
3190=back 3345=back
3191 3346
3192=cut 3347=cut
3213 3368
3214 $facedata->{version} == 2 3369 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3371
3217 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3375 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3221 }; 3378 };
3222 cf::cede_to_tick; 3379 cf::cede_to_tick;
3223 3380
3224 { 3381 {
3225 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3386
3230 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3391
3235 cf::cede_to_tick; 3392 cf::cede_to_tick;
3236 } 3393 }
3237 3394
3238 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3262 3419
3263 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3264 } 3421 }
3265 3422
3266 { 3423 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3270 3425
3271 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3429
3276 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3291 } else { 3432 } else {
3292 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3293 } 3434 }
3294 3435
3295 cf::cede_to_tick; 3436 cf::cede_to_tick;
3296 } 3437 }
3297 } 3438 }
3298 3439
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3441
3301 1 3442 1
3302} 3443}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3444
3324register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3326 3447
3327 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3487sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3369} 3490}
3370 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3371sub reload_resources { 3515sub reload_resources {
3372 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3373 3517
3374 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3375 reload_archetypes; 3520 reload_archetypes;
3376 reload_regions; 3521 reload_regions;
3377 reload_treasures; 3522 reload_treasures;
3378 3523
3379 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3380} 3525}
3381 3526
3382sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3531 or return;
3385 3532
3386 local $/; 3533 local $/;
3387 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3388 3535
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3537
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3540
3394 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3545 };
3399 warn $@ if $@; 3546 warn $@ if $@;
3400 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3401} 3550}
3402 3551
3403sub pidfile() { 3552sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
3417 3566
3418 seek $fh, 0, 0; 3567 seek $fh, 0, 0;
3419 print $fh $$; 3568 print $fh $$;
3420} 3569}
3421 3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3578}
3579
3422sub main { 3580sub main {
3423 cf::init_globals; # initialise logging 3581 cf::init_globals; # initialise logging
3424 3582
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3587
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3589
3438 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3445 }; 3597 };
3446 3598
3447 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3448 3600
3449 cf::sync_job { 3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3450 reload_resources; 3610 reload_resources;
3451 reload_config; 3611 reload_config;
3452 db_init; 3612 db_init;
3453 3613
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3614 cf::init_uuid;
3457 cf::init_signals; 3615 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3616 cf::init_skills;
3460 3617
3461 cf::init_beforeplay; 3618 cf::init_beforeplay;
3462 3619
3463 atomic; 3620 atomic;
3465 load_extensions; 3622 load_extensions;
3466 3623
3467 utime time, time, $RUNTIMEFILE; 3624 utime time, time, $RUNTIMEFILE;
3468 3625
3469 # no (long-running) fork's whatsoever before this point(!) 3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3629
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3631 };
3474 3632
3475 EV::loop; 3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3476} 3637}
3477 3638
3478############################################################################# 3639#############################################################################
3479# initialisation and cleanup 3640# initialisation and cleanup
3480 3641
3481# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3482BEGIN { 3643BEGIN {
3483 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3487 }; 3648 };
3488 } 3649 }
3489} 3650}
3490 3651
3491sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3492 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3494 3657
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3659
3497 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3498 3661
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3663 or return;
3501 3664
3502 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3517 or return; 3680 or return;
3518 3681
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3683 and return;
3521 3684
3522 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3686
3524 1 3687 1
3525} 3688}
3526 3689
3527our $uuid_lock; 3690our $uuid_lock;
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3820 }
3658 warn "cleared package $pkg\n";#d#
3659} 3821}
3660 3822
3661sub do_reload_perl() { 3823sub do_reload_perl() {
3662 # can/must only be called in main 3824 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3664 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3665 return; 3827 return;
3666 } 3828 }
3667 3829
3668 return if $RELOAD++; 3830 return if $RELOAD++;
3669 3831
3670 my $t1 = EV::time; 3832 my $t1 = AE::time;
3671 3833
3672 while ($RELOAD) { 3834 while ($RELOAD) {
3673 warn "reloading..."; 3835 warn "reloading...";
3674 3836
3675 warn "entering sync_job"; 3837 warn "entering sync_job";
3736 clear_package "safe::$_" 3898 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3900
3739 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3904
3743 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3906 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3746 3908
3747 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3748 3910
3749 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3750 require cf; 3912 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3752 3914
3753 warn "loading config and database again"; 3915 warn "loading config and database again";
3754 cf::reload_config; 3916 cf::reload_config;
3755 3917
3756 warn "loading extensions"; 3918 warn "loading extensions";
3778 3940
3779 warn "reloaded"; 3941 warn "reloaded";
3780 --$RELOAD; 3942 --$RELOAD;
3781 } 3943 }
3782 3944
3783 $t1 = EV::time - $t1; 3945 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 3946 warn "reload completed in ${t1}s\n";
3785}; 3947};
3786 3948
3787our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3788 3950
3791 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3792 3954
3793 $RELOAD_WATCHER ||= cf::async { 3955 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 3956 Coro::AIO::aio_wait cache_extensions;
3795 3957
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 3959 do_reload_perl;
3798 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3799 }; 3961 };
3800 }; 3962 };
3801} 3963}
3818 3980
3819our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3821 3983
3822sub wait_for_tick { 3984sub wait_for_tick {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 3986
3825 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 3989 $signal->wait;
3828} 3990}
3829 3991
3830sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 3994
3833 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 3997 $signal->wait;
3836} 3998}
3841 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3842 return; 4004 return;
3843 } 4005 }
3844 4006
3845 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3846 4010
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4013 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3873} 4037}
3874 4038
3875{ 4039{
3876 # configure BDB 4040 # configure BDB
3877 4041
3878 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3881 4045
3882 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4128 }
3965} 4129}
3966 4130
3967# load additional modules 4131# load additional modules
3968use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3969 4134
3970END { cf::emergency_save } 4135END { cf::emergency_save }
3971 4136
39721 41371
3973 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines