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.420 by root, Tue Apr 15 14:21:04 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub 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::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
191returns 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
192per 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.
193 230
194=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
195 232
196This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 235that call.
199 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
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $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;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
255}; 295};
256 296
257############################################################################# 297#############################################################################
258 298
259=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
296our $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
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks 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
313deadlocked coro. 367deadlocked coro.
319 373
320Return 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.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like 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
395 423
396=cut 424=cut
397 425
398our @SLOT_QUEUE; 426our @SLOT_QUEUE;
399our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
400 429
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
404 433
405 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
406 436
407 while () { 437 while () {
408 next_job: 438 next_job:
439
409 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 441
411 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 446 $job->[2]->send;
415 Coro::cede; 447 Coro::cede;
416 goto next_job; 448 goto next_job;
417 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 451 }
419 } 452 }
420 453
421 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 457 $signal->wait;
425 } else { 458 } else {
459 $busy = 0;
426 Coro::schedule; 460 Coro::schedule;
427 } 461 }
428 } 462 }
429}; 463};
430 464
431sub get_slot($;$$) { 465sub get_slot($;$$) {
432 return if tick_inhibit; 466 return if tick_inhibit || $Coro::current == $Coro::main;
433 467
434 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
435 469
436 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
437 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
438 473
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
724 759
725############################################################################# 760#############################################################################
726 761
727=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
728 763
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
732 767
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
785 820
786Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
788 823
789Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 826
792These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
793 828
794=over 4 829=over 4
1085 1120
1086sub reattach { 1121sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1123 my ($obj) = @_;
1089 1124
1125 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1127
1092 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1093 1129
1094 @$registry = (); 1130 @$registry = ();
1095 1131
1141 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1144 1180
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1188 aio_close $fh;
1150 1189
1151 if (@$objs) { 1190 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1199 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1201 }
1160 } else { 1202 } else {
1161 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1162 } 1204 }
1163 1205
1164 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1210 } else {
1166 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1167 } 1212 }
1168 } else { 1213 } else {
1169 aio_unlink $filename; 1214 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1171 } 1216 }
1262 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1263 1308
1264 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1265} 1310}
1266 1311
1312use File::Glob ();
1313
1267cf::player->attach ( 1314cf::player->attach (
1268 on_command => sub { 1315 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1270 1317
1271 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1303 1350
1304 cf::override; 1351 cf::override;
1305 }, 1352 },
1306); 1353);
1307 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
1308sub load_extensions { 1368sub load_extensions {
1309 cf::sync_job { 1369 cf::sync_job {
1310 my %todo; 1370 my %todo;
1311 1371
1312 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1331 1391
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1394
1335 $ext{source} = 1395 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1338 . $source 1398 . $source
1339 . "\n};\n1"; 1399 . "\n};\n1";
1340 1400
1341 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1342 } 1402 }
1343 1403
1404 my $pass = 0;
1344 my %done; 1405 my %done;
1345 while (%todo) { 1406 while (%todo) {
1346 my $progress; 1407 my $progress;
1347 1408
1409 ++$pass;
1410
1411 ext:
1348 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1414 next ext
1351 unless exists $done{$_}; 1415 unless exists $done{$_};
1352 } 1416 }
1353 1417
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1419
1356 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1424
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1426 if exists $v->{meta}{mandatory};
1364 1427 } else {
1365 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;
1366 } 1434 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1435 }
1372 1436
1373 skip: 1437 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1445 }
1377 }; 1446 };
1378} 1447}
1379 1448
1380############################################################################# 1449#############################################################################
1381 1450
1382=back 1451=back
1383 1452
1384=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1385 1454
1386Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1387 1456
1388=cut 1457=cut
1389 1458
1390package cf::player; 1459package cf::player;
1391 1460
1434 1503
1435sub exists($) { 1504sub exists($) {
1436 my ($login) = @_; 1505 my ($login) = @_;
1437 1506
1438 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1440} 1509}
1441 1510
1442sub find($) { 1511sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1513 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1526 or return;
1458 1527
1459 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1460 or return; 1529 or return;
1530
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1464 } 1534 }
1465 } 1535 }
1518 my ($pl) = @_; 1588 my ($pl) = @_;
1519 1589
1520 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1521 1591
1522 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1523 $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
1524 1594
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1529 1601
1530 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1642
1571 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1572 my $path = path $login; 1644 my $path = path $login;
1573 1645
1574 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1652 }
1580 1653
1611 } 1684 }
1612 1685
1613 \@paths 1686 \@paths
1614} 1687}
1615 1688
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1690
1618Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1692
1709=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1710 1694
1711Sends an ext reply to the player. 1695Sends an ext reply to the player.
1712 1696
1925 1909
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1928} 1912}
1929 1913
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1914sub decay_objects {
1940 my ($self) = @_; 1915 my ($self) = @_;
1941 1916
1942 return if $self->{deny_reset}; 1917 return if $self->{deny_reset};
1943 1918
2025sub find { 2000sub find {
2026 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
2027 2002
2028 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
2029 2004
2030 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2007
2033 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2038 or return; 2010 or return;
2039 2011
2040 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2041 2013
2043 or return; 2015 or return;
2044 2016
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2048 undef $guard1; 2021 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2022 $map->reset;
2051 return find $path; 2023 return find $path;
2052 } 2024 }
2053 2025
2054 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2055 } 2027 }
2056} 2028}
2057 2029
2058sub pre_load { } 2030sub pre_load { }
2059sub post_load { } 2031#sub post_load { } # XS
2060 2032
2061sub load { 2033sub load {
2062 my ($self) = @_; 2034 my ($self) = @_;
2063 2035
2064 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2054 $f->skip_block;
2083 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2084 or return; 2056 or return;
2085 2057
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2087 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2088 2060
2089 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2062 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2082 $self->decay_objects;
2111 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2112 $self->update_buttons; 2084 $self->update_buttons;
2113 cf::cede_to_tick; 2085 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2086 $self->activate;
2117 } 2087 }
2118 2088
2119 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2286 2256
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2258
2289 return if $self->players; 2259 return if $self->players;
2290 2260
2291 warn "resetting map ", $self->path; 2261 warn "resetting map ", $self->path, "\n";
2292 2262
2293 $self->in_memory (cf::MAP_SWAPPED); 2263 $self->in_memory (cf::MAP_SWAPPED);
2294 2264
2295 # need to save uniques path 2265 # need to save uniques path
2296 unless ($self->{deny_save}) { 2266 unless ($self->{deny_save}) {
2387 : normalise $_ 2357 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2358 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2359 ]
2390} 2360}
2391 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
2392=back 2394=back
2393 2395
2394=head3 cf::object 2396=head3 cf::object
2395 2397
2396=cut 2398=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2460dialogue with the given NPC character.
2459 2461
2460=cut 2462=cut
2461 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2462# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2479# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2495
2480 } else { 2496 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2499 }
2484 } 2500 }
2485} 2501}
2486 2502
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2528
2513=item $player_object->enter_link 2529=item $player_object->enter_link
2514 2530
2515Freezes 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}>).
2516 2532
2517The 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.
2518I<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.
2519 2537
2520Will never block. 2538Will never block.
2521 2539
2522=item $player_object->leave_link ($map, $x, $y) 2540=item $player_object->leave_link ($map, $x, $y)
2523 2541
2575 ($x, $y) = (-1, -1) 2593 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2594 unless (defined $x) && (defined $y);
2577 2595
2578 # use -1 or undef as default coordinates, not 0, 0 2596 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2597 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2598 if $x <= 0 && $y <= 0;
2581 2599
2582 $map->load; 2600 $map->load;
2583 $map->load_neighbours; 2601 $map->load_neighbours;
2584 2602
2585 return unless $self->contr->active; 2603 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2604
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $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;
2590} 2610}
2591 2611
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2613
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2615her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2616that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2617the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2618be called at the end of this process.
2619
2620Note that $check will be called with a potentially non-loaded map, so if
2621it needs a loaded map it has to call C<< ->load >>.
2599 2622
2600=cut 2623=cut
2601 2624
2602our $GOTOGEN; 2625our $GOTOGEN;
2603 2626
2682} 2705}
2683 2706
2684sub prepare_random_map { 2707sub prepare_random_map {
2685 my ($exit) = @_; 2708 my ($exit) = @_;
2686 2709
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2710 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2711 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2712 # that depends on the exit object
2692 2713
2693 my $rmp = parse_random_map_params $exit->msg; 2714 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2716 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2717 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2718 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2719 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2720 $rmp->{origin_y} = $exit->y;
2721
2722 $exit->map->touch;
2700 } 2723 }
2701 2724
2702 $rmp->{random_seed} ||= $exit->random_seed; 2725 $rmp->{random_seed} ||= $exit->random_seed;
2703 2726
2704 my $data = cf::encode_json $rmp; 2727 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2728 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2729 my $meta = "$RANDOMDIR/$md5.meta";
2707 2730
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2731 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2732 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2733 undef $fh;
2711 aio_rename "$meta~", $meta; 2734 aio_rename "$meta~", $meta;
2712 2735
2736 my $slaying = "?random/$md5";
2737
2738 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2739 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2740 $exit->msg (undef);
2741 }
2715 } 2742 }
2716} 2743}
2717 2744
2718sub cf::object::player::enter_exit { 2745sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2746 my ($self, $exit) = @_;
2720 2747
2721 return unless $self->type == cf::PLAYER; 2748 return unless $self->type == cf::PLAYER;
2722 2749
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2750 $self->enter_link;
2735 2751
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2752 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2753 $Coro::current->{desc} = "enter_exit";
2742 2754
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2755 unless (eval {
2756 $self->deactivate_recursive; # just to be sure
2757
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2767 my $x = $exit->stats->hp;
2768 my $y = $exit->stats->sp;
2769
2745 $self->goto ($slaying, $hp, $sp); 2770 $self->goto ($map, $x, $y);
2746 2771
2772 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED);
2775
2747 1; 2776 1
2748 }) { 2777 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2778 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2780 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2781 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2782
2754 warn "ERROR in enter_exit: $@"; 2783 warn "ERROR in enter_exit: $@";
2771sub cf::client::send_drawinfo { 2800sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2801 my ($self, $text, $flags) = @_;
2773 2802
2774 utf8::encode $text; 2803 utf8::encode $text;
2775 $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);
2776} 2830}
2777 2831
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2832=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2833
2780Send 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
2784 2838
2785=cut 2839=cut
2786 2840
2787# non-persistent channels (usually the info channel) 2841# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2842our %CHANNEL = (
2843 "c/motd" => {
2844 id => "infobox",
2845 title => "MOTD",
2846 reply => undef,
2847 tooltip => "The message of the day",
2848 },
2789 "c/identify" => { 2849 "c/identify" => {
2790 id => "infobox", 2850 id => "infobox",
2791 title => "Identify", 2851 title => "Identify",
2792 reply => undef, 2852 reply => undef,
2793 tooltip => "Items recently identified", 2853 tooltip => "Items recently identified",
2795 "c/examine" => { 2855 "c/examine" => {
2796 id => "infobox", 2856 id => "infobox",
2797 title => "Examine", 2857 title => "Examine",
2798 reply => undef, 2858 reply => undef,
2799 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",
2800 }, 2866 },
2801 "c/book" => { 2867 "c/book" => {
2802 id => "infobox", 2868 id => "infobox",
2803 title => "Book", 2869 title => "Book",
2804 reply => undef, 2870 reply => undef,
2820 id => "infobox", 2886 id => "infobox",
2821 title => "Body Parts", 2887 title => "Body Parts",
2822 reply => undef, 2888 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2889 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 2927 "c/uptime" => {
2826 id => "infobox", 2928 id => "infobox",
2827 title => "Uptime", 2929 title => "Uptime",
2828 reply => undef, 2930 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2931 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2934 id => "infobox",
2833 title => "Map Info", 2935 title => "Map Info",
2834 reply => undef, 2936 reply => undef,
2835 tooltip => "Information related to the maps", 2937 tooltip => "Information related to the maps",
2836 }, 2938 },
2939 "c/party" => {
2940 id => "party",
2941 title => "Party",
2942 reply => "gsay ",
2943 tooltip => "Messages and chat related to your party",
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,
2837); 2953);
2838 2954
2839sub cf::client::send_msg { 2955sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2956 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2957
2842 $msg = $self->pl->expand_cfpod ($msg); 2958 $msg = $self->pl->expand_cfpod ($msg)
2959 unless $color & cf::NDI_VERBATIM;
2843 2960
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2961 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2962
2846 # check predefined channels, for the benefit of C 2963 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2964 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2965 $channel = $CHANNEL{$channel};
2849 2966
2850 $self->ext_msg (channel_info => $channel) 2967 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2854 2969
2855 } elsif (ref $channel) { 2970 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2971 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2972 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2973 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2974 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2975 }
2862 2976
2863 $channel = $channel->{id}; 2977 $channel = $channel->{id};
2864 } 2978 }
2865 2979
2866 return unless @extra || length $msg; 2980 return unless @extra || length $msg;
2867 2981
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2982 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2983 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2984 if $color & cf::NDI_DEF;
2872 2985
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2986 my $pkt = "msg "
2987 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2988 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2989 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2990
2887 $color &= cf::NDI_COLOR_MASK; 2991 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 2992}
2901 2993
2902=item $client->ext_msg ($type, @msg) 2994=item $client->ext_msg ($type, @msg)
2903 2995
2904Sends an ext event to the client. 2996Sends an ext event to the client.
2907 2999
2908sub cf::client::ext_msg($$@) { 3000sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3001 my ($self, $type, @msg) = @_;
2910 3002
2911 if ($self->extcmd == 2) { 3003 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3004 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3005 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3006 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3008 }
2917} 3009}
2918 3010
2919=item $client->ext_reply ($msgid, @msg) 3011=item $client->ext_reply ($msgid, @msg)
2920 3012
2924 3016
2925sub cf::client::ext_reply($$@) { 3017sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3018 my ($self, $id, @msg) = @_;
2927 3019
2928 if ($self->extcmd == 2) { 3020 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3021 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3022 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3023 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3024 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3025 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3026 }
2935} 3027}
2936 3028
2937=item $success = $client->query ($flags, "text", \&cb) 3029=item $success = $client->query ($flags, "text", \&cb)
2938 3030
3065our $safe_hole = new Safe::Hole; 3157our $safe_hole = new Safe::Hole;
3066 3158
3067$SIG{FPE} = 'IGNORE'; 3159$SIG{FPE} = 'IGNORE';
3068 3160
3069$safe->permit_only (Opcode::opset qw( 3161$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3162 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3163 grepstart grepwhile mapstart mapwhile
3072 sort time 3164 sort time
3073)); 3165));
3074 3166
3075# here we export the classes and methods available to script code 3167# here we export the classes and methods available to script code
3078 3170
3079The following functions and methods are available within a safe environment: 3171The following functions and methods are available within a safe environment:
3080 3172
3081 cf::object 3173 cf::object
3082 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
3083 insert remove name archname title slaying race decrease_ob_nr 3175 insert remove name archname title slaying race decrease split
3176 value
3084 3177
3085 cf::object::player 3178 cf::object::player
3086 player 3179 player
3087 3180
3088 cf::player 3181 cf::player
3093 3186
3094=cut 3187=cut
3095 3188
3096for ( 3189for (
3097 ["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
3098 insert remove inv name archname title slaying race 3191 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3192 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3193 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3194 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3195 ["cf::map" => qw(trigger)],
3103) { 3196) {
3104 no strict 'refs'; 3197 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3198 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 3217
3125 my $qcode = $code; 3218 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3219 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3220 $qcode =~ s/\n/\\n/g;
3128 3221
3222 %vars = (_dummy => 0) unless %vars;
3223
3224 my @res;
3129 local $_; 3225 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3226
3132 my $eval = 3227 my $eval =
3133 "do {\n" 3228 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3229 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3230 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3231 . $code
3137 . "\n}" 3232 . "\n}"
3138 ; 3233 ;
3139 3234
3235 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3236 sub_generation_inc;
3237 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3238 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3244
3144 if ($@) { 3245 if ($@) {
3145 warn "$@"; 3246 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3247 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3248 warn "with arguments " . (join " ", %vars) . "\n";
3166=cut 3267=cut
3167 3268
3168sub register_script_function { 3269sub register_script_function {
3169 my ($fun, $cb) = @_; 3270 my ($fun, $cb) = @_;
3170 3271
3171 no strict 'refs'; 3272 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3273 *$fun = $safe_hole->wrap ($cb);
3173} 3274}
3174 3275
3175=back 3276=back
3176 3277
3177=cut 3278=cut
3198 3299
3199 $facedata->{version} == 2 3300 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3301 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3302
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3305 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3306 type => FT_RSRC,
3205 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),
3206 }; 3309 };
3207 cf::cede_to_tick; 3310 cf::cede_to_tick;
3208 3311
3209 { 3312 {
3210 my $faces = $facedata->{faceinfo}; 3313 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3315 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3316 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3317
3215 cf::face::set_visibility $idx, $info->{visibility}; 3318 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3319 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3322
3220 cf::cede_to_tick; 3323 cf::cede_to_tick;
3221 } 3324 }
3222 3325
3223 while (my ($face, $info) = each %$faces) { 3326 while (my ($face, $info) = each %$faces) {
3247 3350
3248 cf::anim::invalidate_all; # d'oh 3351 cf::anim::invalidate_all; # d'oh
3249 } 3352 }
3250 3353
3251 { 3354 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3355 my $res = $facedata->{resource};
3255 3356
3256 while (my ($name, $info) = each %$res) { 3357 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3358 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3359 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3360
3261 if ($info->{type} & 1) { 3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3362 cf::face::set_type $idx, $info->{type};
3276 } else { 3363 } else {
3277 $RESOURCE{$name} = $info; 3364 $RESOURCE{$name} = $info;
3278 } 3365 }
3279 3366
3312 while (my ($k, $v) = each %$want) { 3399 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3400 $ns->fx_want ($k, $v);
3314 } 3401 }
3315}; 3402};
3316 3403
3404sub load_resource_file($) {
3405 my $guard = lock_acquire "load_resource_file";
3406
3407 my $status = load_resource_file_ $_[0];
3408 get_slot 0.1, 100;
3409 cf::arch::commit_load;
3410
3411 $status
3412}
3413
3317sub reload_regions { 3414sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3415 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3416 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3417 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3418
3334} 3431}
3335 3432
3336sub reload_archetypes { 3433sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3434 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3435 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3436}
3345 3437
3346sub reload_treasures { 3438sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3439 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3440 or die "unable to load treasurelists\n";
3349} 3441}
3350 3442
3351sub reload_resources { 3443sub reload_resources {
3352 warn "reloading resource files...\n"; 3444 warn "reloading resource files...\n";
3353 3445
3446 reload_facedata;
3447 reload_archetypes;
3354 reload_regions; 3448 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3449 reload_treasures;
3359 3450
3360 warn "finished reloading resource files\n"; 3451 warn "finished reloading resource files\n";
3361} 3452}
3362 3453
3363sub init {
3364 reload_resources;
3365}
3366
3367sub reload_config { 3454sub reload_config {
3455 warn "reloading config file...\n";
3456
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3457 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3458 or return;
3370 3459
3371 local $/; 3460 local $/;
3372 *CFG = YAML::Load <$fh>; 3461 *CFG = YAML::XS::Load scalar <$fh>;
3373 3462
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3375 3464
3376 $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};
3377 $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};
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3471 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3472 };
3384 warn $@ if $@; 3473 warn $@ if $@;
3385 } 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;
3386} 3505}
3387 3506
3388sub 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
3389 # we must not ever block the main coroutine 3522 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3523 local $Coro::idle = sub {
3391 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#
3392 (async { 3525 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3526 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3527 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3528 })->prio (Coro::PRIO_MAX);
3396 }; 3529 };
3397 3530
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3531 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3532
3533 cf::sync_job {
3534 cf::load_settings;
3535 cf::load_materials;
3536
3537 reload_resources;
3538 reload_config;
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
3550 load_extensions;
3551
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;
3559 };
3560
3561 main_loop;
3405} 3562}
3406 3563
3407############################################################################# 3564#############################################################################
3408# initialisation and cleanup 3565# initialisation and cleanup
3409 3566
3416 }; 3573 };
3417 } 3574 }
3418} 3575}
3419 3576
3420sub write_runtime_sync { 3577sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3578 my $t0 = EV::time;
3422 3579
3423 # first touch the runtime file to show we are still running: 3580 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3581 # the fsync below can take a very very long time.
3425 3582
3426 IO::AIO::aio_utime $runtime, undef, undef; 3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3584
3428 my $guard = cf::lock_acquire "write_runtime"; 3585 my $guard = cf::lock_acquire "write_runtime";
3429 3586
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3587 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3588 or return;
3432 3589
3433 my $value = $cf::RUNTIME + 90 + 10; 3590 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3591 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3592 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3602 aio_utime $fh, undef, undef;
3446 3603
3447 close $fh 3604 close $fh
3448 or return; 3605 or return;
3449 3606
3450 aio_rename "$runtime~", $runtime 3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3608 and return;
3452 3609
3453 warn "runtime file written.\n"; 3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3454 3611
3455 1 3612 1
3456} 3613}
3457 3614
3458our $uuid_lock; 3615our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3624 my $uuid = "$LOCALDIR/uuid";
3468 3625
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3626 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3627 or return;
3471 3628
3472 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;
3473 $uuid_skip = 0; 3637 $uuid_skip = 0;
3474 3638
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3639 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3640 and return;
3477 3641
3499} 3663}
3500 3664
3501sub emergency_save() { 3665sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3666 my $freeze_guard = cf::freeze_mainloop;
3503 3667
3504 warn "enter emergency perl save\n"; 3668 warn "emergency_perl_save: enter\n";
3505 3669
3506 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
3507 # use a peculiar iteration method to avoid tripping on perl 3676 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3677 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3678 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3679 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3680 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3681 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3682 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3684 $pl->save;
3516 } 3685 }
3517 warn "end emergency player save\n"; 3686 warn "emergency_perl_save: end player save\n";
3518 3687
3519 warn "begin emergency map save\n"; 3688 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3689 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3690 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3691 $map->valid or next;
3523 $map->save; 3692 $map->save;
3524 } 3693 }
3525 warn "end emergency map save\n"; 3694 warn "emergency_perl_save: end map save\n";
3526 3695
3527 warn "begin emergency database checkpoint\n"; 3696 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3697 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3698 warn "emergency_perl_save: end database checkpoint\n";
3530 3699
3531 warn "begin write uuid\n"; 3700 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3701 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3702 warn "emergency_perl_save: end write uuid\n";
3534 }; 3703 };
3535 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
3536 warn "leave emergency perl save\n"; 3710 warn "emergency_perl_save: leave\n";
3537} 3711}
3538 3712
3539sub post_cleanup { 3713sub post_cleanup {
3540 my ($make_core) = @_; 3714 my ($make_core) = @_;
3541 3715
3542 warn Carp::longmess "post_cleanup backtrace" 3716 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3717 if $make_core;
3718
3719 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$;
3721}
3722
3723# a safer delete_package, copied from Symbol
3724sub clear_package($) {
3725 my $pkg = shift;
3726
3727 # expand to full symbol table name if needed
3728 unless ($pkg =~ /^main::.*::$/) {
3729 $pkg = "main$pkg" if $pkg =~ /^::/;
3730 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3731 $pkg .= '::' unless $pkg =~ /::$/;
3732 }
3733
3734 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3735 my $stem_symtab = *{$stem}{HASH};
3736
3737 defined $stem_symtab and exists $stem_symtab->{$leaf}
3738 or return;
3739
3740 # clear all symbols
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 }
3746 warn "cleared package $pkg\n";#d#
3544} 3747}
3545 3748
3546sub do_reload_perl() { 3749sub do_reload_perl() {
3547 # can/must only be called in main 3750 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3751 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3752 warn "can only reload from main coroutine";
3550 return; 3753 return;
3551 } 3754 }
3552 3755
3756 return if $RELOAD++;
3757
3758 my $t1 = EV::time;
3759
3760 while ($RELOAD) {
3553 warn "reloading..."; 3761 warn "reloading...";
3554 3762
3555 warn "entering sync_job"; 3763 warn "entering sync_job";
3556 3764
3557 cf::sync_job { 3765 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3766 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3767 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
3561 3769
3562 warn "syncing database to disk"; 3770 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3771 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3772
3565 # if anything goes wrong in here, we should simply crash as we already saved 3773 # if anything goes wrong in here, we should simply crash as we already saved
3566 3774
3567 warn "flushing outstanding aio requests"; 3775 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3776 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3778 }
3599 3779
3600 warn "... nuking $pkg"; 3780 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3781 $_->cancel for values %EXT_CORO;
3602 } 3782 %EXT_CORO = ();
3603 3783
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3784 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3785 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3786
3787 warn "removing ext/exti commands";
3788 %EXTCMD = ();
3789 %EXTICMD = ();
3790
3791 warn "unloading/nuking all extensions";
3792 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3793 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3794
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3795 if (my $cb = $pkg->can ("unload")) {
3796 eval {
3615 $cb->(); 3797 $cb->($pkg);
3798 1
3799 } or warn "$pkg unloaded, but with errors: $@";
3800 }
3801
3802 warn "... clearing $pkg";
3803 clear_package $pkg;
3616 } 3804 }
3617 3805
3618 Symbol::delete_package $k; 3806 warn "unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809
3810 warn "... unloading $k";
3811 delete $INC{$k};
3812
3813 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g;
3815
3816 if (my $cb = $k->can ("unload_module")) {
3817 $cb->();
3818 }
3819
3820 clear_package $k;
3619 } 3821 }
3620 3822
3621 warn "getting rid of safe::, as good as possible"; 3823 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3824 clear_package "safe::$_"
3623 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);
3624 3826
3625 warn "unloading cf.pm \"a bit\""; 3827 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3828 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3830
3629 # don't, removes xs symbols, too, 3831 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3832 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3833 #clear_package __PACKAGE__;
3632 3834
3633 warn "unload completed, starting to reload now"; 3835 warn "unload completed, starting to reload now";
3634 3836
3635 warn "reloading cf.pm"; 3837 warn "reloading cf.pm";
3636 require cf; 3838 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3839 cf::_connect_to_perl_1;
3638 3840
3639 warn "loading config and database again"; 3841 warn "loading config and database again";
3640 cf::reload_config; 3842 cf::reload_config;
3641 3843
3642 warn "loading extensions"; 3844 warn "loading extensions";
3643 cf::load_extensions; 3845 cf::load_extensions;
3644 3846
3847 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3848 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3849 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3850 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3851 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3852 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3853 reattach $_ for values %PLAYER;
3854 }
3651 3855
3856 warn "running post_init jobs";
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858
3652 warn "leaving sync_job"; 3859 warn "leaving sync_job";
3653 3860
3654 1 3861 1
3655 } or do { 3862 } or do {
3656 warn $@; 3863 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3864 cf::cleanup "error while reloading, exiting.";
3658 }; 3865 };
3659 3866
3660 warn "reloaded"; 3867 warn "reloaded";
3868 --$RELOAD;
3869 }
3870
3871 $t1 = EV::time - $t1;
3872 warn "reload completed in ${t1}s\n";
3661}; 3873};
3662 3874
3663our $RELOAD_WATCHER; # used only during reload 3875our $RELOAD_WATCHER; # used only during reload
3664 3876
3665sub reload_perl() { 3877sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3878 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3879 # coro crashes during coro_state_free->destroy here.
3668 3880
3881 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions;
3883
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3885 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3886 undef $RELOAD_WATCHER;
3887 };
3672 }; 3888 };
3673} 3889}
3674 3890
3675register_command "reload" => sub { 3891register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3892 my ($who, $arg) = @_;
3690 3906
3691our @WAIT_FOR_TICK; 3907our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3908our @WAIT_FOR_TICK_BEGIN;
3693 3909
3694sub wait_for_tick { 3910sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3697 3912
3698 my $signal = new Coro::Signal; 3913 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3914 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3915 $signal->wait;
3701} 3916}
3702 3917
3703sub wait_for_tick_begin { 3918sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 3920
3707 my $signal = new Coro::Signal; 3921 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3922 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3923 $signal->wait;
3710} 3924}
3715 unless ++$bug_warning > 10; 3929 unless ++$bug_warning > 10;
3716 return; 3930 return;
3717 } 3931 }
3718 3932
3719 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#
3720 3936
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3937 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $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.;
3723 Coro::async_pool { 3939 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 3940 $Coro::current->{desc} = "runtime saver";
3747} 3963}
3748 3964
3749{ 3965{
3750 # configure BDB 3966 # configure BDB
3751 3967
3752 BDB::min_parallel 8; 3968 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 3969 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3970 $AnyEvent::BDB::WATCHER->priority (1);
3755 3971
3756 unless ($DB_ENV) { 3972 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3973 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3974 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3975 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3976 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3977 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3978 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3979
3763 cf::sync_job { 3980 cf::sync_job {
3764 eval { 3981 eval {
3790{ 4007{
3791 # configure IO::AIO 4008 # configure IO::AIO
3792 4009
3793 IO::AIO::min_parallel 8; 4010 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4011 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4012 undef $AnyEvent::AIO::WATCHER;
3796} 4013}
3797 4014
3798my $_log_backtrace; 4015my $_log_backtrace;
3799 4016
3800sub _log_backtrace { 4017sub _log_backtrace {
3803 $msg =~ s/\n//; 4020 $msg =~ s/\n//;
3804 4021
3805 # limit the # of concurrent backtraces 4022 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4023 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 4024 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg;
3808 async { 4026 async {
3809 $Coro::current->{desc} = "abt $msg"; 4027 $Coro::current->{desc} = "abt $msg";
3810 4028
3811 my @bt = fork_call { 4029 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4030 @addr = map { sprintf "%x", $_ } @addr;
3823 } 4041 }
3824 4042
3825 @funcs 4043 @funcs
3826 }; 4044 };
3827 4045
3828 LOG llevInfo, "[ABT] $msg\n"; 4046 LOG llevInfo, "[ABT] $perl_bt\n";
4047 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4048 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4049 --$_log_backtrace;
3831 }; 4050 };
3832 } else { 4051 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4052 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4053 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 4054 }
3836} 4055}
3837 4056
3838# load additional modules 4057# load additional modules
3839use cf::pod; 4058require "cf/$_.pm" for @EXTRA_MODULES;
4059cf::_connect_to_perl_2;
3840 4060
3841END { cf::emergency_save } 4061END { cf::emergency_save }
3842 4062
38431 40631
3844 4064

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines