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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.508 by root, Sun Mar 28 22:29:50 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";
100our %RESOURCE; 111our %RESOURCE;
101 112
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 115our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
106 117
107our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 121our $DB_ENV;
111 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
112our %CFG; 125our %CFG;
113 126
114our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 128our $RUNTIME;
116our $NOW; 129our $NOW;
124 137
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 140our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
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 :)
129 147
130binmode STDOUT; 148binmode STDOUT;
131binmode STDERR; 149binmode STDERR;
132 150
133# read virtual server time, if available 151# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
138} 156}
139 157
158eval "sub TICK() { $TICK } 1" or die;
159
140mkdir $_ 160mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 162
143our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
144 164
145sub 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::"} };
146 177
147############################################################################# 178#############################################################################
148 179
149=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
150 181
197returns 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
198per 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.
199 230
200=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
201 232
202This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
204that call. 235that call.
205 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
206=back 243=back
207 244
208=cut 245=cut
209 246
210BEGIN { 247$Coro::State::WARNHOOK = sub {
211 *CORE::GLOBAL::warn = sub {
212 my $msg = join "", @_; 248 my $msg = join "", @_;
213 249
214 $msg .= "\n" 250 $msg .= "\n"
215 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
216 252
217 $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;
218 254
219 LOG llevError, $msg; 255 LOG llevError, $msg;
220 }; 256};
221}
222 257
223$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
225 262
226 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 265 return;#d#
229 }#d# 266 }#d#
230 267
231 # kill coroutine otherwise 268 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 269 Coro::terminate
234}; 270};
235
236$SIG{__DIE__} = sub { }; #d#?
237 271
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 289)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 291}
258 292
259$EV::DIED = sub { 293$EV::DIED = sub {
260 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
261}; 295};
262 296
263############################################################################# 297#############################################################################
264 298
265=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
302our $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
303 337
304sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 355=item cf::lock_wait $string
308 356
309Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
310 358
311=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
312 360
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
316returned. 364returned.
317 365
318Locks 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
319deadlocked coro. 367deadlocked coro.
325 373
326Return 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.
327 375
328=cut 376=cut
329 377
330our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 379
333sub lock_wait($) { 380sub lock_wait($) {
334 my ($key) = @_; 381 $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} 382}
347 383
348sub lock_acquire($) { 384sub lock_acquire($) {
349 my ($key) = @_; 385 $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} 386}
363 387
364sub lock_active($) { 388sub lock_active($) {
365 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 390}
369 391
370sub freeze_mainloop { 392sub freeze_mainloop {
371 tick_inhibit_inc; 393 tick_inhibit_inc;
372 394
373 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
374} 396}
375 397
376=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
377 399
378Like 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
401 423
402=cut 424=cut
403 425
404our @SLOT_QUEUE; 426our @SLOT_QUEUE;
405our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
406 429
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
410 433
411 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
412 436
413 while () { 437 while () {
414 next_job: 438 next_job:
439
415 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 441
417 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 446 $job->[2]->send;
421 Coro::cede; 447 Coro::cede;
422 goto next_job; 448 goto next_job;
423 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 451 }
425 } 452 }
426 453
427 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
430 $signal->wait; 457 $signal->wait;
431 } else { 458 } else {
459 $busy = 0;
432 Coro::schedule; 460 Coro::schedule;
433 } 461 }
434 } 462 }
435}; 463};
436 464
437sub get_slot($;$$) { 465sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
439 467
440 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
441 469
442 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
443 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
444 473
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
730 759
731############################################################################# 760#############################################################################
732 761
733=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
734 763
735Many 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
736attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
738 767
739In 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>
740C<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
790=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
791 820
792Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
794 823
795Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
796that 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.
797 826
798These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
799 828
800=over 4 829=over 4
1150 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1151 1180
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1188 aio_close $fh;
1157 1189
1158 if (@$objs) { 1190 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1199 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1201 }
1167 } else { 1202 } else {
1168 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1169 } 1204 }
1170 1205
1171 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1210 } else {
1173 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1174 } 1212 }
1175 } else { 1213 } else {
1176 aio_unlink $filename; 1214 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1178 } 1216 }
1269 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1270 1308
1271 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1272} 1310}
1273 1311
1312use File::Glob ();
1313
1274cf::player->attach ( 1314cf::player->attach (
1275 on_command => sub { 1315 on_command => sub {
1276 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1277 1317
1278 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1310 1350
1311 cf::override; 1351 cf::override;
1312 }, 1352 },
1313); 1353);
1314 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
1315sub load_extensions { 1368sub load_extensions {
1316 cf::sync_job { 1369 cf::sync_job {
1317 my %todo; 1370 my %todo;
1318 1371
1319 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1346 . "\n};\n1"; 1399 . "\n};\n1";
1347 1400
1348 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1349 } 1402 }
1350 1403
1404 my $pass = 0;
1351 my %done; 1405 my %done;
1352 while (%todo) { 1406 while (%todo) {
1353 my $progress; 1407 my $progress;
1354 1408
1409 ++$pass;
1410
1411 ext:
1355 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1414 next ext
1358 unless exists $done{$_}; 1415 unless exists $done{$_};
1359 } 1416 }
1360 1417
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1419
1363 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1424
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1426 if exists $v->{meta}{mandatory};
1371 1427 } else {
1372 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;
1373 } 1434 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1435 }
1379 1436
1380 skip: 1437 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1445 }
1384 }; 1446 };
1385} 1447}
1386 1448
1387############################################################################# 1449#############################################################################
1388 1450
1389=back 1451=back
1390 1452
1391=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1392 1454
1393Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1394 1456
1395=cut 1457=cut
1396 1458
1397package cf::player; 1459package cf::player;
1398 1460
1441 1503
1442sub exists($) { 1504sub exists($) {
1443 my ($login) = @_; 1505 my ($login) = @_;
1444 1506
1445 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1447} 1509}
1448 1510
1449sub find($) { 1511sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1513 my $login = $_[0];
1622 } 1684 }
1623 1685
1624 \@paths 1686 \@paths
1625} 1687}
1626 1688
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1690
1629Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1630 1692
1631=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1632 1694
1633Sends an ext reply to the player. 1695Sends an ext reply to the player.
1634 1696
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1770
1709 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1772 $self->_create_random_map (
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1847 1909
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1850} 1912}
1851 1913
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 { 1914sub decay_objects {
1862 my ($self) = @_; 1915 my ($self) = @_;
1863 1916
1864 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1865 1918
1947sub find { 2000sub find {
1948 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
1949 2002
1950 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
1951 2004
1952 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2007
1955 $cf::MAP{$path} || do { 2008 $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 2009 my $map = new_from_path cf::map $path
1960 or return; 2010 or return;
1961 2011
1962 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
1963 2013
1975 2025
1976 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
1977 } 2027 }
1978} 2028}
1979 2029
1980sub pre_load { } 2030sub pre_load { }
1981sub post_load { } 2031#sub post_load { } # XS
1982 2032
1983sub load { 2033sub load {
1984 my ($self) = @_; 2034 my ($self) = @_;
1985 2035
1986 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2031 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2082 $self->decay_objects;
2033 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2034 $self->update_buttons; 2084 $self->update_buttons;
2035 cf::cede_to_tick; 2085 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick;
2038 $self->activate; 2086 $self->activate;
2039 } 2087 }
2040 2088
2041 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2045 } 2093 }
2046 2094
2047 $self->post_load; 2095 $self->post_load;
2048} 2096}
2049 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2050sub customise_for { 2101sub customise_for {
2051 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2052 2103
2053 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2105 if $self->per_player;
2208 2259
2209 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2261
2211 return if $self->players; 2262 return if $self->players;
2212 2263
2213 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2214 2265
2215 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2216 2267
2217 # need to save uniques path 2268 # need to save uniques path
2218 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2309 : normalise $_ 2360 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2362 ]
2312} 2363}
2313 2364
2365=item cf::map::static_maps
2366
2367Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2368file in the shared directory excluding F</styles> and F</editor>). May
2369block.
2370
2371=cut
2372
2373sub static_maps() {
2374 my @dirs = "";
2375 my @maps;
2376
2377 while (@dirs) {
2378 my $dir = shift @dirs;
2379
2380 next if $dir eq "/styles" || $dir eq "/editor";
2381
2382 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2383 or return;
2384
2385 for (@$files) {
2386 s/\.map$// or next;
2387 utf8::decode $_;
2388 push @maps, "$dir/$_";
2389 }
2390
2391 push @dirs, map "$dir/$_", @$dirs;
2392 }
2393
2394 \@maps
2395}
2396
2314=back 2397=back
2315 2398
2316=head3 cf::object 2399=head3 cf::object
2317 2400
2318=cut 2401=cut
2383 2466
2384our $SAY_CHANNEL = { 2467our $SAY_CHANNEL = {
2385 id => "say", 2468 id => "say",
2386 title => "Map", 2469 title => "Map",
2387 reply => "say ", 2470 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2472};
2390 2473
2391our $CHAT_CHANNEL = { 2474our $CHAT_CHANNEL = {
2392 id => "chat", 2475 id => "chat",
2393 title => "Chat", 2476 title => "Chat",
2448 2531
2449=item $player_object->enter_link 2532=item $player_object->enter_link
2450 2533
2451Freezes the player and moves him/her to a special map (C<{link}>). 2534Freezes the player and moves him/her to a special map (C<{link}>).
2452 2535
2453The player should be reasonably safe there for short amounts of time. You 2536The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2537for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link
2539map.
2455 2540
2456Will never block. 2541Will never block.
2457 2542
2458=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2459 2544
2511 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2512 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2513 2598
2514 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2515 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2516 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2517 2602
2518 $map->load; 2603 $map->load;
2519 $map->load_neighbours; 2604 $map->load_neighbours;
2520 2605
2521 return unless $self->contr->active; 2606 return unless $self->contr->active;
2522 $self->activate_recursive;
2523 2607
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2609 $self->enter_map ($map, $x, $y);
2610
2611 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive;
2526} 2613}
2527 2614
2528=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2529 2616
2530Moves the player to the given map-path and coordinates by first freezing 2617Moves the player to the given map-path and coordinates by first freezing
2689 $self->contr->savebed ($map, $x, $y) 2776 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2777 if $exit->flag (cf::FLAG_DAMNED);
2691 2778
2692 1 2779 1
2693 }) { 2780 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2782 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2785
2699 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2716sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2717 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2718 2805
2719 utf8::encode $text; 2806 utf8::encode $text;
2720 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2807 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2808}
2809
2810=item $client->send_big_packet ($pkt)
2811
2812Like C<send_packet>, but tries to compress large packets, and fragments
2813them as required.
2814
2815=cut
2816
2817our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2818
2819sub cf::client::send_big_packet {
2820 my ($self, $pkt) = @_;
2821
2822 # try lzf for large packets
2823 $pkt = "lzf " . Compress::LZF::compress $pkt
2824 if 1024 <= length $pkt and $self->{can_lzf};
2825
2826 # split very large packets
2827 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2828 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2829 $pkt = "frag";
2830 }
2831
2832 $self->send_packet ($pkt);
2721} 2833}
2722 2834
2723=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2724 2836
2725Send a drawinfo or msg packet to the client, formatting the msg for the 2837Send a drawinfo or msg packet to the client, formatting the msg for the
2729 2841
2730=cut 2842=cut
2731 2843
2732# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2733our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2734 "c/identify" => { 2852 "c/identify" => {
2735 id => "infobox", 2853 id => "infobox",
2736 title => "Identify", 2854 title => "Identify",
2737 reply => undef, 2855 reply => undef,
2738 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2740 "c/examine" => { 2858 "c/examine" => {
2741 id => "infobox", 2859 id => "infobox",
2742 title => "Examine", 2860 title => "Examine",
2743 reply => undef, 2861 reply => undef,
2744 tooltip => "Signs and other items you examined", 2862 tooltip => "Signs and other items you examined",
2863 },
2864 "c/shopinfo" => {
2865 id => "infobox",
2866 title => "Shop Info",
2867 reply => undef,
2868 tooltip => "What your bargaining skill tells you about the shop",
2745 }, 2869 },
2746 "c/book" => { 2870 "c/book" => {
2747 id => "infobox", 2871 id => "infobox",
2748 title => "Book", 2872 title => "Book",
2749 reply => undef, 2873 reply => undef,
2765 id => "infobox", 2889 id => "infobox",
2766 title => "Body Parts", 2890 title => "Body Parts",
2767 reply => undef, 2891 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2769 }, 2893 },
2894 "c/statistics" => {
2895 id => "infobox",
2896 title => "Statistics",
2897 reply => undef,
2898 tooltip => "Shows your primary statistics",
2899 },
2900 "c/skills" => {
2901 id => "infobox",
2902 title => "Skills",
2903 reply => undef,
2904 tooltip => "Shows your experience per skill and item power",
2905 },
2906 "c/shopitems" => {
2907 id => "infobox",
2908 title => "Shop Items",
2909 reply => undef,
2910 tooltip => "Shows the items currently for sale in this shop",
2911 },
2912 "c/resistances" => {
2913 id => "infobox",
2914 title => "Resistances",
2915 reply => undef,
2916 tooltip => "Shows your resistances",
2917 },
2918 "c/pets" => {
2919 id => "infobox",
2920 title => "Pets",
2921 reply => undef,
2922 tooltip => "Shows information abotu your pets/a specific pet",
2923 },
2924 "c/perceiveself" => {
2925 id => "infobox",
2926 title => "Perceive Self",
2927 reply => undef,
2928 tooltip => "You gained detailed knowledge about yourself",
2929 },
2770 "c/uptime" => { 2930 "c/uptime" => {
2771 id => "infobox", 2931 id => "infobox",
2772 title => "Uptime", 2932 title => "Uptime",
2773 reply => undef, 2933 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2934 tooltip => "How long the server has been running since last restart",
2783 id => "party", 2943 id => "party",
2784 title => "Party", 2944 title => "Party",
2785 reply => "gsay ", 2945 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2946 tooltip => "Messages and chat related to your party",
2787 }, 2947 },
2948 "c/death" => {
2949 id => "death",
2950 title => "Death",
2951 reply => undef,
2952 tooltip => "Reason for and more info about your most recent death",
2953 },
2954 "c/say" => $SAY_CHANNEL,
2955 "c/chat" => $CHAT_CHANNEL,
2788); 2956);
2789 2957
2790sub cf::client::send_msg { 2958sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2960
2793 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2794 2963
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2965
2797 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2800 2969
2801 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2805 2972
2806 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 2978 }
2813 2979
2814 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2815 } 2981 }
2816 2982
2817 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2818 2984
2819 if ($self->can_msg) {
2820 # default colour, mask it out 2985 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2823 2988
2824 my $pkt = "msg " 2989 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 2990 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 2992 );
2828 2993
2829 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf};
2832
2833 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag";
2837 }
2838
2839 $self->send_packet ($pkt); 2994 $self->send_big_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 2995}
2866 2996
2867=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2868 2998
2869Sends an ext event to the client. 2999Sends an ext event to the client.
2872 3002
2873sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2874 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2875 3005
2876 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2878 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2879 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2880 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2881 } 3011 }
2882} 3012}
2883 3013
2884=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2885 3015
2889 3019
2890sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2891 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2892 3022
2893 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2894 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2895 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2896 #TODO: version 1, remove 3026 #TODO: version 1, remove
2897 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3029 }
2900} 3030}
2901 3031
2902=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2903 3033
3030our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3031 3161
3032$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3033 3163
3034$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3035 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3036 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3037 sort time 3167 sort time
3038)); 3168));
3039 3169
3040# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
3044The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3045 3175
3046 cf::object 3176 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3177 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3178 insert remove name archname title slaying race decrease split
3179 value
3049 3180
3050 cf::object::player 3181 cf::object::player
3051 player 3182 player
3052 3183
3053 cf::player 3184 cf::player
3059=cut 3190=cut
3060 3191
3061for ( 3192for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3193 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3068) { 3199) {
3069 no strict 'refs'; 3200 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3089 3220
3090 my $qcode = $code; 3221 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3093 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3094 local $_; 3228 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars;
3096 3229
3097 my $eval = 3230 my $eval =
3098 "do {\n" 3231 "do {\n"
3099 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3100 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3101 . $code 3234 . $code
3102 . "\n}" 3235 . "\n}"
3103 ; 3236 ;
3104 3237
3238 if ($CFG{safe_eval}) {
3105 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3106 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3107 sub_generation_inc; 3242 sub_generation_inc;
3243 } else {
3244 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval;
3246 }
3108 3247
3109 if ($@) { 3248 if ($@) {
3110 warn "$@"; 3249 warn "$@";
3111 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3112 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
3131=cut 3270=cut
3132 3271
3133sub register_script_function { 3272sub register_script_function {
3134 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3135 3274
3136 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3137 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3138} 3277}
3139 3278
3140=back 3279=back
3141 3280
3142=cut 3281=cut
3163 3302
3164 $facedata->{version} == 2 3303 $facedata->{version} == 2
3165 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3166 3305
3167 # patch in the exptable 3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3168 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3169 type => FT_RSRC, 3309 type => FT_RSRC,
3170 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3171 }; 3312 };
3172 cf::cede_to_tick; 3313 cf::cede_to_tick;
3173 3314
3174 { 3315 {
3175 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3177 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3178 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3179 3320
3180 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3181 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3182 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3183 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3184 3325
3185 cf::cede_to_tick; 3326 cf::cede_to_tick;
3186 } 3327 }
3187 3328
3188 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3212 3353
3213 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3214 } 3355 }
3215 3356
3216 { 3357 {
3217 # TODO: for gcfclient pleasure, we should give resources
3218 # that gcfclient doesn't grok a >10000 face index.
3219 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3220 3359
3221 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3222 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3223 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3224 my $data;
3225 3363
3226 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3227 # prepend meta info
3228
3229 my $meta = $enc->encode ({
3230 name => $name,
3231 %{ $info->{meta} || {} },
3232 });
3233
3234 $data = pack "(w/a*)*", $meta, $info->{data};
3235 } else {
3236 $data = $info->{data};
3237 }
3238
3239 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3240 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3241 } else { 3366 } else {
3242 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3243 } 3368 }
3244 3369
3327 reload_treasures; 3452 reload_treasures;
3328 3453
3329 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3330} 3455}
3331 3456
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3461 or return;
3343 3462
3344 local $/; 3463 local $/;
3345 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3346 3465
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3467
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3475 };
3357 warn $@ if $@; 3476 warn $@ if $@;
3358 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3359} 3480}
3360 3481
3361sub pidfile() { 3482sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3484 or die "$PIDFILE: $!";
3375 3496
3376 seek $fh, 0, 0; 3497 seek $fh, 0, 0;
3377 print $fh $$; 3498 print $fh $$;
3378} 3499}
3379 3500
3501sub main_loop {
3502 warn "EV::loop starting\n";
3503 if (1) {
3504 EV::loop;
3505 }
3506 warn "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP;
3508}
3509
3380sub main { 3510sub main {
3381 atomic; 3511 cf::init_globals; # initialise logging
3512
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3524
3383 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3527 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3528 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3390 }; 3532 };
3391 3533
3392 { 3534 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3394 reload_config; 3541 reload_config;
3395 db_init; 3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills;
3548
3549 cf::init_beforeplay;
3550
3551 atomic;
3552
3396 load_extensions; 3553 load_extensions;
3397 3554
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3555 utime time, time, $RUNTIMEFILE;
3402 3556
3403 # no (long-running) fork's whatsoever before this point(!) 3557 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX ();
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3405 3560
3406 EV::loop; 3561 (pop @POST_INIT)->(0) while @POST_INIT;
3562 };
3563
3564 main_loop;
3407} 3565}
3408 3566
3409############################################################################# 3567#############################################################################
3410# initialisation and cleanup 3568# initialisation and cleanup
3411 3569
3418 }; 3576 };
3419 } 3577 }
3420} 3578}
3421 3579
3422sub write_runtime_sync { 3580sub write_runtime_sync {
3581 my $t0 = EV::time;
3582
3423 # first touch the runtime file to show we are still running: 3583 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3584 # the fsync below can take a very very long time.
3425 3585
3426 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3587
3428 my $guard = cf::lock_acquire "write_runtime"; 3588 my $guard = cf::lock_acquire "write_runtime";
3429 3589
3430 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3590 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3591 or return;
3432 3592
3433 my $value = $cf::RUNTIME + 90 + 10; 3593 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3594 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3595 # 60 allows for the watchdog to kill the server.
3448 or return; 3608 or return;
3449 3609
3450 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3611 and return;
3452 3612
3453 warn "runtime file written.\n"; 3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3454 3614
3455 1 3615 1
3456} 3616}
3457 3617
3458our $uuid_lock; 3618our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3627 my $uuid = "$LOCALDIR/uuid";
3468 3628
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3629 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3630 or return;
3471 3631
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3632 my $value = uuid_seq uuid_cur;
3633
3634 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n";
3636 return;
3637 }
3638
3639 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3640 $uuid_skip = 0;
3474 3641
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3642 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3643 and return;
3477 3644
3499} 3666}
3500 3667
3501sub emergency_save() { 3668sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3669 my $freeze_guard = cf::freeze_mainloop;
3503 3670
3504 warn "enter emergency perl save\n"; 3671 warn "emergency_perl_save: enter\n";
3505 3672
3506 cf::sync_job { 3673 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678
3507 # use a peculiar iteration method to avoid tripping on perl 3679 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3680 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3681 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3682 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3683 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3684 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3685 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3687 $pl->save;
3516 } 3688 }
3517 warn "end emergency player save\n"; 3689 warn "emergency_perl_save: end player save\n";
3518 3690
3519 warn "begin emergency map save\n"; 3691 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3692 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3693 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3694 $map->valid or next;
3523 $map->save; 3695 $map->save;
3524 } 3696 }
3525 warn "end emergency map save\n"; 3697 warn "emergency_perl_save: end map save\n";
3526 3698
3527 warn "begin emergency database checkpoint\n"; 3699 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3700 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3701 warn "emergency_perl_save: end database checkpoint\n";
3530 3702
3531 warn "begin write uuid\n"; 3703 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3704 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3705 warn "emergency_perl_save: end write uuid\n";
3534 }; 3706 };
3535 3707
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3536 warn "leave emergency perl save\n"; 3713 warn "emergency_perl_save: leave\n";
3537} 3714}
3538 3715
3539sub post_cleanup { 3716sub post_cleanup {
3540 my ($make_core) = @_; 3717 my ($make_core) = @_;
3541 3718
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3745 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3746 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3748 }
3572 warn "cleared package #$pkg\n";#d# 3749 warn "cleared package $pkg\n";#d#
3573} 3750}
3574
3575our $RELOAD; # how many times to reload
3576 3751
3577sub do_reload_perl() { 3752sub do_reload_perl() {
3578 # can/must only be called in main 3753 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3755 warn "can only reload from main coroutine";
3581 return; 3756 return;
3582 } 3757 }
3583 3758
3584 return if $RELOAD++; 3759 return if $RELOAD++;
3760
3761 my $t1 = EV::time;
3585 3762
3586 while ($RELOAD) { 3763 while ($RELOAD) {
3587 warn "reloading..."; 3764 warn "reloading...";
3588 3765
3589 warn "entering sync_job"; 3766 warn "entering sync_job";
3650 clear_package "safe::$_" 3827 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3829
3653 warn "unloading cf.pm \"a bit\""; 3830 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3831 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3833
3657 # don't, removes xs symbols, too, 3834 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3835 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3836 #clear_package __PACKAGE__;
3660 3837
3661 warn "unload completed, starting to reload now"; 3838 warn "unload completed, starting to reload now";
3662 3839
3663 warn "reloading cf.pm"; 3840 warn "reloading cf.pm";
3664 require cf; 3841 require cf;
3665 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3842 cf::_connect_to_perl_1;
3666 3843
3667 warn "loading config and database again"; 3844 warn "loading config and database again";
3668 cf::reload_config; 3845 cf::reload_config;
3669 3846
3670 warn "loading extensions"; 3847 warn "loading extensions";
3671 cf::load_extensions; 3848 cf::load_extensions;
3672 3849
3850 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3851 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3852 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3853 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3854 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3855 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3856 reattach $_ for values %PLAYER;
3857 }
3858
3859 warn "running post_init jobs";
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3861
3680 warn "leaving sync_job"; 3862 warn "leaving sync_job";
3681 3863
3682 1 3864 1
3683 } or do { 3865 } or do {
3686 }; 3868 };
3687 3869
3688 warn "reloaded"; 3870 warn "reloaded";
3689 --$RELOAD; 3871 --$RELOAD;
3690 } 3872 }
3873
3874 $t1 = EV::time - $t1;
3875 warn "reload completed in ${t1}s\n";
3691}; 3876};
3692 3877
3693our $RELOAD_WATCHER; # used only during reload 3878our $RELOAD_WATCHER; # used only during reload
3694 3879
3695sub reload_perl() { 3880sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3881 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3882 # coro crashes during coro_state_free->destroy here.
3698 3883
3884 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions;
3886
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3888 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3889 undef $RELOAD_WATCHER;
3890 };
3702 }; 3891 };
3703} 3892}
3704 3893
3705register_command "reload" => sub { 3894register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3895 my ($who, $arg) = @_;
3720 3909
3721our @WAIT_FOR_TICK; 3910our @WAIT_FOR_TICK;
3722our @WAIT_FOR_TICK_BEGIN; 3911our @WAIT_FOR_TICK_BEGIN;
3723 3912
3724sub wait_for_tick { 3913sub wait_for_tick {
3725 return if tick_inhibit || $Coro::current == $Coro::main; 3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3726 3915
3727 my $signal = new Coro::Signal; 3916 my $signal = new Coro::Signal;
3728 push @WAIT_FOR_TICK, $signal; 3917 push @WAIT_FOR_TICK, $signal;
3729 $signal->wait; 3918 $signal->wait;
3730} 3919}
3731 3920
3732sub wait_for_tick_begin { 3921sub wait_for_tick_begin {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3734 3923
3735 my $signal = new Coro::Signal; 3924 my $signal = new Coro::Signal;
3736 push @WAIT_FOR_TICK_BEGIN, $signal; 3925 push @WAIT_FOR_TICK_BEGIN, $signal;
3737 $signal->wait; 3926 $signal->wait;
3738} 3927}
3743 unless ++$bug_warning > 10; 3932 unless ++$bug_warning > 10;
3744 return; 3933 return;
3745 } 3934 }
3746 3935
3747 cf::server_tick; # one server iteration 3936 cf::server_tick; # one server iteration
3937
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3748 3939
3749 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3940 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3750 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3751 Coro::async_pool { 3942 Coro::async_pool {
3752 $Coro::current->{desc} = "runtime saver"; 3943 $Coro::current->{desc} = "runtime saver";
3775} 3966}
3776 3967
3777{ 3968{
3778 # configure BDB 3969 # configure BDB
3779 3970
3780 BDB::min_parallel 8; 3971 BDB::min_parallel 16;
3781 BDB::max_poll_reqs $TICK * 0.1; 3972 BDB::max_poll_reqs $TICK * 0.1;
3782 $AnyEvent::BDB::WATCHER->priority (1); 3973 $AnyEvent::BDB::WATCHER->priority (1);
3783 3974
3784 unless ($DB_ENV) { 3975 unless ($DB_ENV) {
3785 $DB_ENV = BDB::db_env_create; 3976 $DB_ENV = BDB::db_env_create;
3832 $msg =~ s/\n//; 4023 $msg =~ s/\n//;
3833 4024
3834 # limit the # of concurrent backtraces 4025 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 4026 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 4027 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg;
3837 async { 4029 async {
3838 $Coro::current->{desc} = "abt $msg"; 4030 $Coro::current->{desc} = "abt $msg";
3839 4031
3840 my @bt = fork_call { 4032 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 4033 @addr = map { sprintf "%x", $_ } @addr;
3852 } 4044 }
3853 4045
3854 @funcs 4046 @funcs
3855 }; 4047 };
3856 4048
3857 LOG llevInfo, "[ABT] $msg\n"; 4049 LOG llevInfo, "[ABT] $perl_bt\n";
4050 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 4051 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 4052 --$_log_backtrace;
3860 }; 4053 };
3861 } else { 4054 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 4055 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 4056 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 4057 }
3865} 4058}
3866 4059
3867# load additional modules 4060# load additional modules
3868use cf::pod; 4061require "cf/$_.pm" for @EXTRA_MODULES;
4062cf::_connect_to_perl_2;
3869 4063
3870END { cf::emergency_save } 4064END { cf::emergency_save }
3871 4065
38721 40661
3873 4067

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines