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.450 by root, Mon Sep 22 01:33:09 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 = ();
81our %EXTCMD = (); 87our %EXTCMD = ();
82our %EXTICMD = (); 88our %EXTICMD = ();
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 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 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 392}
350 393
351sub lock_acquire($) { 394sub lock_acquire($) {
352 my ($key) = @_; 395 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 396}
366 397
367sub lock_active($) { 398sub lock_active($) {
368 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 400}
372 401
373sub freeze_mainloop { 402sub freeze_mainloop {
374 tick_inhibit_inc; 403 tick_inhibit_inc;
375 404
376 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
377} 406}
378 407
379=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
380 409
381Like 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
382get spread over timer. 411get spread over time.
383 412
384=cut 413=cut
385 414
386sub periodic($$) { 415sub periodic($$) {
387 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
404 433
405=cut 434=cut
406 435
407our @SLOT_QUEUE; 436our @SLOT_QUEUE;
408our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
409 439
410$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
413 443
414 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
415 446
416 while () { 447 while () {
417 next_job: 448 next_job:
449
418 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
419 if ($avail > 0.01) { 451
420 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
422 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send; 456 $job->[2]->send;
424 Coro::cede; 457 Coro::cede;
425 goto next_job; 458 goto next_job;
426 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
427 } 461 }
428 } 462 }
429 463
430 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
431 # 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
432 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait; 467 $signal->wait;
434 } else { 468 } else {
469 $busy = 0;
435 Coro::schedule; 470 Coro::schedule;
436 } 471 }
437 } 472 }
438}; 473};
439 474
440sub get_slot($;$$) { 475sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
442 477
443 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
444 479
445 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
446 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
447 483
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
477 513
478sub sync_job(&) { 514sub sync_job(&) {
479 my ($job) = @_; 515 my ($job) = @_;
480 516
481 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
482 my $time = EV::time; 518 my $time = AE::time;
483 519
484 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
485 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
486 522
487 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
504 } else { 540 } else {
505 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
506 } 542 }
507 } 543 }
508 544
509 my $time = EV::time - $time; 545 my $time = AE::time - $time;
510 546
511 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
512 548
513 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
514 } else { 550 } else {
558 reset_signals; 594 reset_signals;
559 &$cb 595 &$cb
560 }, @args; 596 }, @args;
561 597
562 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 )
563} 610}
564 611
565=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
566 613
567=cut 614=cut
1148 1195
1149 sync_job { 1196 sync_job {
1150 if (length $$rdata) { 1197 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1152 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1153 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1154 1202
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 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 }
1159 aio_close $fh; 1210 aio_close $fh;
1160 1211
1161 if (@$objs) { 1212 if (@$objs) {
1162 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) {
1163 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1166 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 }
1167 aio_close $fh; 1221 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1223 }
1170 } else { 1224 } else {
1171 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1172 } 1226 }
1173 1227
1174 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1232 } else {
1176 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1177 } 1234 }
1178 } else { 1235 } else {
1179 aio_unlink $filename; 1236 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1181 } 1238 }
1206 $av = $st->{objs}; 1263 $av = $st->{objs};
1207 } 1264 }
1208 1265
1209 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1210 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1211 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1212 1270
1213 ($data, $av) 1271 ($data, $av)
1214} 1272}
1215 1273
1216=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1272 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1273 1331
1274 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1275} 1333}
1276 1334
1335use File::Glob ();
1336
1277cf::player->attach ( 1337cf::player->attach (
1278 on_command => sub { 1338 on_unknown_command => sub {
1279 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1280 1340
1281 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1282 or return; 1342 or return;
1283 1343
1313 1373
1314 cf::override; 1374 cf::override;
1315 }, 1375 },
1316); 1376);
1317 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
1318sub load_extensions { 1391sub load_extensions {
1319 cf::sync_job { 1392 cf::sync_job {
1320 my %todo; 1393 my %todo;
1321 1394
1322 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1349 . "\n};\n1"; 1422 . "\n};\n1";
1350 1423
1351 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1352 } 1425 }
1353 1426
1427 my $pass = 0;
1354 my %done; 1428 my %done;
1355 while (%todo) { 1429 while (%todo) {
1356 my $progress; 1430 my $progress;
1357 1431
1432 ++$pass;
1433
1434 ext:
1358 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1359 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1360 goto skip 1437 next ext
1361 unless exists $done{$_}; 1438 unless exists $done{$_};
1362 } 1439 }
1363 1440
1364 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1365 1442
1366 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1367 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1368 : "$v->{base}: extension inactive.\n";
1369 1447
1370 if (exists $v->{meta}{mandatory}) {
1371 warn $msg;
1372 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1373 } 1449 if exists $v->{meta}{mandatory};
1374 1450
1375 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;
1376 } 1460 }
1377
1378 $done{$k} = delete $todo{$k};
1379 push @EXTS, $v->{pkg};
1380 $progress = 1;
1381 } 1461 }
1382 1462
1383 skip: 1463 unless ($progress) {
1384 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1385 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 }
1386 } 1471 }
1387 }; 1472 };
1388} 1473}
1389 1474
1390############################################################################# 1475#############################################################################
1444 1529
1445sub exists($) { 1530sub exists($) {
1446 my ($login) = @_; 1531 my ($login) = @_;
1447 1532
1448 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1450} 1535}
1451 1536
1452sub find($) { 1537sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1539 my $login = $_[0];
1474 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1475 } 1560 }
1476 } 1561 }
1477} 1562}
1478 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
1479sub save($) { 1577sub save($) {
1480 my ($pl) = @_; 1578 my ($pl) = @_;
1481 1579
1482 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1483 1581
1488 1586
1489 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1490 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1491 1589
1492 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];
1493 1594
1494 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1495 cf::cede_to_tick; 1596 cf::cede_to_tick;
1496} 1597}
1497 1598
1599 \@logins 1700 \@logins
1600} 1701}
1601 1702
1602=item $player->maps 1703=item $player->maps
1603 1704
1705=item cf::player::maps $login
1706
1604Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1605player. May block. 1708player. May block.
1606 1709
1607=cut 1710=cut
1608 1711
1670=cut 1773=cut
1671 1774
1672sub find_by_path($) { 1775sub find_by_path($) {
1673 my ($path) = @_; 1776 my ($path) = @_;
1674 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1675 my ($match, $specificity); 1780 my ($match, $specificity);
1676 1781
1677 for my $region (list) { 1782 for my $region (list) {
1678 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1679 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
1710 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
1711 1816
1712 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1818 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1717 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1718 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1719 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1720 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1742 1847
1743 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1744} 1849}
1745 1850
1746# also paths starting with '/' 1851# also paths starting with '/'
1747$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1748 1853
1749sub thawer_merge { 1854sub thawer_merge {
1750 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1751 1856
1752 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1850 1955
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1853} 1958}
1854 1959
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1960sub decay_objects {
1865 my ($self) = @_; 1961 my ($self) = @_;
1866 1962
1867 return if $self->{deny_reset}; 1963 return if $self->{deny_reset};
1868 1964
1950sub find { 2046sub find {
1951 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
1952 2048
1953 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
1954 2050
1955 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
1957 2053
1958 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
1963 or return; 2056 or return;
1964 2057
1965 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
1966 2059
1978 2071
1979 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1980 } 2073 }
1981} 2074}
1982 2075
1983sub pre_load { } 2076sub pre_load { }
1984sub post_load { } 2077#sub post_load { } # XS
1985 2078
1986sub load { 2079sub load {
1987 my ($self) = @_; 2080 my ($self) = @_;
1988 2081
1989 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2034 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2128 $self->decay_objects;
2036 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2037 $self->update_buttons; 2130 $self->update_buttons;
2038 cf::cede_to_tick; 2131 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2132 $self->activate;
2042 } 2133 }
2043 2134
2044 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2048 } 2139 }
2049 2140
2050 $self->post_load; 2141 $self->post_load;
2051} 2142}
2052 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
2053sub customise_for { 2147sub customise_for {
2054 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2055 2149
2056 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2151 if $self->per_player;
2073 or next; 2167 or next;
2074 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2075 or next; 2169 or next;
2076 $neigh->load; 2170 $neigh->load;
2077 2171
2172 # now find the diagonal neighbours
2078 push @neigh, 2173 push @neigh,
2079 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2080 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2081 } 2176 }
2082 2177
2134 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2135 2230
2136 () 2231 ()
2137} 2232}
2138 2233
2234# common code, used by both ->save and ->swapout
2139sub save { 2235sub _save {
2140 my ($self) = @_; 2236 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2237
2144 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2145 2239
2146 return unless $self->dirty; 2240 return unless $self->dirty;
2147 2241
2167 } else { 2261 } else {
2168 $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);
2169 } 2263 }
2170} 2264}
2171 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2172sub swap_out { 2274sub swap_out {
2173 my ($self) = @_; 2275 my ($self) = @_;
2174 2276
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2278
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2183 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2184 $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};
2185 2333
2186 $self->deactivate; 2334 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear; 2336 $self->clear;
2189}
2190
2191sub reset_at {
2192 my ($self) = @_;
2193
2194 # TODO: safety, remove and allow resettable per-player maps
2195 return 1e99 if $self->{deny_reset};
2196
2197 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2198 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2199
2200 $time + $to
2201}
2202
2203sub should_reset {
2204 my ($self) = @_;
2205
2206 $self->reset_at <= $cf::RUNTIME
2207}
2208
2209sub reset {
2210 my ($self) = @_;
2211
2212 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213
2214 return if $self->players;
2215
2216 warn "resetting map ", $self->path;
2217
2218 $self->in_memory (cf::MAP_SWAPPED);
2219
2220 # need to save uniques path
2221 unless ($self->{deny_save}) {
2222 my $uniq = $self->uniq_path; utf8::encode $uniq;
2223
2224 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2225 if $uniq;
2226 }
2227
2228 delete $cf::MAP{$self->path};
2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->clear;
2233 2337
2234 $self->unlink_save; 2338 $self->unlink_save;
2235 $self->destroy; 2339 $self->destroy;
2236} 2340}
2237 2341
2245 2349
2246 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2247 2351
2248 $self->unlink_save; 2352 $self->unlink_save;
2249 2353
2250 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2251 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2252 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2253 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2255 2359
2312 : normalise $_ 2416 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2418 ]
2315} 2419}
2316 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
2317=back 2453=back
2318 2454
2319=head3 cf::object 2455=head3 cf::object
2320 2456
2321=cut 2457=cut
2386 2522
2387our $SAY_CHANNEL = { 2523our $SAY_CHANNEL = {
2388 id => "say", 2524 id => "say",
2389 title => "Map", 2525 title => "Map",
2390 reply => "say ", 2526 reply => "say ",
2391 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.",
2392}; 2528};
2393 2529
2394our $CHAT_CHANNEL = { 2530our $CHAT_CHANNEL = {
2395 id => "chat", 2531 id => "chat",
2396 title => "Chat", 2532 title => "Chat",
2453 2589
2454Freezes 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}>).
2455 2591
2456The 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.
2457for 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,
2458though, 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
2459map. 2595map.
2460 2596
2461Will never block. 2597Will never block.
2462 2598
2463=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2484sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2485 my ($self) = @_; 2621 my ($self) = @_;
2486 2622
2487 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2488 2624
2625 ++$self->{_link_recursion};
2626
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2628
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2493 2631
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2633}
2496 2634
2497sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2499 2637
2516 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2518 2656
2519 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2522 2660
2523 $map->load; 2661 $map->load;
2524 $map->load_neighbours; 2662 $map->load_neighbours;
2525 2663
2526 return unless $self->contr->active; 2664 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2665
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2532} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2533 2673
2674}
2675
2534=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)]])
2535 2677
2536Moves 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
2537her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2538that 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
2539the 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
2546 2688
2547our $GOTOGEN; 2689our $GOTOGEN;
2548 2690
2549sub cf::object::player::goto { 2691sub cf::object::player::goto {
2550 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 }
2551 2699
2552 # 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
2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2554 2702
2555 $self->enter_link; 2703 $self->enter_link;
2579 my $map = eval { 2727 my $map = eval {
2580 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2581 2729
2582 if ($map) { 2730 if ($map) {
2583 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2584 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2585 } else { 2733 } else {
2586 $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);
2587 } 2735 }
2588 2736
2589 $map 2737 $map
2597 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2598 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2599 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2600 } 2748 }
2601 2749
2602 $done->() if $done; 2750 $done->($self) if $done;
2603 })->prio (1); 2751 })->prio (1);
2604} 2752}
2605 2753
2606=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2607 2755
2724 2872
2725 utf8::encode $text; 2873 utf8::encode $text;
2726 $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);
2727} 2875}
2728 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
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2903
2731Send 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
2732client 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
2733the 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
2735 2908
2736=cut 2909=cut
2737 2910
2738# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2740 "c/identify" => { 2919 "c/identify" => {
2741 id => "infobox", 2920 id => "infobox",
2742 title => "Identify", 2921 title => "Identify",
2743 reply => undef, 2922 reply => undef,
2744 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2746 "c/examine" => { 2925 "c/examine" => {
2747 id => "infobox", 2926 id => "infobox",
2748 title => "Examine", 2927 title => "Examine",
2749 reply => undef, 2928 reply => undef,
2750 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",
2751 }, 2936 },
2752 "c/book" => { 2937 "c/book" => {
2753 id => "infobox", 2938 id => "infobox",
2754 title => "Book", 2939 title => "Book",
2755 reply => undef, 2940 reply => undef,
2771 id => "infobox", 2956 id => "infobox",
2772 title => "Body Parts", 2957 title => "Body Parts",
2773 reply => undef, 2958 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2775 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2776 "c/skills" => { 2967 "c/skills" => {
2777 id => "infobox", 2968 id => "infobox",
2778 title => "Skills", 2969 title => "Skills",
2779 reply => undef, 2970 reply => undef,
2780 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",
2781 }, 2996 },
2782 "c/uptime" => { 2997 "c/uptime" => {
2783 id => "infobox", 2998 id => "infobox",
2784 title => "Uptime", 2999 title => "Uptime",
2785 reply => undef, 3000 reply => undef,
2795 id => "party", 3010 id => "party",
2796 title => "Party", 3011 title => "Party",
2797 reply => "gsay ", 3012 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party", 3013 tooltip => "Messages and chat related to your party",
2799 }, 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,
2800); 3023);
2801 3024
2802sub cf::client::send_msg { 3025sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2804 3027
2809 3032
2810 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2813 3036
2814 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2818 3039
2819 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3045 }
2826 3046
2827 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2828 } 3048 }
2829 3049
2830 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2831 3051
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3052 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2836 3055
2837 my $pkt = "msg " 3056 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 3059 );
2841 3060
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt); 3061 $self->send_big_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 3062}
2879 3063
2880=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2881 3065
2882Sends an ext event to the client. 3066Sends an ext event to the client.
2885 3069
2886sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2887 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2888 3072
2889 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2892 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 } 3078 }
2895} 3079}
2896 3080
2897=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2898 3082
2902 3086
2903sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2905 3089
2906 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove 3093 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 } 3096 }
2913} 3097}
2914 3098
2915=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2916 3100
3017 3201
3018 $coro 3202 $coro
3019} 3203}
3020 3204
3021cf::client->attach ( 3205cf::client->attach (
3022 on_destroy => sub { 3206 on_client_destroy => sub {
3023 my ($ns) = @_; 3207 my ($ns) = @_;
3024 3208
3025 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3026 }, 3210 },
3027); 3211);
3043our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3044 3228
3045$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3046 3230
3047$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3049 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3050 sort time 3234 sort time
3051)); 3235));
3052 3236
3053# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3057The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3058 3242
3059 cf::object 3243 cf::object
3060 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
3061 insert remove name archname title slaying race decrease split 3245 insert remove name archname title slaying race decrease split
3246 value
3062 3247
3063 cf::object::player 3248 cf::object::player
3064 player 3249 player
3065 3250
3066 cf::player 3251 cf::player
3072=cut 3257=cut
3073 3258
3074for ( 3259for (
3075 ["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
3076 insert remove inv nrof name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3081) { 3266) {
3082 no strict 'refs'; 3267 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 3287
3103 my $qcode = $code; 3288 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3106 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3107 local $_; 3295 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3296
3110 my $eval = 3297 my $eval =
3111 "do {\n" 3298 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3301 . $code
3115 . "\n}" 3302 . "\n}"
3116 ; 3303 ;
3117 3304
3305 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3314
3122 if ($@) { 3315 if ($@) {
3123 warn "$@"; 3316 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3144=cut 3337=cut
3145 3338
3146sub register_script_function { 3339sub register_script_function {
3147 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3148 3341
3149 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3151} 3344}
3152 3345
3153=back 3346=back
3154 3347
3155=cut 3348=cut
3176 3369
3177 $facedata->{version} == 2 3370 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3372
3180 # 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]);
3181 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3376 type => FT_RSRC,
3183 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),
3184 }; 3379 };
3185 cf::cede_to_tick; 3380 cf::cede_to_tick;
3186 3381
3187 { 3382 {
3188 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3190 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3387
3193 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3392
3198 cf::cede_to_tick; 3393 cf::cede_to_tick;
3199 } 3394 }
3200 3395
3201 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3225 3420
3226 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3227 } 3422 }
3228 3423
3229 { 3424 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3233 3426
3234 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3430
3239 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3254 } else { 3433 } else {
3255 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3256 } 3435 }
3257 3436
3340 reload_treasures; 3519 reload_treasures;
3341 3520
3342 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3343} 3522}
3344 3523
3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3350 reload_resources;
3351}
3352
3353sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3528 or return;
3356 3529
3357 local $/; 3530 local $/;
3358 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3359 3532
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3361 3534
3362 $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};
3363 $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};
3364 3537
3365 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3542 };
3370 warn $@ if $@; 3543 warn $@ if $@;
3371 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3372} 3547}
3373 3548
3374sub pidfile() { 3549sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
3388 3563
3389 seek $fh, 0, 0; 3564 seek $fh, 0, 0;
3390 print $fh $$; 3565 print $fh $$;
3391} 3566}
3392 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
3393sub main { 3577sub main {
3394 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
3395 3586
3396 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3397 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3398 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#
3399 (async { 3590 (async {
3400 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3402 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3403 }; 3594 };
3404 3595
3405 { 3596 evthread_start IO::AIO::poll_fileno;
3406 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;
3407 reload_config; 3608 reload_config;
3408 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
3409 load_extensions; 3619 load_extensions;
3410 3620
3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE; 3621 utime time, time, $RUNTIMEFILE;
3415 3622
3416 # no (long-running) fork's whatsoever before this point(!) 3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3417 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};
3418 3626
3419 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;
3420} 3634}
3421 3635
3422############################################################################# 3636#############################################################################
3423# initialisation and cleanup 3637# initialisation and cleanup
3424 3638
3425# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3426BEGIN { 3640BEGIN {
3427 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3428 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3429 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3430 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3431 }; 3645 };
3432 } 3646 }
3433} 3647}
3434 3648
3435sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3436 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3437 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3438 3654
3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3440 3656
3441 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3442 3658
3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3444 or return; 3660 or return;
3445 3661
3446 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3447 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3448 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3461 or return; 3677 or return;
3462 3678
3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3464 and return; 3680 and return;
3465 3681
3466 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3467 3683
3468 1 3684 1
3469} 3685}
3470 3686
3471our $uuid_lock; 3687our $uuid_lock;
3480 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3481 3697
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return; 3699 or return;
3484 3700
3485 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;
3486 $uuid_skip = 0; 3709 $uuid_skip = 0;
3487 3710
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return; 3712 and return;
3490 3713
3512} 3735}
3513 3736
3514sub emergency_save() { 3737sub emergency_save() {
3515 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3516 3739
3517 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3518 3741
3519 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
3520 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3521 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3522 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3523 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3524 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3525 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3526 $pl->valid or next; 3754 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3528 $pl->save; 3756 $pl->save;
3529 } 3757 }
3530 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3531 3759
3532 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3533 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3534 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3535 $map->valid or next; 3763 $map->valid or next;
3536 $map->save; 3764 $map->save;
3537 } 3765 }
3538 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3539 3767
3540 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3541 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3542 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3543 3771
3544 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3545 write_uuid_sync 1; 3773 write_uuid_sync 1;
3546 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3547 }; 3775 };
3548 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
3549 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3550} 3783}
3551 3784
3552sub post_cleanup { 3785sub post_cleanup {
3553 my ($make_core) = @_; 3786 my ($make_core) = @_;
3554 3787
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 } 3817 }
3585 warn "cleared package #$pkg\n";#d#
3586} 3818}
3587
3588our $RELOAD; # how many times to reload
3589 3819
3590sub do_reload_perl() { 3820sub do_reload_perl() {
3591 # can/must only be called in main 3821 # can/must only be called in main
3592 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3593 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3594 return; 3824 return;
3595 } 3825 }
3596 3826
3597 return if $RELOAD++; 3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3598 3830
3599 while ($RELOAD) { 3831 while ($RELOAD) {
3600 warn "reloading..."; 3832 warn "reloading...";
3601 3833
3602 warn "entering sync_job"; 3834 warn "entering sync_job";
3663 clear_package "safe::$_" 3895 clear_package "safe::$_"
3664 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);
3665 3897
3666 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3667 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3668 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3669 3901
3670 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3671 # and global variables created in xs 3903 # and global variables created in xs
3672 #clear_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3673 3905
3674 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3675 3907
3676 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3677 require cf; 3909 require cf;
3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3679 3911
3680 warn "loading config and database again"; 3912 warn "loading config and database again";
3681 cf::reload_config; 3913 cf::reload_config;
3682 3914
3683 warn "loading extensions"; 3915 warn "loading extensions";
3684 cf::load_extensions; 3916 cf::load_extensions;
3685 3917
3918 if ($REATTACH_ON_RELOAD) {
3686 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3687 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3688 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3689 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3690 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3691 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;
3692 3929
3693 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3694 3931
3695 1 3932 1
3696 } or do { 3933 } or do {
3699 }; 3936 };
3700 3937
3701 warn "reloaded"; 3938 warn "reloaded";
3702 --$RELOAD; 3939 --$RELOAD;
3703 } 3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3704}; 3944};
3705 3945
3706our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3707 3947
3708sub reload_perl() { 3948sub reload_perl() {
3709 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3710 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3711 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3713 do_reload_perl; 3956 do_reload_perl;
3714 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3715 }; 3959 };
3716} 3960}
3717 3961
3718register_command "reload" => sub { 3962register_command "reload" => sub {
3719 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3733 3977
3734our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3735our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3736 3980
3737sub wait_for_tick { 3981sub wait_for_tick {
3738 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3739 3983
3740 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3741 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3742 $signal->wait; 3986 $signal->wait;
3743} 3987}
3744 3988
3745sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3746 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3747 3991
3748 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3749 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3750 $signal->wait; 3994 $signal->wait;
3751} 3995}
3756 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3757 return; 4001 return;
3758 } 4002 }
3759 4003
3760 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#
3761 4007
3762 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3763 $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.;
3764 Coro::async_pool { 4010 Coro::async_pool {
3765 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3788} 4034}
3789 4035
3790{ 4036{
3791 # configure BDB 4037 # configure BDB
3792 4038
3793 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3794 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3795 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3796 4042
3797 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3798 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3879 } 4125 }
3880} 4126}
3881 4127
3882# load additional modules 4128# load additional modules
3883use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3884 4131
3885END { cf::emergency_save } 4132END { cf::emergency_save }
3886 4133
38871 41341
3888 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines