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.446 by root, Tue Sep 16 16:03:02 2008 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 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
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69 77
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
97our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 110
100our %RESOURCE; 111our %RESOURCE;
101 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 118our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
106 120
107our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 124our $DB_ENV;
111 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
112our %CFG; 128our %CFG;
113 129
114our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 131our $RUNTIME;
116our $NOW; 132our $NOW;
124 140
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 143our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
129 150
130binmode STDOUT; 151binmode STDOUT;
131binmode STDERR; 152binmode STDERR;
132 153
133# read virtual server time, if available 154# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
138} 159}
139 160
161eval "sub TICK() { $TICK } 1" or die;
162
140mkdir $_ 163mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 165
143our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
144 167
145sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
146 180
147############################################################################# 181#############################################################################
148 182
149=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
150 184
197returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
198per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
199 233
200=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
201 235
202This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
203C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 238that call.
205 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
206=back 246=back
207 247
208=cut 248=cut
209 249
210BEGIN { 250$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 251 my $msg = join "", @_;
213 252
214 $msg .= "\n" 253 $msg .= "\n"
215 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
216 255
217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
218 257
219 LOG llevError, $msg; 258 LOG llevError, $msg;
220 }; 259};
221}
222 260
223$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
225 265
226 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 268 return;#d#
229 }#d# 269 }#d#
230 270
231 # kill coroutine otherwise 271 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 272 Coro::terminate
234}; 273};
235
236$SIG{__DIE__} = sub { }; #d#?
237 274
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 292)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 294}
258 295
259$EV::DIED = sub { 296$EV::DIED = sub {
260 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
261}; 298};
262 299
263############################################################################# 300#############################################################################
264 301
265=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 340
304sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
306 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
307=item cf::lock_wait $string 358=item cf::lock_wait $string
308 359
309Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
310 361
311=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
312 363
313Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
316returned. 367returned.
317 368
318Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 370deadlocked coro.
325 376
326Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
327 378
328=cut 379=cut
329 380
330our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 382
333sub lock_wait($) { 383sub lock_wait($) {
334 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 385}
347 386
348sub lock_acquire($) { 387sub lock_acquire($) {
349 my ($key) = @_; 388 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 389}
363 390
364sub lock_active($) { 391sub lock_active($) {
365 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 393}
369 394
370sub freeze_mainloop { 395sub freeze_mainloop {
371 tick_inhibit_inc; 396 tick_inhibit_inc;
372 397
373 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
374} 399}
375 400
376=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
377 402
378Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer. 404get spread over time.
380 405
381=cut 406=cut
382 407
383sub periodic($$) { 408sub periodic($$) {
384 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
401 426
402=cut 427=cut
403 428
404our @SLOT_QUEUE; 429our @SLOT_QUEUE;
405our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
406 432
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
410 436
411 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
412 439
413 while () { 440 while () {
414 next_job: 441 next_job:
442
415 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 444
417 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 449 $job->[2]->send;
421 Coro::cede; 450 Coro::cede;
422 goto next_job; 451 goto next_job;
423 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 454 }
425 } 455 }
426 456
427 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
428 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
429 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 460 $signal->wait;
431 } else { 461 } else {
462 $busy = 0;
432 Coro::schedule; 463 Coro::schedule;
433 } 464 }
434 } 465 }
435}; 466};
436 467
437sub get_slot($;$$) { 468sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
439 470
440 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
441 472
442 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
443 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
444 476
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
474 506
475sub sync_job(&) { 507sub sync_job(&) {
476 my ($job) = @_; 508 my ($job) = @_;
477 509
478 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
479 my $time = EV::time; 511 my $time = AE::time;
480 512
481 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
483 515
484 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
501 } else { 533 } else {
502 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
503 } 535 }
504 } 536 }
505 537
506 my $time = EV::time - $time; 538 my $time = AE::time - $time;
507 539
508 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
509 541
510 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
511 } else { 543 } else {
555 reset_signals; 587 reset_signals;
556 &$cb 588 &$cb
557 }, @args; 589 }, @args;
558 590
559 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
560} 603}
561 604
562=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
563 606
564=cut 607=cut
730 773
731############################################################################# 774#############################################################################
732 775
733=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
734 777
735Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
738 781
739In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
790=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
791 834
792Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
794 837
795Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
797 840
798These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
799 842
800=over 4 843=over 4
1150 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1151 1194
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1156 aio_close $fh; 1202 aio_close $fh;
1157 1203
1158 if (@$objs) { 1204 if (@$objs) {
1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1160 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1163 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1164 aio_close $fh; 1213 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1215 }
1167 } else { 1216 } else {
1168 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1169 } 1218 }
1170 1219
1171 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1224 } else {
1173 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1174 } 1226 }
1175 } else { 1227 } else {
1176 aio_unlink $filename; 1228 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1178 } 1230 }
1269 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1270 1322
1271 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1272} 1324}
1273 1325
1326use File::Glob ();
1327
1274cf::player->attach ( 1328cf::player->attach (
1275 on_command => sub { 1329 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1277 1331
1278 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1279 or return; 1333 or return;
1280 1334
1310 1364
1311 cf::override; 1365 cf::override;
1312 }, 1366 },
1313); 1367);
1314 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1315sub load_extensions { 1382sub load_extensions {
1316 cf::sync_job { 1383 cf::sync_job {
1317 my %todo; 1384 my %todo;
1318 1385
1319 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1413 . "\n};\n1";
1347 1414
1348 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1349 } 1416 }
1350 1417
1418 my $pass = 0;
1351 my %done; 1419 my %done;
1352 while (%todo) { 1420 while (%todo) {
1353 my $progress; 1421 my $progress;
1354 1422
1423 ++$pass;
1424
1425 ext:
1355 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1428 next ext
1358 unless exists $done{$_}; 1429 unless exists $done{$_};
1359 } 1430 }
1360 1431
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1433
1363 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1438
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1440 if exists $v->{meta}{mandatory};
1371 1441
1372 warn $msg; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1443 delete $todo{$k};
1444 } else {
1445 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1373 } 1451 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1452 }
1379 1453
1380 skip: 1454 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1383 } 1462 }
1384 }; 1463 };
1385} 1464}
1386 1465
1387############################################################################# 1466#############################################################################
1388 1467
1389=back 1468=back
1390 1469
1391=head2 CORE EXTENSIONS 1470=head2 CORE EXTENSIONS
1392 1471
1393Functions and methods that extend core crossfire objects. 1472Functions and methods that extend core deliantra objects.
1394 1473
1395=cut 1474=cut
1396 1475
1397package cf::player; 1476package cf::player;
1398 1477
1441 1520
1442sub exists($) { 1521sub exists($) {
1443 my ($login) = @_; 1522 my ($login) = @_;
1444 1523
1445 $cf::PLAYER{$login} 1524 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1525 or !aio_stat path $login
1447} 1526}
1448 1527
1449sub find($) { 1528sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1529 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1530 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1472 } 1551 }
1473 } 1552 }
1474} 1553}
1475 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1476sub save($) { 1568sub save($) {
1477 my ($pl) = @_; 1569 my ($pl) = @_;
1478 1570
1479 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1480 1572
1485 1577
1486 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1488 1580
1489 cf::get_slot 0.01; 1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1490 1585
1491 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1587 cf::cede_to_tick;
1493} 1588}
1494 1589
1622 } 1717 }
1623 1718
1624 \@paths 1719 \@paths
1625} 1720}
1626 1721
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1722=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1723
1629Expand crossfire pod fragments into protocol xml. 1724Expand deliantra pod fragments into protocol xml.
1630 1725
1631=item $player->ext_reply ($msgid, @msg) 1726=item $player->ext_reply ($msgid, @msg)
1632 1727
1633Sends an ext reply to the player. 1728Sends an ext reply to the player.
1634 1729
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1803
1709 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1805 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1847 1942
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1944 "$UNIQUEDIR/$path"
1850} 1945}
1851 1946
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1947sub decay_objects {
1862 my ($self) = @_; 1948 my ($self) = @_;
1863 1949
1864 return if $self->{deny_reset}; 1950 return if $self->{deny_reset};
1865 1951
1947sub find { 2033sub find {
1948 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1949 2035
1950 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1951 2037
1952 cf::lock_wait "map_data:$path";#d#remove 2038 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2039 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2040
1955 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2042 my $map = new_from_path cf::map $path
1960 or return; 2043 or return;
1961 2044
1962 $map->{last_save} = $cf::RUNTIME; 2045 $map->{last_save} = $cf::RUNTIME;
1963 2046
1975 2058
1976 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1977 } 2060 }
1978} 2061}
1979 2062
1980sub pre_load { } 2063sub pre_load { }
1981sub post_load { } 2064#sub post_load { } # XS
1982 2065
1983sub load { 2066sub load {
1984 my ($self) = @_; 2067 my ($self) = @_;
1985 2068
1986 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2114 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2115 $self->decay_objects;
2033 $self->fix_auto_apply; 2116 $self->fix_auto_apply;
2034 $self->update_buttons; 2117 $self->update_buttons;
2035 cf::cede_to_tick; 2118 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2119 $self->activate;
2039 } 2120 }
2040 2121
2041 $self->{last_save} = $cf::RUNTIME; 2122 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2123 $self->last_access ($cf::RUNTIME);
2045 } 2126 }
2046 2127
2047 $self->post_load; 2128 $self->post_load;
2048} 2129}
2049 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2050sub customise_for { 2134sub customise_for {
2051 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2052 2136
2053 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2138 if $self->per_player;
2131 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2132 2216
2133 () 2217 ()
2134} 2218}
2135 2219
2220# common code, used by both ->save and ->swapout
2136sub save { 2221sub _save {
2137 my ($self) = @_; 2222 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2223
2141 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2142 2225
2143 return unless $self->dirty; 2226 return unless $self->dirty;
2144 2227
2164 } else { 2247 } else {
2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2166 } 2249 }
2167} 2250}
2168 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2169sub swap_out { 2260sub swap_out {
2170 my ($self) = @_; 2261 my ($self) = @_;
2171 2262
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2264
2177 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 2265 return if $self->in_memory != cf::MAP_ACTIVE;
2179 return if $self->{deny_save}; 2266 return if $self->{deny_save};
2267 return if $self->players;
2180 2268
2181 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2182
2183 $self->deactivate; 2270 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2185 $self->clear; 2278 $self->clear;
2186} 2279}
2187 2280
2188sub reset_at { 2281sub reset_at {
2189 my ($self) = @_; 2282 my ($self) = @_;
2208 2301
2209 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2303
2211 return if $self->players; 2304 return if $self->players;
2212 2305
2213 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2214 2307
2215 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2216 2309
2217 # need to save uniques path 2310 # need to save uniques path
2218 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
2309 : normalise $_ 2402 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2404 ]
2312} 2405}
2313 2406
2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2438
2314=back 2439=back
2315 2440
2316=head3 cf::object 2441=head3 cf::object
2317 2442
2318=cut 2443=cut
2383 2508
2384our $SAY_CHANNEL = { 2509our $SAY_CHANNEL = {
2385 id => "say", 2510 id => "say",
2386 title => "Map", 2511 title => "Map",
2387 reply => "say ", 2512 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2514};
2390 2515
2391our $CHAT_CHANNEL = { 2516our $CHAT_CHANNEL = {
2392 id => "chat", 2517 id => "chat",
2393 title => "Chat", 2518 title => "Chat",
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2612
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2490 2615
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2617}
2493 2618
2494sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2496 2621
2513 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2515 2640
2516 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2519 2644
2520 $map->load; 2645 $map->load;
2521 $map->load_neighbours; 2646 $map->load_neighbours;
2522 2647
2523 return unless $self->contr->active; 2648 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2649
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2529} 2655}
2530 2656
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2532 2658
2533Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
2692 $self->contr->savebed ($map, $x, $y) 2818 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED); 2819 if $exit->flag (cf::FLAG_DAMNED);
2694 2820
2695 1 2821 1
2696 }) { 2822 }) {
2697 $self->message ("Something went wrong deep within the crossfire server. " 2823 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "I'll try to bring you back to the map you were before. " 2824 . "I'll try to bring you back to the map you were before. "
2699 . "Please report this to the dungeon master!", 2825 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 2826 cf::NDI_UNIQUE | cf::NDI_RED);
2701 2827
2702 warn "ERROR in enter_exit: $@"; 2828 warn "ERROR in enter_exit: $@";
2719sub cf::client::send_drawinfo { 2845sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 2846 my ($self, $text, $flags) = @_;
2721 2847
2722 utf8::encode $text; 2848 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850}
2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2724} 2875}
2725 2876
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 2878
2728Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send a drawinfo or msg packet to the client, formatting the msg for the
2732 2883
2733=cut 2884=cut
2734 2885
2735# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2737 "c/identify" => { 2894 "c/identify" => {
2738 id => "infobox", 2895 id => "infobox",
2739 title => "Identify", 2896 title => "Identify",
2740 reply => undef, 2897 reply => undef,
2741 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
2743 "c/examine" => { 2900 "c/examine" => {
2744 id => "infobox", 2901 id => "infobox",
2745 title => "Examine", 2902 title => "Examine",
2746 reply => undef, 2903 reply => undef,
2747 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2748 }, 2911 },
2749 "c/book" => { 2912 "c/book" => {
2750 id => "infobox", 2913 id => "infobox",
2751 title => "Book", 2914 title => "Book",
2752 reply => undef, 2915 reply => undef,
2768 id => "infobox", 2931 id => "infobox",
2769 title => "Body Parts", 2932 title => "Body Parts",
2770 reply => undef, 2933 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 2934 tooltip => "Shows which body parts you posess and are available",
2772 }, 2935 },
2936 "c/statistics" => {
2937 id => "infobox",
2938 title => "Statistics",
2939 reply => undef,
2940 tooltip => "Shows your primary statistics",
2941 },
2942 "c/skills" => {
2943 id => "infobox",
2944 title => "Skills",
2945 reply => undef,
2946 tooltip => "Shows your experience per skill and item power",
2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2954 "c/resistances" => {
2955 id => "infobox",
2956 title => "Resistances",
2957 reply => undef,
2958 tooltip => "Shows your resistances",
2959 },
2960 "c/pets" => {
2961 id => "infobox",
2962 title => "Pets",
2963 reply => undef,
2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2971 },
2773 "c/uptime" => { 2972 "c/uptime" => {
2774 id => "infobox", 2973 id => "infobox",
2775 title => "Uptime", 2974 title => "Uptime",
2776 reply => undef, 2975 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 2976 tooltip => "How long the server has been running since last restart",
2786 id => "party", 2985 id => "party",
2787 title => "Party", 2986 title => "Party",
2788 reply => "gsay ", 2987 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 2988 tooltip => "Messages and chat related to your party",
2790 }, 2989 },
2990 "c/death" => {
2991 id => "death",
2992 title => "Death",
2993 reply => undef,
2994 tooltip => "Reason for and more info about your most recent death",
2995 },
2996 "c/say" => $SAY_CHANNEL,
2997 "c/chat" => $CHAT_CHANNEL,
2791); 2998);
2792 2999
2793sub cf::client::send_msg { 3000sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3001 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3002
2796 $msg = $self->pl->expand_cfpod ($msg); 3003 $msg = $self->pl->expand_cfpod ($msg)
3004 unless $color & cf::NDI_VERBATIM;
2797 3005
2798 $color &= cf::NDI_CLIENT_MASK; # just in case... 3006 $color &= cf::NDI_CLIENT_MASK; # just in case...
2799 3007
2800 # check predefined channels, for the benefit of C 3008 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) { 3009 if ($CHANNEL{$channel}) {
2802 $channel = $CHANNEL{$channel}; 3010 $channel = $CHANNEL{$channel};
2803 3011
2804 $self->ext_msg (channel_info => $channel) 3012 $self->ext_msg (channel_info => $channel);
2805 if $self->can_msg;
2806
2807 $channel = $channel->{id}; 3013 $channel = $channel->{id};
2808 3014
2809 } elsif (ref $channel) { 3015 } elsif (ref $channel) {
2810 # send meta info to client, if not yet sent 3016 # send meta info to client, if not yet sent
2811 unless (exists $self->{channel}{$channel->{id}}) { 3017 unless (exists $self->{channel}{$channel->{id}}) {
2812 $self->{channel}{$channel->{id}} = $channel; 3018 $self->{channel}{$channel->{id}} = $channel;
2813 $self->ext_msg (channel_info => $channel) 3019 $self->ext_msg (channel_info => $channel);
2814 if $self->can_msg;
2815 } 3020 }
2816 3021
2817 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2818 } 3023 }
2819 3024
2820 return unless @extra || length $msg; 3025 return unless @extra || length $msg;
2821 3026
2822 if ($self->can_msg) {
2823 # default colour, mask it out 3027 # default colour, mask it out
2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3028 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2825 if $color & cf::NDI_DEF; 3029 if $color & cf::NDI_DEF;
2826 3030
2827 my $pkt = "msg " 3031 my $pkt = "msg "
2828 . $self->{json_coder}->encode ( 3032 . $self->{json_coder}->encode (
2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 ); 3034 );
2831 3035
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt); 3036 $self->send_big_packet ($pkt);
2843 } else {
2844 if ($color >= 0) {
2845 # replace some tags by gcfclient-compatible ones
2846 for ($msg) {
2847 1 while
2848 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853 }
2854
2855 $color &= cf::NDI_COLOR_MASK;
2856
2857 utf8::encode $msg;
2858
2859 if (0 && $msg =~ /\[/) {
2860 # COMMAND/INFO
2861 $self->send_packet ("drawextinfo $color 10 8 $msg")
2862 } else {
2863 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2864 $self->send_packet ("drawinfo $color $msg")
2865 }
2866 }
2867 }
2868} 3037}
2869 3038
2870=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2871 3040
2872Sends an ext event to the client. 3041Sends an ext event to the client.
2875 3044
2876sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2877 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2878 3047
2879 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2881 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2882 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2883 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2884 } 3053 }
2885} 3054}
2886 3055
2887=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2888 3057
2892 3061
2893sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2894 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2895 3064
2896 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2898 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2899 #TODO: version 1, remove 3068 #TODO: version 1, remove
2900 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2902 } 3071 }
2903} 3072}
2904 3073
2905=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2906 3075
3007 3176
3008 $coro 3177 $coro
3009} 3178}
3010 3179
3011cf::client->attach ( 3180cf::client->attach (
3012 on_destroy => sub { 3181 on_client_destroy => sub {
3013 my ($ns) = @_; 3182 my ($ns) = @_;
3014 3183
3015 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3016 }, 3185 },
3017); 3186);
3033our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
3034 3203
3035$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
3036 3205
3037$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
3038 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
3039 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
3040 sort time 3209 sort time
3041)); 3210));
3042 3211
3043# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
3047The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
3048 3217
3049 cf::object 3218 cf::object
3050 contr pay_amount pay_player map x y force_find force_add destroy 3219 contr pay_amount pay_player map x y force_find force_add destroy
3051 insert remove name archname title slaying race decrease split 3220 insert remove name archname title slaying race decrease split
3221 value
3052 3222
3053 cf::object::player 3223 cf::object::player
3054 player 3224 player
3055 3225
3056 cf::player 3226 cf::player
3062=cut 3232=cut
3063 3233
3064for ( 3234for (
3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3066 insert remove inv nrof name archname title slaying race 3236 insert remove inv nrof name archname title slaying race
3067 decrease split destroy change_exp)], 3237 decrease split destroy change_exp value msg lore send_msg)],
3068 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
3069 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
3070 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
3071) { 3241) {
3072 no strict 'refs'; 3242 no strict 'refs';
3073 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
3074 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3092 3262
3093 my $qcode = $code; 3263 my $qcode = $code;
3094 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3095 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3096 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
3097 local $_; 3270 local $_;
3098 local @safe::cf::_safe_eval_args = values %vars;
3099 3271
3100 my $eval = 3272 my $eval =
3101 "do {\n" 3273 "do {\n"
3102 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3103 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3104 . $code 3276 . $code
3105 . "\n}" 3277 . "\n}"
3106 ; 3278 ;
3107 3279
3280 if ($CFG{safe_eval}) {
3108 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3109 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3110 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3111 3289
3112 if ($@) { 3290 if ($@) {
3113 warn "$@"; 3291 warn "$@";
3114 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3115 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
3134=cut 3312=cut
3135 3313
3136sub register_script_function { 3314sub register_script_function {
3137 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3138 3316
3139 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3140 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3141} 3319}
3142 3320
3143=back 3321=back
3144 3322
3145=cut 3323=cut
3166 3344
3167 $facedata->{version} == 2 3345 $facedata->{version} == 2
3168 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3169 3347
3170 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3171 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3172 type => FT_RSRC, 3351 type => FT_RSRC,
3173 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3174 }; 3354 };
3175 cf::cede_to_tick; 3355 cf::cede_to_tick;
3176 3356
3177 { 3357 {
3178 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
3180 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3181 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3182 3362
3183 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3184 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3185 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3186 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3187 3367
3188 cf::cede_to_tick; 3368 cf::cede_to_tick;
3189 } 3369 }
3190 3370
3191 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
3215 3395
3216 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3217 } 3397 }
3218 3398
3219 { 3399 {
3220 # TODO: for gcfclient pleasure, we should give resources
3221 # that gcfclient doesn't grok a >10000 face index.
3222 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3223 3401
3224 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3225 if (defined $info->{type}) { 3403 if (defined $info->{type}) {
3226 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3227 my $data;
3228 3405
3229 if ($info->{type} & 1) { 3406 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3230 # prepend meta info
3231
3232 my $meta = $enc->encode ({
3233 name => $name,
3234 %{ $info->{meta} || {} },
3235 });
3236
3237 $data = pack "(w/a*)*", $meta, $info->{data};
3238 } else {
3239 $data = $info->{data};
3240 }
3241
3242 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3243 cf::face::set_type $idx, $info->{type}; 3407 cf::face::set_type $idx, $info->{type};
3244 } else { 3408 } else {
3245 $RESOURCE{$name} = $info; 3409 $RESOURCE{$name} = $info;
3246 } 3410 }
3247 3411
3330 reload_treasures; 3494 reload_treasures;
3331 3495
3332 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3333} 3497}
3334 3498
3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
3340 reload_resources;
3341}
3342
3343sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3344 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3345 or return; 3503 or return;
3346 3504
3347 local $/; 3505 local $/;
3348 *CFG = YAML::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3349 3507
3350 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3351 3509
3352 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3353 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3357 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3358 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3359 }; 3517 };
3360 warn $@ if $@; 3518 warn $@ if $@;
3361 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3362} 3522}
3363 3523
3364sub pidfile() { 3524sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!"; 3526 or die "$PIDFILE: $!";
3378 3538
3379 seek $fh, 0, 0; 3539 seek $fh, 0, 0;
3380 print $fh $$; 3540 print $fh $$;
3381} 3541}
3382 3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3550}
3551
3383sub main { 3552sub main {
3384 atomic; 3553 cf::init_globals; # initialise logging
3554
3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559
3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3385 3561
3386 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3387 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3564 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3389 (async { 3565 (async {
3390 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3566 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT; 3567 EV::loop EV::LOOP_ONESHOT;
3392 })->prio (Coro::PRIO_MAX); 3568 })->prio (Coro::PRIO_MAX);
3393 }; 3569 };
3394 3570
3395 { 3571 evthread_start IO::AIO::poll_fileno;
3396 my $guard = freeze_mainloop; 3572
3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3582 reload_resources;
3397 reload_config; 3583 reload_config;
3398 db_init; 3584 db_init;
3585
3586 cf::init_uuid;
3587 cf::init_signals;
3588 cf::init_skills;
3589
3590 cf::init_beforeplay;
3591
3592 atomic;
3593
3399 load_extensions; 3594 load_extensions;
3400 3595
3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE; 3596 utime time, time, $RUNTIMEFILE;
3405 3597
3406 # no (long-running) fork's whatsoever before this point(!) 3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408 3601
3409 EV::loop; 3602 (pop @POST_INIT)->(0) while @POST_INIT;
3603 };
3604
3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3410} 3609}
3411 3610
3412############################################################################# 3611#############################################################################
3413# initialisation and cleanup 3612# initialisation and cleanup
3414 3613
3415# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3416BEGIN { 3615BEGIN {
3417 our %SIGWATCHER = (); 3616 our %SIGWATCHER = ();
3418 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3419 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3420 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3421 }; 3620 };
3422 } 3621 }
3423} 3622}
3424 3623
3425sub write_runtime_sync { 3624sub write_runtime_sync {
3625 my $t0 = AE::time;
3626
3426 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3427 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3428 3629
3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3430 3631
3431 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3432 3633
3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3434 or return; 3635 or return;
3435 3636
3436 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3437 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3438 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
3451 or return; 3652 or return;
3452 3653
3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3454 and return; 3655 and return;
3455 3656
3456 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3457 3658
3458 1 3659 1
3459} 3660}
3460 3661
3461our $uuid_lock; 3662our $uuid_lock;
3470 my $uuid = "$LOCALDIR/uuid"; 3671 my $uuid = "$LOCALDIR/uuid";
3471 3672
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3673 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return; 3674 or return;
3474 3675
3475 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3676 my $value = uuid_seq uuid_cur;
3677
3678 unless ($value) {
3679 warn "cowardly refusing to write zero uuid value!\n";
3680 return;
3681 }
3682
3683 my $value = uuid_str $value + $uuid_skip;
3476 $uuid_skip = 0; 3684 $uuid_skip = 0;
3477 3685
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3686 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return; 3687 and return;
3480 3688
3502} 3710}
3503 3711
3504sub emergency_save() { 3712sub emergency_save() {
3505 my $freeze_guard = cf::freeze_mainloop; 3713 my $freeze_guard = cf::freeze_mainloop;
3506 3714
3507 warn "enter emergency perl save\n"; 3715 warn "emergency_perl_save: enter\n";
3508 3716
3509 cf::sync_job { 3717 cf::sync_job {
3718 # this is a trade-off: we want to be very quick here, so
3719 # save all maps without fsync, and later call a global sync
3720 # (which in turn might be very very slow)
3721 local $USE_FSYNC = 0;
3722
3510 # use a peculiar iteration method to avoid tripping on perl 3723 # use a peculiar iteration method to avoid tripping on perl
3511 # refcount bugs in for. also avoids problems with players 3724 # refcount bugs in for. also avoids problems with players
3512 # and maps saved/destroyed asynchronously. 3725 # and maps saved/destroyed asynchronously.
3513 warn "begin emergency player save\n"; 3726 warn "emergency_perl_save: begin player save\n";
3514 for my $login (keys %cf::PLAYER) { 3727 for my $login (keys %cf::PLAYER) {
3515 my $pl = $cf::PLAYER{$login} or next; 3728 my $pl = $cf::PLAYER{$login} or next;
3516 $pl->valid or next; 3729 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3730 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3518 $pl->save; 3731 $pl->save;
3519 } 3732 }
3520 warn "end emergency player save\n"; 3733 warn "emergency_perl_save: end player save\n";
3521 3734
3522 warn "begin emergency map save\n"; 3735 warn "emergency_perl_save: begin map save\n";
3523 for my $path (keys %cf::MAP) { 3736 for my $path (keys %cf::MAP) {
3524 my $map = $cf::MAP{$path} or next; 3737 my $map = $cf::MAP{$path} or next;
3525 $map->valid or next; 3738 $map->valid or next;
3526 $map->save; 3739 $map->save;
3527 } 3740 }
3528 warn "end emergency map save\n"; 3741 warn "emergency_perl_save: end map save\n";
3529 3742
3530 warn "begin emergency database checkpoint\n"; 3743 warn "emergency_perl_save: begin database checkpoint\n";
3531 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
3532 warn "end emergency database checkpoint\n"; 3745 warn "emergency_perl_save: end database checkpoint\n";
3533 3746
3534 warn "begin write uuid\n"; 3747 warn "emergency_perl_save: begin write uuid\n";
3535 write_uuid_sync 1; 3748 write_uuid_sync 1;
3536 warn "end write uuid\n"; 3749 warn "emergency_perl_save: end write uuid\n";
3537 }; 3750 };
3538 3751
3752 warn "emergency_perl_save: starting sync()\n";
3753 IO::AIO::aio_sync sub {
3754 warn "emergency_perl_save: finished sync()\n";
3755 };
3756
3539 warn "leave emergency perl save\n"; 3757 warn "emergency_perl_save: leave\n";
3540} 3758}
3541 3759
3542sub post_cleanup { 3760sub post_cleanup {
3543 my ($make_core) = @_; 3761 my ($make_core) = @_;
3544 3762
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) { 3789 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"}; 3790 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 } 3792 }
3575 warn "cleared package #$pkg\n";#d#
3576} 3793}
3577
3578our $RELOAD; # how many times to reload
3579 3794
3580sub do_reload_perl() { 3795sub do_reload_perl() {
3581 # can/must only be called in main 3796 # can/must only be called in main
3582 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
3583 warn "can only reload from main coroutine"; 3798 warn "can only reload from main coroutine";
3584 return; 3799 return;
3585 } 3800 }
3586 3801
3587 return if $RELOAD++; 3802 return if $RELOAD++;
3803
3804 my $t1 = AE::time;
3588 3805
3589 while ($RELOAD) { 3806 while ($RELOAD) {
3590 warn "reloading..."; 3807 warn "reloading...";
3591 3808
3592 warn "entering sync_job"; 3809 warn "entering sync_job";
3653 clear_package "safe::$_" 3870 clear_package "safe::$_"
3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3655 3872
3656 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3657 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3658 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3659 3876
3660 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3661 # and global variables created in xs 3878 # and global variables created in xs
3662 #clear_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3663 3880
3664 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3665 3882
3666 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3667 require cf; 3884 require cf;
3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3669 3886
3670 warn "loading config and database again"; 3887 warn "loading config and database again";
3671 cf::reload_config; 3888 cf::reload_config;
3672 3889
3673 warn "loading extensions"; 3890 warn "loading extensions";
3674 cf::load_extensions; 3891 cf::load_extensions;
3675 3892
3893 if ($REATTACH_ON_RELOAD) {
3676 warn "reattaching attachments to objects/players"; 3894 warn "reattaching attachments to objects/players";
3677 _global_reattach; # objects, sockets 3895 _global_reattach; # objects, sockets
3678 warn "reattaching attachments to maps"; 3896 warn "reattaching attachments to maps";
3679 reattach $_ for values %MAP; 3897 reattach $_ for values %MAP;
3680 warn "reattaching attachments to players"; 3898 warn "reattaching attachments to players";
3681 reattach $_ for values %PLAYER; 3899 reattach $_ for values %PLAYER;
3900 }
3901
3902 warn "running post_init jobs";
3903 (pop @POST_INIT)->(1) while @POST_INIT;
3682 3904
3683 warn "leaving sync_job"; 3905 warn "leaving sync_job";
3684 3906
3685 1 3907 1
3686 } or do { 3908 } or do {
3689 }; 3911 };
3690 3912
3691 warn "reloaded"; 3913 warn "reloaded";
3692 --$RELOAD; 3914 --$RELOAD;
3693 } 3915 }
3916
3917 $t1 = AE::time - $t1;
3918 warn "reload completed in ${t1}s\n";
3694}; 3919};
3695 3920
3696our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3697 3922
3698sub reload_perl() { 3923sub reload_perl() {
3699 # doing reload synchronously and two reloads happen back-to-back, 3924 # doing reload synchronously and two reloads happen back-to-back,
3700 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3701 3926
3927 $RELOAD_WATCHER ||= cf::async {
3928 Coro::AIO::aio_wait cache_extensions;
3929
3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3703 do_reload_perl; 3931 do_reload_perl;
3704 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3933 };
3705 }; 3934 };
3706} 3935}
3707 3936
3708register_command "reload" => sub { 3937register_command "reload" => sub {
3709 my ($who, $arg) = @_; 3938 my ($who, $arg) = @_;
3723 3952
3724our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3725our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3726 3955
3727sub wait_for_tick { 3956sub wait_for_tick {
3728 return if tick_inhibit || $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3729 3958
3730 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3731 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3732 $signal->wait; 3961 $signal->wait;
3733} 3962}
3734 3963
3735sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3736 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3737 3966
3738 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3739 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3740 $signal->wait; 3969 $signal->wait;
3741} 3970}
3746 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3747 return; 3976 return;
3748 } 3977 }
3749 3978
3750 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3980
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3751 3982
3752 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3753 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3754 Coro::async_pool { 3985 Coro::async_pool {
3755 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
3778} 4009}
3779 4010
3780{ 4011{
3781 # configure BDB 4012 # configure BDB
3782 4013
3783 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3784 BDB::max_poll_reqs $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3785 $AnyEvent::BDB::WATCHER->priority (1); 4016 $AnyEvent::BDB::WATCHER->priority (1);
3786 4017
3787 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3788 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
3868 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3869 } 4100 }
3870} 4101}
3871 4102
3872# load additional modules 4103# load additional modules
3873use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3874 4106
3875END { cf::emergency_save } 4107END { cf::emergency_save }
3876 4108
38771 41091
3878 4110

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines