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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 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";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 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 = 0;#d#
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;
127 143
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
132 153
133binmode STDOUT; 154binmode STDOUT;
134binmode STDERR; 155binmode STDERR;
135 156
136# read virtual server time, if available 157# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
141} 162}
142 163
164eval "sub TICK() { $TICK } 1" or die;
165
143mkdir $_ 166mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 168
146our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
147 170
148sub 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::"} };
149 187
150############################################################################# 188#############################################################################
151 189
152=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
153 191
200returns 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
201per 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.
202 240
203=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
204 242
205This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 245that call.
208 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
209=back 253=back
210 254
211=cut 255=cut
212 256
213BEGIN { 257$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 258 my $msg = join "", @_;
216 259
217 $msg .= "\n" 260 $msg .= "\n"
218 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
219 262
220 $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;
221 264
222 LOG llevError, $msg; 265 LOG llevError, $msg;
223 }; 266};
224}
225 267
226$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
228 270
229 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 275 return;#d#
232 }#d# 276 }#d#
233 277
234 # kill coroutine otherwise 278 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 279 Coro::terminate
237}; 280};
238
239$SIG{__DIE__} = sub { }; #d#?
240 281
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 299)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 301}
261 302
262$EV::DIED = sub { 303$EV::DIED = sub {
263 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
264}; 305};
265 306
266############################################################################# 307#############################################################################
267 308
268=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 347
307sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
309 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
310=item cf::lock_wait $string 365=item cf::lock_wait $string
311 366
312Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
313 368
314=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
315 370
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
319returned. 374returned.
320 375
321Locks 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
322deadlocked coro. 377deadlocked coro.
328 383
329Return 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.
330 385
331=cut 386=cut
332 387
333our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 389
336sub lock_wait($) { 390sub lock_wait($) {
337 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 392}
351 393
352sub lock_acquire($) { 394sub lock_acquire($) {
353 my ($key) = @_; 395 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 396}
367 397
368sub lock_active($) { 398sub lock_active($) {
369 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 400}
373 401
374sub freeze_mainloop { 402sub freeze_mainloop {
375 tick_inhibit_inc; 403 tick_inhibit_inc;
376 404
377 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
378} 406}
379 407
380=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
381 409
382Like 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
383get spread over timer. 411get spread over time.
384 412
385=cut 413=cut
386 414
387sub periodic($$) { 415sub periodic($$) {
388 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
405 433
406=cut 434=cut
407 435
408our @SLOT_QUEUE; 436our @SLOT_QUEUE;
409our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
410 439
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
414 443
415 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
416 446
417 while () { 447 while () {
418 next_job: 448 next_job:
449
419 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 451
421 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 456 $job->[2]->send;
425 Coro::cede; 457 Coro::cede;
426 goto next_job; 458 goto next_job;
427 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 461 }
429 } 462 }
430 463
431 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 467 $signal->wait;
435 } else { 468 } else {
469 $busy = 0;
436 Coro::schedule; 470 Coro::schedule;
437 } 471 }
438 } 472 }
439}; 473};
440 474
441sub get_slot($;$$) { 475sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
443 477
444 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
445 479
446 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
447 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
448 483
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
478 513
479sub sync_job(&) { 514sub sync_job(&) {
480 my ($job) = @_; 515 my ($job) = @_;
481 516
482 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
483 my $time = EV::time; 518 my $time = AE::time;
484 519
485 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
487 522
488 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
505 } else { 540 } else {
506 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
507 } 542 }
508 } 543 }
509 544
510 my $time = EV::time - $time; 545 my $time = AE::time - $time;
511 546
512 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
513 548
514 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
515 } else { 550 } else {
559 reset_signals; 594 reset_signals;
560 &$cb 595 &$cb
561 }, @args; 596 }, @args;
562 597
563 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 )
564} 610}
565 611
566=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
567 613
568=cut 614=cut
1149 1195
1150 sync_job { 1196 sync_job {
1151 if (length $$rdata) { 1197 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1153 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1154 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1155 1202
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1210 aio_close $fh;
1161 1211
1162 if (@$objs) { 1212 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1221 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1223 }
1171 } else { 1224 } else {
1172 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1173 } 1226 }
1174 1227
1175 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1232 } else {
1177 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1178 } 1234 }
1179 } else { 1235 } else {
1180 aio_unlink $filename; 1236 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1182 } 1238 }
1207 $av = $st->{objs}; 1263 $av = $st->{objs};
1208 } 1264 }
1209 1265
1210 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1213 1270
1214 ($data, $av) 1271 ($data, $av)
1215} 1272}
1216 1273
1217=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1273 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1274 1331
1275 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1276} 1333}
1277 1334
1335use File::Glob ();
1336
1278cf::player->attach ( 1337cf::player->attach (
1279 on_command => sub { 1338 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1281 1340
1282 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1283 or return; 1342 or return;
1284 1343
1314 1373
1315 cf::override; 1374 cf::override;
1316 }, 1375 },
1317); 1376);
1318 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1319sub load_extensions { 1391sub load_extensions {
1320 cf::sync_job { 1392 cf::sync_job {
1321 my %todo; 1393 my %todo;
1322 1394
1323 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1350 . "\n};\n1"; 1422 . "\n};\n1";
1351 1423
1352 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1353 } 1425 }
1354 1426
1427 my $pass = 0;
1355 my %done; 1428 my %done;
1356 while (%todo) { 1429 while (%todo) {
1357 my $progress; 1430 my $progress;
1358 1431
1432 ++$pass;
1433
1434 ext:
1359 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1437 next ext
1362 unless exists $done{$_}; 1438 unless exists $done{$_};
1363 } 1439 }
1364 1440
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1442
1367 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1447
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1449 if exists $v->{meta}{mandatory};
1375 1450
1376 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;
1377 } 1460 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1461 }
1383 1462
1384 skip: 1463 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1471 }
1388 }; 1472 };
1389} 1473}
1390 1474
1391############################################################################# 1475#############################################################################
1475 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1476 } 1560 }
1477 } 1561 }
1478} 1562}
1479 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
1480sub save($) { 1577sub save($) {
1481 my ($pl) = @_; 1578 my ($pl) = @_;
1482 1579
1483 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1484 1581
1489 1586
1490 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1492 1589
1493 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];
1494 1594
1495 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1596 cf::cede_to_tick;
1497} 1597}
1498 1598
1600 \@logins 1700 \@logins
1601} 1701}
1602 1702
1603=item $player->maps 1703=item $player->maps
1604 1704
1705=item cf::player::maps $login
1706
1605Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1606player. May block. 1708player. May block.
1607 1709
1608=cut 1710=cut
1609 1711
1671=cut 1773=cut
1672 1774
1673sub find_by_path($) { 1775sub find_by_path($) {
1674 my ($path) = @_; 1776 my ($path) = @_;
1675 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1676 my ($match, $specificity); 1780 my ($match, $specificity);
1677 1781
1678 for my $region (list) { 1782 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1680 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712 1816
1713 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1818 $self->_create_random_map (
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 1847
1744 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745} 1849}
1746 1850
1747# also paths starting with '/' 1851# also paths starting with '/'
1748$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749 1853
1750sub thawer_merge { 1854sub thawer_merge {
1751 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1752 1856
1753 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1851 1955
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1854} 1958}
1855 1959
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1960sub decay_objects {
1866 my ($self) = @_; 1961 my ($self) = @_;
1867 1962
1868 return if $self->{deny_reset}; 1963 return if $self->{deny_reset};
1869 1964
1951sub find { 2046sub find {
1952 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
1953 2048
1954 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
1955 2050
1956 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2053
1959 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
1964 or return; 2056 or return;
1965 2057
1966 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
1967 2059
1979 2071
1980 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1981 } 2073 }
1982} 2074}
1983 2075
1984sub pre_load { } 2076sub pre_load { }
1985sub post_load { } 2077#sub post_load { } # XS
1986 2078
1987sub load { 2079sub load {
1988 my ($self) = @_; 2080 my ($self) = @_;
1989 2081
1990 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2035 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2128 $self->decay_objects;
2037 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2038 $self->update_buttons; 2130 $self->update_buttons;
2039 cf::cede_to_tick; 2131 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick;
2042 $self->activate; 2132 $self->activate;
2043 } 2133 }
2044 2134
2045 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2049 } 2139 }
2050 2140
2051 $self->post_load; 2141 $self->post_load;
2052} 2142}
2053 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2054sub customise_for { 2147sub customise_for {
2055 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2056 2149
2057 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2151 if $self->per_player;
2074 or next; 2167 or next;
2075 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2076 or next; 2169 or next;
2077 $neigh->load; 2170 $neigh->load;
2078 2171
2172 # now find the diagonal neighbours
2079 push @neigh, 2173 push @neigh,
2080 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2081 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2082 } 2176 }
2083 2177
2135 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2136 2230
2137 () 2231 ()
2138} 2232}
2139 2233
2234# common code, used by both ->save and ->swapout
2140sub save { 2235sub _save {
2141 my ($self) = @_; 2236 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2237
2145 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2146 2239
2147 return unless $self->dirty; 2240 return unless $self->dirty;
2148 2241
2168 } else { 2261 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2263 }
2171} 2264}
2172 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2173sub swap_out { 2274sub swap_out {
2174 my ($self) = @_; 2275 my ($self) = @_;
2175 2276
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2278
2181 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2184 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2186 2333
2187 $self->deactivate; 2334 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2336 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2337
2235 $self->unlink_save; 2338 $self->unlink_save;
2236 $self->destroy; 2339 $self->destroy;
2237} 2340}
2238 2341
2246 2349
2247 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2248 2351
2249 $self->unlink_save; 2352 $self->unlink_save;
2250 2353
2251 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2359
2313 : normalise $_ 2416 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2418 ]
2316} 2419}
2317 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2318=back 2453=back
2319 2454
2320=head3 cf::object 2455=head3 cf::object
2321 2456
2322=cut 2457=cut
2387 2522
2388our $SAY_CHANNEL = { 2523our $SAY_CHANNEL = {
2389 id => "say", 2524 id => "say",
2390 title => "Map", 2525 title => "Map",
2391 reply => "say ", 2526 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2528};
2394 2529
2395our $CHAT_CHANNEL = { 2530our $CHAT_CHANNEL = {
2396 id => "chat", 2531 id => "chat",
2397 title => "Chat", 2532 title => "Chat",
2454 2589
2455Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2456 2591
2457The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2458for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2460map. 2595map.
2461 2596
2462Will never block. 2597Will never block.
2463 2598
2464=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2485sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2486 my ($self) = @_; 2621 my ($self) = @_;
2487 2622
2488 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2489 2624
2625 ++$self->{_link_recursion};
2626
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2628
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2494 2631
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2633}
2497 2634
2498sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2500 2637
2517 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2519 2656
2520 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2523 2660
2524 $map->load; 2661 $map->load;
2525 $map->load_neighbours; 2662 $map->load_neighbours;
2526 2663
2527 return unless $self->contr->active; 2664 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2665
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2533} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2534 2673
2674}
2675
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2677
2537Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2547 2688
2548our $GOTOGEN; 2689our $GOTOGEN;
2549 2690
2550sub cf::object::player::goto { 2691sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2552 2699
2553 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2702
2556 $self->enter_link; 2703 $self->enter_link;
2580 my $map = eval { 2727 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2582 2729
2583 if ($map) { 2730 if ($map) {
2584 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2733 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2735 }
2589 2736
2590 $map 2737 $map
2598 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2601 } 2748 }
2602 2749
2603 $done->() if $done; 2750 $done->($self) if $done;
2604 })->prio (1); 2751 })->prio (1);
2605} 2752}
2606 2753
2607=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2608 2755
2725 2872
2726 utf8::encode $text; 2873 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2728} 2875}
2729 2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2900}
2901
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 2903
2732Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2733client if neccessary. C<$type> should be a string identifying the type of 2905client if neccessary. C<$type> should be a string identifying the type of
2734the message, with C<log> being the default. If C<$color> is negative, suppress 2906the message, with C<log> being the default. If C<$color> is negative, suppress
2736 2908
2737=cut 2909=cut
2738 2910
2739# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2741 "c/identify" => { 2919 "c/identify" => {
2742 id => "infobox", 2920 id => "infobox",
2743 title => "Identify", 2921 title => "Identify",
2744 reply => undef, 2922 reply => undef,
2745 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2747 "c/examine" => { 2925 "c/examine" => {
2748 id => "infobox", 2926 id => "infobox",
2749 title => "Examine", 2927 title => "Examine",
2750 reply => undef, 2928 reply => undef,
2751 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 2936 },
2753 "c/book" => { 2937 "c/book" => {
2754 id => "infobox", 2938 id => "infobox",
2755 title => "Book", 2939 title => "Book",
2756 reply => undef, 2940 reply => undef,
2772 id => "infobox", 2956 id => "infobox",
2773 title => "Body Parts", 2957 title => "Body Parts",
2774 reply => undef, 2958 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2776 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2777 "c/skills" => { 2967 "c/skills" => {
2778 id => "infobox", 2968 id => "infobox",
2779 title => "Skills", 2969 title => "Skills",
2780 reply => undef, 2970 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2996 },
2783 "c/uptime" => { 2997 "c/uptime" => {
2784 id => "infobox", 2998 id => "infobox",
2785 title => "Uptime", 2999 title => "Uptime",
2786 reply => undef, 3000 reply => undef,
2796 id => "party", 3010 id => "party",
2797 title => "Party", 3011 title => "Party",
2798 reply => "gsay ", 3012 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 3013 tooltip => "Messages and chat related to your party",
2800 }, 3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2801); 3023);
2802 3024
2803sub cf::client::send_msg { 3025sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3027
2810 3032
2811 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2814 3036
2815 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2819 3039
2820 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3045 }
2827 3046
2828 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2829 } 3048 }
2830 3049
2831 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2832 3051
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3052 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2837 3055
2838 my $pkt = "msg " 3056 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3059 );
2842 3060
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3061 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3062}
2880 3063
2881=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2882 3065
2883Sends an ext event to the client. 3066Sends an ext event to the client.
2886 3069
2887sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2889 3072
2890 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3078 }
2896} 3079}
2897 3080
2898=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2899 3082
2903 3086
2904sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2906 3089
2907 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3093 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3096 }
2914} 3097}
2915 3098
2916=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2917 3100
3018 3201
3019 $coro 3202 $coro
3020} 3203}
3021 3204
3022cf::client->attach ( 3205cf::client->attach (
3023 on_destroy => sub { 3206 on_client_destroy => sub {
3024 my ($ns) = @_; 3207 my ($ns) = @_;
3025 3208
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3210 },
3028); 3211);
3044our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3045 3228
3046$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3047 3230
3048$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3051 sort time 3234 sort time
3052)); 3235));
3053 3236
3054# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3059 3242
3060 cf::object 3243 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3245 insert remove name archname title slaying race decrease split
3246 value
3063 3247
3064 cf::object::player 3248 cf::object::player
3065 player 3249 player
3066 3250
3067 cf::player 3251 cf::player
3073=cut 3257=cut
3074 3258
3075for ( 3259for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3082) { 3266) {
3083 no strict 'refs'; 3267 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 3287
3104 my $qcode = $code; 3288 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3107 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3108 local $_; 3295 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3296
3111 my $eval = 3297 my $eval =
3112 "do {\n" 3298 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3301 . $code
3116 . "\n}" 3302 . "\n}"
3117 ; 3303 ;
3118 3304
3305 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3122 3314
3123 if ($@) { 3315 if ($@) {
3124 warn "$@"; 3316 warn "$@";
3125 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3145=cut 3337=cut
3146 3338
3147sub register_script_function { 3339sub register_script_function {
3148 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3149 3341
3150 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3152} 3344}
3153 3345
3154=back 3346=back
3155 3347
3156=cut 3348=cut
3177 3369
3178 $facedata->{version} == 2 3370 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3372
3181 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3376 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3185 }; 3379 };
3186 cf::cede_to_tick; 3380 cf::cede_to_tick;
3187 3381
3188 { 3382 {
3189 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3387
3194 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3198 3392
3199 cf::cede_to_tick; 3393 cf::cede_to_tick;
3200 } 3394 }
3201 3395
3202 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3226 3420
3227 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3228 } 3422 }
3229 3423
3230 { 3424 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3234 3426
3235 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3430
3240 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3255 } else { 3433 } else {
3256 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3257 } 3435 }
3258 3436
3341 reload_treasures; 3519 reload_treasures;
3342 3520
3343 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3344} 3522}
3345 3523
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3528 or return;
3357 3529
3358 local $/; 3530 local $/;
3359 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3360 3532
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3534
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3537
3366 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3542 };
3371 warn $@ if $@; 3543 warn $@ if $@;
3372 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3373} 3547}
3374 3548
3375sub pidfile() { 3549sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
3389 3563
3390 seek $fh, 0, 0; 3564 seek $fh, 0, 0;
3391 print $fh $$; 3565 print $fh $$;
3392} 3566}
3393 3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3575}
3576
3394sub main { 3577sub main {
3395 atomic; 3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3586
3397 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3590 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3404 }; 3594 };
3405 3595
3406 { 3596 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3408 reload_config; 3608 reload_config;
3409 db_init; 3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3410 load_extensions; 3619 load_extensions;
3411 3620
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3621 utime time, time, $RUNTIMEFILE;
3416 3622
3417 # no (long-running) fork's whatsoever before this point(!) 3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3626
3420 EV::loop; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3421} 3634}
3422 3635
3423############################################################################# 3636#############################################################################
3424# initialisation and cleanup 3637# initialisation and cleanup
3425 3638
3426# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3427BEGIN { 3640BEGIN {
3428 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3432 }; 3645 };
3433 } 3646 }
3434} 3647}
3435 3648
3436sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3437 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3439 3654
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3656
3442 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3443 3658
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3660 or return;
3446 3661
3447 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3462 or return; 3677 or return;
3463 3678
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3680 and return;
3466 3681
3467 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3683
3469 1 3684 1
3470} 3685}
3471 3686
3472our $uuid_lock; 3687our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3482 3697
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3699 or return;
3485 3700
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3709 $uuid_skip = 0;
3488 3710
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3712 and return;
3491 3713
3513} 3735}
3514 3736
3515sub emergency_save() { 3737sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3517 3739
3518 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3519 3741
3520 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3521 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3754 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3756 $pl->save;
3530 } 3757 }
3531 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3532 3759
3533 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3763 $map->valid or next;
3537 $map->save; 3764 $map->save;
3538 } 3765 }
3539 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3540 3767
3541 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3544 3771
3545 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3773 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3548 }; 3775 };
3549 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3550 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3551} 3783}
3552 3784
3553sub post_cleanup { 3785sub post_cleanup {
3554 my ($make_core) = @_; 3786 my ($make_core) = @_;
3555 3787
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 3817 }
3586 warn "cleared package $pkg\n";#d#
3587} 3818}
3588 3819
3589sub do_reload_perl() { 3820sub do_reload_perl() {
3590 # can/must only be called in main 3821 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3592 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3593 return; 3824 return;
3594 } 3825 }
3595 3826
3596 return if $RELOAD++; 3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3597 3830
3598 while ($RELOAD) { 3831 while ($RELOAD) {
3599 warn "reloading..."; 3832 warn "reloading...";
3600 3833
3601 warn "entering sync_job"; 3834 warn "entering sync_job";
3662 clear_package "safe::$_" 3895 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3897
3665 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3901
3669 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3903 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3672 3905
3673 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3674 3907
3675 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3676 require cf; 3909 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3678 3911
3679 warn "loading config and database again"; 3912 warn "loading config and database again";
3680 cf::reload_config; 3913 cf::reload_config;
3681 3914
3682 warn "loading extensions"; 3915 warn "loading extensions";
3683 cf::load_extensions; 3916 cf::load_extensions;
3684 3917
3918 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3929
3692 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3693 3931
3694 1 3932 1
3695 } or do { 3933 } or do {
3698 }; 3936 };
3699 3937
3700 warn "reloaded"; 3938 warn "reloaded";
3701 --$RELOAD; 3939 --$RELOAD;
3702 } 3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3703}; 3944};
3704 3945
3705our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3706 3947
3707sub reload_perl() { 3948sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3710 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3956 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3714 }; 3959 };
3715} 3960}
3716 3961
3717register_command "reload" => sub { 3962register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3732 3977
3733our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3735 3980
3736sub wait_for_tick { 3981sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3983
3739 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3986 $signal->wait;
3742} 3987}
3743 3988
3744sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3991
3747 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3994 $signal->wait;
3750} 3995}
3755 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3756 return; 4001 return;
3757 } 4002 }
3758 4003
3759 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 4007
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4010 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3787} 4034}
3788 4035
3789{ 4036{
3790 # configure BDB 4037 # configure BDB
3791 4038
3792 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3795 4042
3796 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 4125 }
3879} 4126}
3880 4127
3881# load additional modules 4128# load additional modules
3882use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3883 4131
3884END { cf::emergency_save } 4132END { cf::emergency_save }
3885 4133
38861 41341
3887 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines