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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.506 by root, Wed Feb 3 20:48:22 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";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
98 112
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 115our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
103 117
104our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 121our $DB_ENV;
108 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
109our %CFG; 125our %CFG;
110 126
111our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 128our $RUNTIME;
113our $NOW; 129our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 140our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
126 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
127binmode STDOUT; 148binmode STDOUT;
128binmode STDERR; 149binmode STDERR;
129 150
130# read virtual server time, if available 151# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
135} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
136 159
137mkdir $_ 160mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 162
140our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
141 164
142sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
143 177
144############################################################################# 178#############################################################################
145 179
146=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
147 181
… …
194returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 230
197=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
198 232
199This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 235that call.
202 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
203=back 243=back
204 244
205=cut 245=cut
206 246
207BEGIN { 247$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 248 my $msg = join "", @_;
210 249
211 $msg .= "\n" 250 $msg .= "\n"
212 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
213 252
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215 254
216 LOG llevError, $msg; 255 LOG llevError, $msg;
217 }; 256};
218}
219 257
220$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
222 262
223 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 265 return;#d#
226 }#d# 266 }#d#
227 267
228 # kill coroutine otherwise 268 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 269 Coro::terminate
231}; 270};
232
233$SIG{__DIE__} = sub { }; #d#?
234 271
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
252)) { 289)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 291}
255 292
256$EV::DIED = sub { 293$EV::DIED = sub {
257 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
258}; 295};
259 296
260############################################################################# 297#############################################################################
261 298
262=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 337
301sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
303 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
304=item cf::lock_wait $string 355=item cf::lock_wait $string
305 356
306Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
307 358
308=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
309 360
310Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
313returned. 364returned.
314 365
315Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 367deadlocked coro.
… …
322 373
323Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
324 375
325=cut 376=cut
326 377
327our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 379
330sub lock_wait($) { 380sub lock_wait($) {
331 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 382}
344 383
345sub lock_acquire($) { 384sub lock_acquire($) {
346 my ($key) = @_; 385 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 386}
360 387
361sub lock_active($) { 388sub lock_active($) {
362 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 390}
366 391
367sub freeze_mainloop { 392sub freeze_mainloop {
368 tick_inhibit_inc; 393 tick_inhibit_inc;
369 394
370 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
371} 396}
372 397
373=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
374 399
375Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
398 423
399=cut 424=cut
400 425
401our @SLOT_QUEUE; 426our @SLOT_QUEUE;
402our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
403 429
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
407 433
408 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
409 436
410 while () { 437 while () {
411 next_job: 438 next_job:
439
412 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 441
414 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 446 $job->[2]->send;
418 Coro::cede; 447 Coro::cede;
419 goto next_job; 448 goto next_job;
420 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 451 }
422 } 452 }
423 453
424 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 457 $signal->wait;
428 } else { 458 } else {
459 $busy = 0;
429 Coro::schedule; 460 Coro::schedule;
430 } 461 }
431 } 462 }
432}; 463};
433 464
434sub get_slot($;$$) { 465sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
436 467
437 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
438 469
439 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
440 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
441 473
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
727 759
728############################################################################# 760#############################################################################
729 761
730=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
731 763
732Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
735 767
736In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
788 820
789Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
791 823
792Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
794 826
795These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
796 828
797=over 4 829=over 4
… …
1147 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1148 1180
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1153 aio_close $fh; 1188 aio_close $fh;
1154 1189
1155 if (@$objs) { 1190 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1161 aio_close $fh; 1199 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1201 }
1164 } else { 1202 } else {
1165 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1166 } 1204 }
1167 1205
1168 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1210 } else {
1170 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1171 } 1212 }
1172 } else { 1213 } else {
1173 aio_unlink $filename; 1214 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1175 } 1216 }
… …
1266 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1267 1308
1268 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1269} 1310}
1270 1311
1312use File::Glob ();
1313
1271cf::player->attach ( 1314cf::player->attach (
1272 on_command => sub { 1315 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1274 1317
1275 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1307 1350
1308 cf::override; 1351 cf::override;
1309 }, 1352 },
1310); 1353);
1311 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1312sub load_extensions { 1368sub load_extensions {
1313 cf::sync_job { 1369 cf::sync_job {
1314 my %todo; 1370 my %todo;
1315 1371
1316 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1343 . "\n};\n1"; 1399 . "\n};\n1";
1344 1400
1345 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1346 } 1402 }
1347 1403
1404 my $pass = 0;
1348 my %done; 1405 my %done;
1349 while (%todo) { 1406 while (%todo) {
1350 my $progress; 1407 my $progress;
1351 1408
1409 ++$pass;
1410
1411 ext:
1352 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1414 next ext
1355 unless exists $done{$_}; 1415 unless exists $done{$_};
1356 } 1416 }
1357 1417
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1419
1360 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1424
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1426 if exists $v->{meta}{mandatory};
1368 1427 } else {
1369 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1370 } 1434 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1435 }
1376 1436
1377 skip: 1437 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1380 } 1445 }
1381 }; 1446 };
1382} 1447}
1383 1448
1384############################################################################# 1449#############################################################################
1385 1450
1386=back 1451=back
1387 1452
1388=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1389 1454
1390Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1391 1456
1392=cut 1457=cut
1393 1458
1394package cf::player; 1459package cf::player;
1395 1460
… …
1438 1503
1439sub exists($) { 1504sub exists($) {
1440 my ($login) = @_; 1505 my ($login) = @_;
1441 1506
1442 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1444} 1509}
1445 1510
1446sub find($) { 1511sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1513 my $login = $_[0];
… …
1523 my ($pl) = @_; 1588 my ($pl) = @_;
1524 1589
1525 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1526 1591
1527 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1594
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1596 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1598 $pl->ob->check_score;
… …
1619 } 1684 }
1620 1685
1621 \@paths 1686 \@paths
1622} 1687}
1623 1688
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1690
1626Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1692
1719=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1720 1694
1721Sends an ext reply to the player. 1695Sends an ext reply to the player.
1722 1696
… …
1935 1909
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1938} 1912}
1939 1913
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1914sub decay_objects {
1950 my ($self) = @_; 1915 my ($self) = @_;
1951 1916
1952 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1953 1918
… …
2035sub find { 2000sub find {
2036 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
2037 2002
2038 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
2039 2004
2040 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2007
2043 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2048 or return; 2010 or return;
2049 2011
2050 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2051 2013
… …
2063 2025
2064 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2065 } 2027 }
2066} 2028}
2067 2029
2068sub pre_load { } 2030sub pre_load { }
2069sub post_load { } 2031#sub post_load { } # XS
2070 2032
2071sub load { 2033sub load {
2072 my ($self) = @_; 2034 my ($self) = @_;
2073 2035
2074 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
… …
2119 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2082 $self->decay_objects;
2121 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2122 $self->update_buttons; 2084 $self->update_buttons;
2123 cf::cede_to_tick; 2085 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2086 $self->activate;
2127 } 2087 }
2128 2088
2129 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
… …
2296 2256
2297 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298 2258
2299 return if $self->players; 2259 return if $self->players;
2300 2260
2301 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2302 2262
2303 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2304 2264
2305 # need to save uniques path 2265 # need to save uniques path
2306 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
… …
2397 : normalise $_ 2357 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2359 ]
2400} 2360}
2401 2361
2362=item cf::map::static_maps
2363
2364Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2365file in the shared directory excluding F</styles> and F</editor>). May
2366block.
2367
2368=cut
2369
2370sub static_maps() {
2371 my @dirs = "";
2372 my @maps;
2373
2374 while (@dirs) {
2375 my $dir = shift @dirs;
2376
2377 next if $dir eq "/styles" || $dir eq "/editor";
2378
2379 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2380 or return;
2381
2382 for (@$files) {
2383 s/\.map$// or next;
2384 utf8::decode $_;
2385 push @maps, "$dir/$_";
2386 }
2387
2388 push @dirs, map "$dir/$_", @$dirs;
2389 }
2390
2391 \@maps
2392}
2393
2402=back 2394=back
2403 2395
2404=head3 cf::object 2396=head3 cf::object
2405 2397
2406=cut 2398=cut
… …
2471 2463
2472our $SAY_CHANNEL = { 2464our $SAY_CHANNEL = {
2473 id => "say", 2465 id => "say",
2474 title => "Map", 2466 title => "Map",
2475 reply => "say ", 2467 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2469};
2478 2470
2479our $CHAT_CHANNEL = { 2471our $CHAT_CHANNEL = {
2480 id => "chat", 2472 id => "chat",
2481 title => "Chat", 2473 title => "Chat",
… …
2536 2528
2537=item $player_object->enter_link 2529=item $player_object->enter_link
2538 2530
2539Freezes the player and moves him/her to a special map (C<{link}>). 2531Freezes the player and moves him/her to a special map (C<{link}>).
2540 2532
2541The player should be reasonably safe there for short amounts of time. You 2533The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2534for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link
2536map.
2543 2537
2544Will never block. 2538Will never block.
2545 2539
2546=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2547 2541
… …
2599 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2601 2595
2602 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2605 2599
2606 $map->load; 2600 $map->load;
2607 $map->load_neighbours; 2601 $map->load_neighbours;
2608 2602
2609 return unless $self->contr->active; 2603 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2604
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2606 $self->enter_map ($map, $x, $y);
2607
2608 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive;
2614} 2610}
2615 2611
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617 2613
2618Moves the player to the given map-path and coordinates by first freezing 2614Moves the player to the given map-path and coordinates by first freezing
… …
2777 $self->contr->savebed ($map, $x, $y) 2773 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2774 if $exit->flag (cf::FLAG_DAMNED);
2779 2775
2780 1 2776 1
2781 }) { 2777 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2779 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2782
2787 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
… …
2804sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2806 2802
2807 utf8::encode $text; 2803 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2805}
2806
2807=item $client->send_big_packet ($pkt)
2808
2809Like C<send_packet>, but tries to compress large packets, and fragments
2810them as required.
2811
2812=cut
2813
2814our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2815
2816sub cf::client::send_big_packet {
2817 my ($self, $pkt) = @_;
2818
2819 # try lzf for large packets
2820 $pkt = "lzf " . Compress::LZF::compress $pkt
2821 if 1024 <= length $pkt and $self->{can_lzf};
2822
2823 # split very large packets
2824 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2825 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2826 $pkt = "frag";
2827 }
2828
2829 $self->send_packet ($pkt);
2809} 2830}
2810 2831
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2833
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2834Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2817 2838
2818=cut 2839=cut
2819 2840
2820# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2822 "c/identify" => { 2849 "c/identify" => {
2823 id => "infobox", 2850 id => "infobox",
2824 title => "Identify", 2851 title => "Identify",
2825 reply => undef, 2852 reply => undef,
2826 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
… …
2828 "c/examine" => { 2855 "c/examine" => {
2829 id => "infobox", 2856 id => "infobox",
2830 title => "Examine", 2857 title => "Examine",
2831 reply => undef, 2858 reply => undef,
2832 tooltip => "Signs and other items you examined", 2859 tooltip => "Signs and other items you examined",
2860 },
2861 "c/shopinfo" => {
2862 id => "infobox",
2863 title => "Shop Info",
2864 reply => undef,
2865 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2866 },
2834 "c/book" => { 2867 "c/book" => {
2835 id => "infobox", 2868 id => "infobox",
2836 title => "Book", 2869 title => "Book",
2837 reply => undef, 2870 reply => undef,
… …
2853 id => "infobox", 2886 id => "infobox",
2854 title => "Body Parts", 2887 title => "Body Parts",
2855 reply => undef, 2888 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2889 tooltip => "Shows which body parts you posess and are available",
2857 }, 2890 },
2891 "c/statistics" => {
2892 id => "infobox",
2893 title => "Statistics",
2894 reply => undef,
2895 tooltip => "Shows your primary statistics",
2896 },
2897 "c/skills" => {
2898 id => "infobox",
2899 title => "Skills",
2900 reply => undef,
2901 tooltip => "Shows your experience per skill and item power",
2902 },
2903 "c/shopitems" => {
2904 id => "infobox",
2905 title => "Shop Items",
2906 reply => undef,
2907 tooltip => "Shows the items currently for sale in this shop",
2908 },
2909 "c/resistances" => {
2910 id => "infobox",
2911 title => "Resistances",
2912 reply => undef,
2913 tooltip => "Shows your resistances",
2914 },
2915 "c/pets" => {
2916 id => "infobox",
2917 title => "Pets",
2918 reply => undef,
2919 tooltip => "Shows information abotu your pets/a specific pet",
2920 },
2921 "c/perceiveself" => {
2922 id => "infobox",
2923 title => "Perceive Self",
2924 reply => undef,
2925 tooltip => "You gained detailed knowledge about yourself",
2926 },
2858 "c/uptime" => { 2927 "c/uptime" => {
2859 id => "infobox", 2928 id => "infobox",
2860 title => "Uptime", 2929 title => "Uptime",
2861 reply => undef, 2930 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2931 tooltip => "How long the server has been running since last restart",
… …
2871 id => "party", 2940 id => "party",
2872 title => "Party", 2941 title => "Party",
2873 reply => "gsay ", 2942 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2943 tooltip => "Messages and chat related to your party",
2875 }, 2944 },
2945 "c/death" => {
2946 id => "death",
2947 title => "Death",
2948 reply => undef,
2949 tooltip => "Reason for and more info about your most recent death",
2950 },
2951 "c/say" => $SAY_CHANNEL,
2952 "c/chat" => $CHAT_CHANNEL,
2876); 2953);
2877 2954
2878sub cf::client::send_msg { 2955sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2957
2881 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2882 2960
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2962
2885 # check predefined channels, for the benefit of C 2963 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2964 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2965 $channel = $CHANNEL{$channel};
2888 2966
2889 $self->ext_msg (channel_info => $channel) 2967 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2893 2969
2894 } elsif (ref $channel) { 2970 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2974 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2975 }
2901 2976
2902 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2903 } 2978 }
2904 2979
2905 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2906 2981
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2982 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2911 2985
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 2989 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 2990
2926 $color &= cf::NDI_COLOR_MASK; 2991 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 2992}
2940 2993
2941=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2942 2995
2943Sends an ext event to the client. 2996Sends an ext event to the client.
… …
2946 2999
2947sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2949 3002
2950 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 3008 }
2956} 3009}
2957 3010
2958=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2959 3012
… …
2963 3016
2964sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2966 3019
2967 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove 3023 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 } 3026 }
2974} 3027}
2975 3028
2976=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2977 3030
… …
3104our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3105 3158
3106$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3107 3160
3108$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3111 sort time 3164 sort time
3112)); 3165));
3113 3166
3114# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
… …
3118The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
3119 3172
3120 cf::object 3173 cf::object
3121 contr pay_amount pay_player map x y force_find force_add destroy 3174 contr pay_amount pay_player map x y force_find force_add destroy
3122 insert remove name archname title slaying race decrease split 3175 insert remove name archname title slaying race decrease split
3176 value
3123 3177
3124 cf::object::player 3178 cf::object::player
3125 player 3179 player
3126 3180
3127 cf::player 3181 cf::player
… …
3133=cut 3187=cut
3134 3188
3135for ( 3189for (
3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3190 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3137 insert remove inv nrof name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3192 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
3142) { 3196) {
3143 no strict 'refs'; 3197 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3163 3217
3164 my $qcode = $code; 3218 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3167 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
3168 local $_; 3225 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3226
3171 my $eval = 3227 my $eval =
3172 "do {\n" 3228 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3231 . $code
3176 . "\n}" 3232 . "\n}"
3177 ; 3233 ;
3178 3234
3235 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 sub_generation_inc; 3239 sub_generation_inc;
3240 } else {
3241 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval;
3243 }
3182 3244
3183 if ($@) { 3245 if ($@) {
3184 warn "$@"; 3246 warn "$@";
3185 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
… …
3205=cut 3267=cut
3206 3268
3207sub register_script_function { 3269sub register_script_function {
3208 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3209 3271
3210 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3212} 3274}
3213 3275
3214=back 3276=back
3215 3277
3216=cut 3278=cut
… …
3237 3299
3238 $facedata->{version} == 2 3300 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3302
3241 # patch in the exptable 3303 # patch in the exptable
3304 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3242 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3306 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3307 data => $exp_table,
3308 hash => (Digest::MD5::md5 $exp_table),
3245 }; 3309 };
3246 cf::cede_to_tick; 3310 cf::cede_to_tick;
3247 3311
3248 { 3312 {
3249 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
… …
3251 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3317
3254 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3258 3322
3259 cf::cede_to_tick; 3323 cf::cede_to_tick;
3260 } 3324 }
3261 3325
3262 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
… …
3286 3350
3287 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3288 } 3352 }
3289 3353
3290 { 3354 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3294 3356
3295 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3360
3300 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3315 } else { 3363 } else {
3316 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3317 } 3365 }
3318 3366
… …
3401 reload_treasures; 3449 reload_treasures;
3402 3450
3403 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3404} 3452}
3405 3453
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412}
3413
3414sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3416 or return; 3458 or return;
3417 3459
3418 local $/; 3460 local $/;
3419 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3420 3462
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3422 3464
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3428 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3429 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3430 }; 3472 };
3431 warn $@ if $@; 3473 warn $@ if $@;
3432 } 3474 }
3475
3476 warn "finished reloading resource files\n";
3477}
3478
3479sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!";
3482 flock $fh, &Fcntl::LOCK_EX
3483 or die "$PIDFILE: flock: $!";
3484 $fh
3485}
3486
3487# make sure only one server instance is running at any one time
3488sub atomic {
3489 my $fh = pidfile;
3490
3491 my $pid = <$fh>;
3492 kill 9, $pid if $pid > 0;
3493
3494 seek $fh, 0, 0;
3495 print $fh $$;
3496}
3497
3498sub main_loop {
3499 warn "EV::loop starting\n";
3500 if (1) {
3501 EV::loop;
3502 }
3503 warn "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP;
3433} 3505}
3434 3506
3435sub main { 3507sub main {
3508 cf::init_globals; # initialise logging
3509
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521
3436 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3524 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3525 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3527 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
3443 }; 3529 };
3444 3530
3445 { 3531 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3447 reload_config; 3538 reload_config;
3448 db_init; 3539 db_init;
3540
3541 cf::init_uuid;
3542 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills;
3545
3546 cf::init_beforeplay;
3547
3548 atomic;
3549
3449 load_extensions; 3550 load_extensions;
3450 3551
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3552 utime time, time, $RUNTIMEFILE;
3553
3554 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557
3558 (pop @POST_INIT)->(0) while @POST_INIT;
3452 } 3559 };
3453 3560
3454 EV::loop; 3561 main_loop;
3455} 3562}
3456 3563
3457############################################################################# 3564#############################################################################
3458# initialisation and cleanup 3565# initialisation and cleanup
3459 3566
… …
3466 }; 3573 };
3467 } 3574 }
3468} 3575}
3469 3576
3470sub write_runtime_sync { 3577sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3578 my $t0 = EV::time;
3472 3579
3473 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3475 3582
3476 IO::AIO::aio_utime $runtime, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3584
3478 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3479 3586
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3588 or return;
3482 3589
3483 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
… …
3495 aio_utime $fh, undef, undef; 3602 aio_utime $fh, undef, undef;
3496 3603
3497 close $fh 3604 close $fh
3498 or return; 3605 or return;
3499 3606
3500 aio_rename "$runtime~", $runtime 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3608 and return;
3502 3609
3503 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3504 3611
3505 1 3612 1
3506} 3613}
3507 3614
3508our $uuid_lock; 3615our $uuid_lock;
… …
3517 my $uuid = "$LOCALDIR/uuid"; 3624 my $uuid = "$LOCALDIR/uuid";
3518 3625
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3626 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3627 or return;
3521 3628
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3629 my $value = uuid_seq uuid_cur;
3630
3631 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n";
3633 return;
3634 }
3635
3636 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3637 $uuid_skip = 0;
3524 3638
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3639 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3640 and return;
3527 3641
… …
3549} 3663}
3550 3664
3551sub emergency_save() { 3665sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3666 my $freeze_guard = cf::freeze_mainloop;
3553 3667
3554 warn "enter emergency perl save\n"; 3668 warn "emergency_perl_save: enter\n";
3555 3669
3556 cf::sync_job { 3670 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675
3557 # use a peculiar iteration method to avoid tripping on perl 3676 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3677 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3678 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3679 warn "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3680 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3681 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3682 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3684 $pl->save;
3566 } 3685 }
3567 warn "end emergency player save\n"; 3686 warn "emergency_perl_save: end player save\n";
3568 3687
3569 warn "begin emergency map save\n"; 3688 warn "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3689 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3690 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3691 $map->valid or next;
3573 $map->save; 3692 $map->save;
3574 } 3693 }
3575 warn "end emergency map save\n"; 3694 warn "emergency_perl_save: end map save\n";
3576 3695
3577 warn "begin emergency database checkpoint\n"; 3696 warn "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3698 warn "emergency_perl_save: end database checkpoint\n";
3580 3699
3581 warn "begin write uuid\n"; 3700 warn "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3701 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3702 warn "emergency_perl_save: end write uuid\n";
3584 }; 3703 };
3585 3704
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3586 warn "leave emergency perl save\n"; 3710 warn "emergency_perl_save: leave\n";
3587} 3711}
3588 3712
3589sub post_cleanup { 3713sub post_cleanup {
3590 my ($make_core) = @_; 3714 my ($make_core) = @_;
3591 3715
3592 warn Carp::longmess "post_cleanup backtrace" 3716 warn Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3717 if $make_core;
3718
3719 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$;
3594} 3721}
3595 3722
3596# a safer delete_package, copied from Symbol 3723# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3724sub clear_package($) {
3598 my $pkg = shift; 3725 my $pkg = shift;
… …
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3742 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3743 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 3745 }
3619 warn "cleared package #$pkg\n";#d# 3746 warn "cleared package $pkg\n";#d#
3620} 3747}
3621
3622our $RELOAD; # how many times to reload
3623 3748
3624sub do_reload_perl() { 3749sub do_reload_perl() {
3625 # can/must only be called in main 3750 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3627 warn "can only reload from main coroutine"; 3752 warn "can only reload from main coroutine";
3628 return; 3753 return;
3629 } 3754 }
3630 3755
3631 return if $RELOAD++; 3756 return if $RELOAD++;
3757
3758 my $t1 = EV::time;
3632 3759
3633 while ($RELOAD) { 3760 while ($RELOAD) {
3634 warn "reloading..."; 3761 warn "reloading...";
3635 3762
3636 warn "entering sync_job"; 3763 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3824 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3826
3700 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3830
3704 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3832 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
3707 3834
3708 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
3709 3836
3710 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
3711 require cf; 3838 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
3713 3840
3714 warn "loading config and database again"; 3841 warn "loading config and database again";
3715 cf::reload_config; 3842 cf::reload_config;
3716 3843
3717 warn "loading extensions"; 3844 warn "loading extensions";
3718 cf::load_extensions; 3845 cf::load_extensions;
3719 3846
3847 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3848 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3849 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3850 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3851 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3852 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3853 reattach $_ for values %PLAYER;
3854 }
3855
3856 warn "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3726 3858
3727 warn "leaving sync_job"; 3859 warn "leaving sync_job";
3728 3860
3729 1 3861 1
3730 } or do { 3862 } or do {
… …
3733 }; 3865 };
3734 3866
3735 warn "reloaded"; 3867 warn "reloaded";
3736 --$RELOAD; 3868 --$RELOAD;
3737 } 3869 }
3870
3871 $t1 = EV::time - $t1;
3872 warn "reload completed in ${t1}s\n";
3738}; 3873};
3739 3874
3740our $RELOAD_WATCHER; # used only during reload 3875our $RELOAD_WATCHER; # used only during reload
3741 3876
3742sub reload_perl() { 3877sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 3878 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 3879 # coro crashes during coro_state_free->destroy here.
3745 3880
3881 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions;
3883
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 3885 do_reload_perl;
3748 undef $RELOAD_WATCHER; 3886 undef $RELOAD_WATCHER;
3887 };
3749 }; 3888 };
3750} 3889}
3751 3890
3752register_command "reload" => sub { 3891register_command "reload" => sub {
3753 my ($who, $arg) = @_; 3892 my ($who, $arg) = @_;
… …
3767 3906
3768our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3770 3909
3771sub wait_for_tick { 3910sub wait_for_tick {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3773 3912
3774 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3775 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait; 3915 $signal->wait;
3777} 3916}
3778 3917
3779sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3920
3782 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 3923 $signal->wait;
3785} 3924}
… …
3790 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3791 return; 3930 return;
3792 } 3931 }
3793 3932
3794 cf::server_tick; # one server iteration 3933 cf::server_tick; # one server iteration
3934
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3795 3936
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 3939 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
… …
3822} 3963}
3823 3964
3824{ 3965{
3825 # configure BDB 3966 # configure BDB
3826 3967
3827 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3830 3971
3831 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;
… …
3879 $msg =~ s/\n//; 4020 $msg =~ s/\n//;
3880 4021
3881 # limit the # of concurrent backtraces 4022 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4023 if ($_log_backtrace < 2) {
3883 ++$_log_backtrace; 4024 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg;
3884 async { 4026 async {
3885 $Coro::current->{desc} = "abt $msg"; 4027 $Coro::current->{desc} = "abt $msg";
3886 4028
3887 my @bt = fork_call { 4029 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4030 @addr = map { sprintf "%x", $_ } @addr;
… …
3899 } 4041 }
3900 4042
3901 @funcs 4043 @funcs
3902 }; 4044 };
3903 4045
3904 LOG llevInfo, "[ABT] $msg\n"; 4046 LOG llevInfo, "[ABT] $perl_bt\n";
4047 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4048 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4049 --$_log_backtrace;
3907 }; 4050 };
3908 } else { 4051 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4052 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4053 LOG llevInfo, "[ABT] [suppressed]\n";
3911 } 4054 }
3912} 4055}
3913 4056
3914# load additional modules 4057# load additional modules
3915use cf::pod; 4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
3916 4060
3917END { cf::emergency_save } 4061END { cf::emergency_save }
3918 4062
39191 40631
3920 4064

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines