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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines