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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
432 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
433 469
434 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
435 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
436 473
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
722 759
723############################################################################# 760#############################################################################
724 761
725=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
726 763
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
730 767
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
783 820
784Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
786 823
787Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 826
790These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
791 828
792=over 4 829=over 4
1083 1120
1084sub reattach { 1121sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1123 my ($obj) = @_;
1087 1124
1125 # no longer needed after getting rid of delete_package?
1088 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
1089 1127
1090 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1091 1129
1092 @$registry = (); 1130 @$registry = ();
1093 1131
1139 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1142 1180
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1188 aio_close $fh;
1148 1189
1149 if (@$objs) { 1190 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1199 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1201 }
1158 } else { 1202 } else {
1159 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1160 } 1204 }
1161 1205
1162 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1210 } else {
1164 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1165 } 1212 }
1166 } else { 1213 } else {
1167 aio_unlink $filename; 1214 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1169 } 1216 }
1260 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1261 1308
1262 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1263} 1310}
1264 1311
1312use File::Glob ();
1313
1265cf::player->attach ( 1314cf::player->attach (
1266 on_command => sub { 1315 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1268 1317
1269 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1270 or return; 1319 or return;
1271 1320
1301 1350
1302 cf::override; 1351 cf::override;
1303 }, 1352 },
1304); 1353);
1305 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
1306sub load_extensions { 1368sub load_extensions {
1307 cf::sync_job { 1369 cf::sync_job {
1308 my %todo; 1370 my %todo;
1309 1371
1310 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1329 1391
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1394
1333 $ext{source} = 1395 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1336 . $source 1398 . $source
1337 . "\n};\n1"; 1399 . "\n};\n1";
1338 1400
1339 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1340 } 1402 }
1341 1403
1404 my $pass = 0;
1342 my %done; 1405 my %done;
1343 while (%todo) { 1406 while (%todo) {
1344 my $progress; 1407 my $progress;
1345 1408
1409 ++$pass;
1410
1411 ext:
1346 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1414 next ext
1349 unless exists $done{$_}; 1415 unless exists $done{$_};
1350 } 1416 }
1351 1417
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1419
1354 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1424
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1426 if exists $v->{meta}{mandatory};
1362 1427 } else {
1363 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;
1364 } 1434 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1435 }
1370 1436
1371 skip: 1437 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1445 }
1375 }; 1446 };
1376} 1447}
1377 1448
1378############################################################################# 1449#############################################################################
1379 1450
1380=back 1451=back
1381 1452
1382=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1383 1454
1384Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1385 1456
1386=cut 1457=cut
1387 1458
1388package cf::player; 1459package cf::player;
1389 1460
1432 1503
1433sub exists($) { 1504sub exists($) {
1434 my ($login) = @_; 1505 my ($login) = @_;
1435 1506
1436 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1438} 1509}
1439 1510
1440sub find($) { 1511sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1513 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1526 or return;
1456 1527
1457 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1458 or return; 1529 or return;
1530
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1462 } 1534 }
1463 } 1535 }
1473 1545
1474 return if $pl->{deny_save}; 1546 return if $pl->{deny_save};
1475 1547
1476 aio_mkdir playerdir $pl, 0770; 1548 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1549 $pl->{last_save} = $cf::RUNTIME;
1550
1551 cf::get_slot 0.01;
1478 1552
1479 $pl->save_pl ($path); 1553 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1554 cf::cede_to_tick;
1481} 1555}
1482 1556
1514 my ($pl) = @_; 1588 my ($pl) = @_;
1515 1589
1516 my $name = $pl->ob->name; 1590 my $name = $pl->ob->name;
1517 1591
1518 $pl->{deny_save} = 1; 1592 $pl->{deny_save} = 1;
1519 $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
1520 1594
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1596 $pl->deactivate;
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1599 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1600 $pl->ns->destroy if $pl->ns;
1525 1601
1526 my $path = playerdir $pl; 1602 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1603 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1642
1567 for my $login (@$dirs) { 1643 for my $login (@$dirs) {
1568 my $path = path $login; 1644 my $path = path $login;
1569 1645
1570 # a .pst is a dead give-away for a valid player 1646 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1647 # if no pst file found, open and chekc for blocked users
1648 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1649 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1650 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1651 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1652 }
1576 1653
1607 } 1684 }
1608 1685
1609 \@paths 1686 \@paths
1610} 1687}
1611 1688
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1689=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1690
1614Expand crossfire pod fragments into protocol xml. 1691Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1692
1705=item $player->ext_reply ($msgid, @msg) 1693=item $player->ext_reply ($msgid, @msg)
1706 1694
1707Sends an ext reply to the player. 1695Sends an ext reply to the player.
1708 1696
1781 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
1782 1770
1783 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1772 $self->_create_random_map (
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1909 1897
1910# the temporary/swap location 1898# the temporary/swap location
1911sub save_path { 1899sub save_path {
1912 my ($self) = @_; 1900 my ($self) = @_;
1913 1901
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1902 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1903 "$TMPDIR/$path.map"
1916} 1904}
1917 1905
1918# the unique path, undef == no special unique path 1906# the unique path, undef == no special unique path
1919sub uniq_path { 1907sub uniq_path {
1920 my ($self) = @_; 1908 my ($self) = @_;
1921 1909
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1910 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1911 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1912}
1934 1913
1935sub decay_objects { 1914sub decay_objects {
1936 my ($self) = @_; 1915 my ($self) = @_;
1937 1916
2021sub find { 2000sub find {
2022 my ($path, $origin) = @_; 2001 my ($path, $origin) = @_;
2023 2002
2024 $path = normalise $path, $origin && $origin->path; 2003 $path = normalise $path, $origin && $origin->path;
2025 2004
2026 cf::lock_wait "map_data:$path";#d#remove 2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2006 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2007
2029 $cf::MAP{$path} || do { 2008 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2009 my $map = new_from_path cf::map $path
2034 or return; 2010 or return;
2035 2011
2036 $map->{last_save} = $cf::RUNTIME; 2012 $map->{last_save} = $cf::RUNTIME;
2037 2013
2039 or return; 2015 or return;
2040 2016
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2017 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2018 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2019 #$cf::WAIT_FOR_TICK->wait;
2020 undef $guard2;
2044 undef $guard1; 2021 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2022 $map->reset;
2047 return find $path; 2023 return find $path;
2048 } 2024 }
2049 2025
2050 $cf::MAP{$path} = $map 2026 $cf::MAP{$path} = $map
2051 } 2027 }
2052} 2028}
2053 2029
2054sub pre_load { } 2030sub pre_load { }
2055sub post_load { } 2031#sub post_load { } # XS
2056 2032
2057sub load { 2033sub load {
2058 my ($self) = @_; 2034 my ($self) = @_;
2059 2035
2060 local $self->{deny_reset} = 1; # loading can take a long time 2036 local $self->{deny_reset} = 1; # loading can take a long time
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2053 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2054 $f->skip_block;
2079 $self->_load_objects ($f) 2055 $self->_load_objects ($f)
2080 or return; 2056 or return;
2081 2057
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2058 $self->post_load_original
2083 if delete $self->{load_original}; 2059 if delete $self->{load_original};
2084 2060
2085 if (my $uniq = $self->uniq_path) { 2061 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2062 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2063 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2081 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2082 $self->decay_objects;
2107 $self->fix_auto_apply; 2083 $self->fix_auto_apply;
2108 $self->update_buttons; 2084 $self->update_buttons;
2109 cf::cede_to_tick; 2085 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2086 $self->activate;
2113 } 2087 }
2114 2088
2115 $self->{last_save} = $cf::RUNTIME; 2089 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2090 $self->last_access ($cf::RUNTIME);
2117 2091
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2092 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2093 }
2120 2094
2121 $self->post_load; 2095 $self->post_load;
2122} 2096}
2123 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
2124sub customise_for { 2101sub customise_for {
2125 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2126 2103
2127 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2105 if $self->per_player;
2181 my ($path, $origin, $load) = @_; 2158 my ($path, $origin, $load) = @_;
2182 2159
2183 $path = normalise $path, $origin && $origin->{path}; 2160 $path = normalise $path, $origin && $origin->{path};
2184 2161
2185 if (my $map = $cf::MAP{$path}) { 2162 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2164 }
2188 2165
2189 $MAP_PREFETCH{$path} |= $load; 2166 $MAP_PREFETCH{$path} |= $load;
2190 2167
2191 $MAP_PREFETCHER ||= cf::async { 2168 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2205 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2206 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2207 $_->contr->save for $self->players;
2231 }; 2208 };
2232 2209
2210 cf::get_slot 0.02;
2211
2233 if ($uniq) { 2212 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2214 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2215 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2224 $self->save;
2246 2225
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2227
2249 return if $self->players; 2228 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2229 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2230 return if $self->{deny_save};
2252 2231
2253 $self->in_memory (cf::MAP_SWAPPED); 2232 $self->in_memory (cf::MAP_SWAPPED);
2254 2233
2255 $self->deactivate; 2234 $self->deactivate;
2280 2259
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2261
2283 return if $self->players; 2262 return if $self->players;
2284 2263
2285 warn "resetting map ", $self->path; 2264 warn "resetting map ", $self->path, "\n";
2286 2265
2287 $self->in_memory (cf::MAP_SWAPPED); 2266 $self->in_memory (cf::MAP_SWAPPED);
2288 2267
2289 # need to save uniques path 2268 # need to save uniques path
2290 unless ($self->{deny_save}) { 2269 unless ($self->{deny_save}) {
2373 2352
2374sub unique_maps() { 2353sub unique_maps() {
2375 [ 2354 [
2376 map { 2355 map {
2377 utf8::decode $_; 2356 utf8::decode $_;
2378 /\.map$/ 2357 s/\.map$//; # TODO future compatibility hack
2358 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2359 ? ()
2379 ? normalise $_ 2360 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2361 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2362 ]
2383} 2363}
2384 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
2385=back 2397=back
2386 2398
2387=head3 cf::object 2399=head3 cf::object
2388 2400
2389=cut 2401=cut
2392 2404
2393=over 4 2405=over 4
2394 2406
2395=item $ob->inv_recursive 2407=item $ob->inv_recursive
2396 2408
2397Returns the inventory of the object _and_ their inventories, recursively. 2409Returns the inventory of the object I<and> their inventories, recursively,
2410but I<not> the object itself.
2398 2411
2399=cut 2412=cut
2400 2413
2401sub inv_recursive_; 2414sub inv_recursive_;
2402sub inv_recursive_ { 2415sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2420 inv_recursive_ inv $_[0]
2408} 2421}
2409 2422
2410=item $ref = $ob->ref 2423=item $ref = $ob->ref
2411 2424
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2425Creates and returns a persistent reference to an object that can be stored as a string.
2413 2426
2414=item $ob = cf::object::deref ($refstring) 2427=item $ob = cf::object::deref ($refstring)
2415 2428
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2429returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2430even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2462can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2463dialogue with the given NPC character.
2451 2464
2452=cut 2465=cut
2453 2466
2467our $SAY_CHANNEL = {
2468 id => "say",
2469 title => "Map",
2470 reply => "say ",
2471 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472};
2473
2474our $CHAT_CHANNEL = {
2475 id => "chat",
2476 title => "Chat",
2477 reply => "chat ",
2478 tooltip => "Player chat and shouts, global to the server.",
2479};
2480
2454# rough implementation of a future "reply" method that works 2481# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2482# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2483#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2484sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2485 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2496 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2497 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2498
2472 } else { 2499 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2500 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2501 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2502 }
2476 } 2503 }
2477} 2504}
2478 2505
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2506=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2531
2505=item $player_object->enter_link 2532=item $player_object->enter_link
2506 2533
2507Freezes 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}>).
2508 2535
2509The 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.
2510I<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.
2511 2540
2512Will never block. 2541Will never block.
2513 2542
2514=item $player_object->leave_link ($map, $x, $y) 2543=item $player_object->leave_link ($map, $x, $y)
2515 2544
2567 ($x, $y) = (-1, -1) 2596 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2597 unless (defined $x) && (defined $y);
2569 2598
2570 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2601 if $x <= 0 && $y <= 0;
2573 2602
2574 $map->load; 2603 $map->load;
2575 $map->load_neighbours; 2604 $map->load_neighbours;
2576 2605
2577 return unless $self->contr->active; 2606 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2607
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $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;
2582} 2613}
2583 2614
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2585 2616
2586Moves 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
2587her, loading and preparing them map, calling the provided $check callback 2618her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2619that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2620the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2621be called at the end of this process.
2622
2623Note that $check will be called with a potentially non-loaded map, so if
2624it needs a loaded map it has to call C<< ->load >>.
2591 2625
2592=cut 2626=cut
2593 2627
2594our $GOTOGEN; 2628our $GOTOGEN;
2595 2629
2674} 2708}
2675 2709
2676sub prepare_random_map { 2710sub prepare_random_map {
2677 my ($exit) = @_; 2711 my ($exit) = @_;
2678 2712
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2713 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2714 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2715 # that depends on the exit object
2684 2716
2685 my $rmp = parse_random_map_params $exit->msg; 2717 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2719 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2720 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2721 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2722 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2723 $rmp->{origin_y} = $exit->y;
2724
2725 $exit->map->touch;
2692 } 2726 }
2693 2727
2694 $rmp->{random_seed} ||= $exit->random_seed; 2728 $rmp->{random_seed} ||= $exit->random_seed;
2695 2729
2696 my $data = cf::encode_json $rmp; 2730 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2731 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2732 my $meta = "$RANDOMDIR/$md5.meta";
2699 2733
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2734 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2735 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2736 undef $fh;
2703 aio_rename "$meta~", $meta; 2737 aio_rename "$meta~", $meta;
2704 2738
2739 my $slaying = "?random/$md5";
2740
2741 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2742 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2743 $exit->msg (undef);
2744 }
2707 } 2745 }
2708} 2746}
2709 2747
2710sub cf::object::player::enter_exit { 2748sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2749 my ($self, $exit) = @_;
2712 2750
2713 return unless $self->type == cf::PLAYER; 2751 return unless $self->type == cf::PLAYER;
2714 2752
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2753 $self->enter_link;
2727 2754
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2755 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2756 $Coro::current->{desc} = "enter_exit";
2734 2757
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2758 unless (eval {
2759 $self->deactivate_recursive; # just to be sure
2760
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2770 my $x = $exit->stats->hp;
2771 my $y = $exit->stats->sp;
2772
2737 $self->goto ($slaying, $hp, $sp); 2773 $self->goto ($map, $x, $y);
2738 2774
2775 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y)
2777 if $exit->flag (cf::FLAG_DAMNED);
2778
2739 1; 2779 1
2740 }) { 2780 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2781 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "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. "
2743 . "Please report this to the dungeon master!", 2783 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2784 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2785
2746 warn "ERROR in enter_exit: $@"; 2786 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2803sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2804 my ($self, $text, $flags) = @_;
2765 2805
2766 utf8::encode $text; 2806 utf8::encode $text;
2767 $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);
2768} 2833}
2769 2834
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2835=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2836
2772Send 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
2776 2841
2777=cut 2842=cut
2778 2843
2779# non-persistent channels (usually the info channel) 2844# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2845our %CHANNEL = (
2846 "c/motd" => {
2847 id => "infobox",
2848 title => "MOTD",
2849 reply => undef,
2850 tooltip => "The message of the day",
2851 },
2781 "c/identify" => { 2852 "c/identify" => {
2782 id => "infobox", 2853 id => "infobox",
2783 title => "Identify", 2854 title => "Identify",
2784 reply => undef, 2855 reply => undef,
2785 tooltip => "Items recently identified", 2856 tooltip => "Items recently identified",
2787 "c/examine" => { 2858 "c/examine" => {
2788 id => "infobox", 2859 id => "infobox",
2789 title => "Examine", 2860 title => "Examine",
2790 reply => undef, 2861 reply => undef,
2791 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",
2792 }, 2869 },
2793 "c/book" => { 2870 "c/book" => {
2794 id => "infobox", 2871 id => "infobox",
2795 title => "Book", 2872 title => "Book",
2796 reply => undef, 2873 reply => undef,
2812 id => "infobox", 2889 id => "infobox",
2813 title => "Body Parts", 2890 title => "Body Parts",
2814 reply => undef, 2891 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2892 tooltip => "Shows which body parts you posess and are available",
2816 }, 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 },
2817 "c/uptime" => { 2930 "c/uptime" => {
2818 id => "infobox", 2931 id => "infobox",
2819 title => "Uptime", 2932 title => "Uptime",
2820 reply => undef, 2933 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2934 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2937 id => "infobox",
2825 title => "Map Info", 2938 title => "Map Info",
2826 reply => undef, 2939 reply => undef,
2827 tooltip => "Information related to the maps", 2940 tooltip => "Information related to the maps",
2828 }, 2941 },
2942 "c/party" => {
2943 id => "party",
2944 title => "Party",
2945 reply => "gsay ",
2946 tooltip => "Messages and chat related to your party",
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,
2829); 2956);
2830 2957
2831sub cf::client::send_msg { 2958sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2959 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2960
2834 $msg = $self->pl->expand_cfpod ($msg); 2961 $msg = $self->pl->expand_cfpod ($msg)
2962 unless $color & cf::NDI_VERBATIM;
2835 2963
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2964 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2965
2838 # check predefined channels, for the benefit of C 2966 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2967 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 2968 $channel = $CHANNEL{$channel};
2841 2969
2842 $self->ext_msg (channel_info => $channel) 2970 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 2971 $channel = $channel->{id};
2846 2972
2847 } elsif (ref $channel) { 2973 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 2974 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 2975 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 2976 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 2977 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 2978 }
2854 2979
2855 $channel = $channel->{id}; 2980 $channel = $channel->{id};
2856 } 2981 }
2857 2982
2858 return unless @extra || length $msg; 2983 return unless @extra || length $msg;
2859 2984
2860 if ($self->can_msg) {
2861 # default colour, mask it out 2985 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2986 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2987 if $color & cf::NDI_DEF;
2864 2988
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2989 my $pkt = "msg "
2990 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2991 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 2992 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 2993
2879 $color &= cf::NDI_COLOR_MASK; 2994 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 2995}
2893 2996
2894=item $client->ext_msg ($type, @msg) 2997=item $client->ext_msg ($type, @msg)
2895 2998
2896Sends an ext event to the client. 2999Sends an ext event to the client.
2899 3002
2900sub cf::client::ext_msg($$@) { 3003sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3004 my ($self, $type, @msg) = @_;
2902 3005
2903 if ($self->extcmd == 2) { 3006 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3008 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3009 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3011 }
2909} 3012}
2910 3013
2911=item $client->ext_reply ($msgid, @msg) 3014=item $client->ext_reply ($msgid, @msg)
2912 3015
2916 3019
2917sub cf::client::ext_reply($$@) { 3020sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3021 my ($self, $id, @msg) = @_;
2919 3022
2920 if ($self->extcmd == 2) { 3023 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3024 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3025 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3026 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3027 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3029 }
2927} 3030}
2928 3031
2929=item $success = $client->query ($flags, "text", \&cb) 3032=item $success = $client->query ($flags, "text", \&cb)
2930 3033
3031 3134
3032 $coro 3135 $coro
3033} 3136}
3034 3137
3035cf::client->attach ( 3138cf::client->attach (
3036 on_destroy => sub { 3139 on_client_destroy => sub {
3037 my ($ns) = @_; 3140 my ($ns) = @_;
3038 3141
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3143 },
3041); 3144);
3057our $safe_hole = new Safe::Hole; 3160our $safe_hole = new Safe::Hole;
3058 3161
3059$SIG{FPE} = 'IGNORE'; 3162$SIG{FPE} = 'IGNORE';
3060 3163
3061$safe->permit_only (Opcode::opset qw( 3164$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3165 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3166 grepstart grepwhile mapstart mapwhile
3064 sort time 3167 sort time
3065)); 3168));
3066 3169
3067# here we export the classes and methods available to script code 3170# here we export the classes and methods available to script code
3070 3173
3071The following functions and methods are available within a safe environment: 3174The following functions and methods are available within a safe environment:
3072 3175
3073 cf::object 3176 cf::object
3074 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
3075 insert remove name archname title slaying race decrease_ob_nr 3178 insert remove name archname title slaying race decrease split
3179 value
3076 3180
3077 cf::object::player 3181 cf::object::player
3078 player 3182 player
3079 3183
3080 cf::player 3184 cf::player
3085 3189
3086=cut 3190=cut
3087 3191
3088for ( 3192for (
3089 ["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
3090 insert remove inv name archname title slaying race 3194 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3195 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3196 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3197 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3198 ["cf::map" => qw(trigger)],
3095) { 3199) {
3096 no strict 'refs'; 3200 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3201 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3116 3220
3117 my $qcode = $code; 3221 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3222 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3223 $qcode =~ s/\n/\\n/g;
3120 3224
3225 %vars = (_dummy => 0) unless %vars;
3226
3227 my @res;
3121 local $_; 3228 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3229
3124 my $eval = 3230 my $eval =
3125 "do {\n" 3231 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3232 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3233 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3234 . $code
3129 . "\n}" 3235 . "\n}"
3130 ; 3236 ;
3131 3237
3238 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3239 sub_generation_inc;
3240 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3241 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 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 }
3135 3247
3136 if ($@) { 3248 if ($@) {
3137 warn "$@"; 3249 warn "$@";
3138 warn "while executing safe code '$code'\n"; 3250 warn "while executing safe code '$code'\n";
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3251 warn "with arguments " . (join " ", %vars) . "\n";
3158=cut 3270=cut
3159 3271
3160sub register_script_function { 3272sub register_script_function {
3161 my ($fun, $cb) = @_; 3273 my ($fun, $cb) = @_;
3162 3274
3163 no strict 'refs'; 3275 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3276 *$fun = $safe_hole->wrap ($cb);
3165} 3277}
3166 3278
3167=back 3279=back
3168 3280
3169=cut 3281=cut
3190 3302
3191 $facedata->{version} == 2 3303 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3304 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3305
3194 # 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]);
3195 $facedata->{resource}{"res/exp_table"} = { 3308 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3309 type => FT_RSRC,
3197 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),
3198 }; 3312 };
3199 cf::cede_to_tick; 3313 cf::cede_to_tick;
3200 3314
3201 { 3315 {
3202 my $faces = $facedata->{faceinfo}; 3316 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3318 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3319 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3320
3207 cf::face::set_visibility $idx, $info->{visibility}; 3321 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3322 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3324 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3325
3212 cf::cede_to_tick; 3326 cf::cede_to_tick;
3213 } 3327 }
3214 3328
3215 while (my ($face, $info) = each %$faces) { 3329 while (my ($face, $info) = each %$faces) {
3239 3353
3240 cf::anim::invalidate_all; # d'oh 3354 cf::anim::invalidate_all; # d'oh
3241 } 3355 }
3242 3356
3243 { 3357 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3358 my $res = $facedata->{resource};
3247 3359
3248 while (my ($name, $info) = each %$res) { 3360 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3361 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3362 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3363
3253 if ($info->{type} & 1) { 3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3365 cf::face::set_type $idx, $info->{type};
3268 } else { 3366 } else {
3269 $RESOURCE{$name} = $info; 3367 $RESOURCE{$name} = $info;
3270 } 3368 }
3271 3369
3304 while (my ($k, $v) = each %$want) { 3402 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3403 $ns->fx_want ($k, $v);
3306 } 3404 }
3307}; 3405};
3308 3406
3407sub load_resource_file($) {
3408 my $guard = lock_acquire "load_resource_file";
3409
3410 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100;
3412 cf::arch::commit_load;
3413
3414 $status
3415}
3416
3309sub reload_regions { 3417sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3418 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3419 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3420 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3421
3326} 3434}
3327 3435
3328sub reload_archetypes { 3436sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3437 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3438 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3439}
3337 3440
3338sub reload_treasures { 3441sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3442 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3443 or die "unable to load treasurelists\n";
3341} 3444}
3342 3445
3343sub reload_resources { 3446sub reload_resources {
3344 warn "reloading resource files...\n"; 3447 warn "reloading resource files...\n";
3345 3448
3449 reload_facedata;
3450 reload_archetypes;
3346 reload_regions; 3451 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3452 reload_treasures;
3351 3453
3352 warn "finished reloading resource files\n"; 3454 warn "finished reloading resource files\n";
3353} 3455}
3354 3456
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3457sub reload_config {
3458 warn "reloading config file...\n";
3459
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3460 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3461 or return;
3362 3462
3363 local $/; 3463 local $/;
3364 *CFG = YAML::Load <$fh>; 3464 *CFG = YAML::XS::Load scalar <$fh>;
3365 3465
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3467
3368 $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};
3369 $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};
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3474 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3475 };
3376 warn $@ if $@; 3476 warn $@ if $@;
3377 } 3477 }
3478
3479 warn "finished reloading resource files\n";
3480}
3481
3482sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!";
3485 flock $fh, &Fcntl::LOCK_EX
3486 or die "$PIDFILE: flock: $!";
3487 $fh
3488}
3489
3490# make sure only one server instance is running at any one time
3491sub atomic {
3492 my $fh = pidfile;
3493
3494 my $pid = <$fh>;
3495 kill 9, $pid if $pid > 0;
3496
3497 seek $fh, 0, 0;
3498 print $fh $$;
3499}
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;
3378} 3508}
3379 3509
3380sub main { 3510sub main {
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
3524
3381 # we must not ever block the main coroutine 3525 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3526 local $Coro::idle = sub {
3383 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#
3384 (async { 3528 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3529 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3530 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3531 })->prio (Coro::PRIO_MAX);
3388 }; 3532 };
3389 3533
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3534 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3535
3536 cf::sync_job {
3537 cf::load_settings;
3538 cf::load_materials;
3539
3540 reload_resources;
3541 reload_config;
3542 db_init;
3543
3544 cf::init_uuid;
3545 cf::init_signals;
3546 cf::init_skills;
3547
3548 cf::init_beforeplay;
3549
3550 atomic;
3551
3552 load_extensions;
3553
3554 utime time, time, $RUNTIMEFILE;
3555
3556 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559
3560 (pop @POST_INIT)->(0) while @POST_INIT;
3561 };
3562
3563 main_loop;
3397} 3564}
3398 3565
3399############################################################################# 3566#############################################################################
3400# initialisation and cleanup 3567# initialisation and cleanup
3401 3568
3408 }; 3575 };
3409 } 3576 }
3410} 3577}
3411 3578
3412sub write_runtime_sync { 3579sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3580 my $t0 = EV::time;
3414 3581
3415 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3417 3584
3418 IO::AIO::aio_utime $runtime, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3586
3420 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3421 3588
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3590 or return;
3424 3591
3425 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3604 aio_utime $fh, undef, undef;
3438 3605
3439 close $fh 3606 close $fh
3440 or return; 3607 or return;
3441 3608
3442 aio_rename "$runtime~", $runtime 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3610 and return;
3444 3611
3445 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3446 3613
3447 1 3614 1
3448} 3615}
3449 3616
3450our $uuid_lock; 3617our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3626 my $uuid = "$LOCALDIR/uuid";
3460 3627
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3628 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3629 or return;
3463 3630
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3631 my $value = uuid_seq uuid_cur;
3632
3633 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n";
3635 return;
3636 }
3637
3638 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3639 $uuid_skip = 0;
3466 3640
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3641 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3642 and return;
3469 3643
3491} 3665}
3492 3666
3493sub emergency_save() { 3667sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3668 my $freeze_guard = cf::freeze_mainloop;
3495 3669
3496 warn "enter emergency perl save\n"; 3670 warn "emergency_perl_save: enter\n";
3497 3671
3498 cf::sync_job { 3672 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677
3499 # use a peculiar iteration method to avoid tripping on perl 3678 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3679 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3680 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3681 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3682 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3683 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3684 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3686 $pl->save;
3508 } 3687 }
3509 warn "end emergency player save\n"; 3688 warn "emergency_perl_save: end player save\n";
3510 3689
3511 warn "begin emergency map save\n"; 3690 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3691 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3692 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3693 $map->valid or next;
3515 $map->save; 3694 $map->save;
3516 } 3695 }
3517 warn "end emergency map save\n"; 3696 warn "emergency_perl_save: end map save\n";
3518 3697
3519 warn "begin emergency database checkpoint\n"; 3698 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3699 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3700 warn "emergency_perl_save: end database checkpoint\n";
3522 3701
3523 warn "begin write uuid\n"; 3702 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3703 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3704 warn "emergency_perl_save: end write uuid\n";
3526 }; 3705 };
3527 3706
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3528 warn "leave emergency perl save\n"; 3712 warn "emergency_perl_save: leave\n";
3529} 3713}
3530 3714
3531sub post_cleanup { 3715sub post_cleanup {
3532 my ($make_core) = @_; 3716 my ($make_core) = @_;
3533 3717
3534 warn Carp::longmess "post_cleanup backtrace" 3718 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3719 if $make_core;
3720
3721 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$;
3723}
3724
3725# a safer delete_package, copied from Symbol
3726sub clear_package($) {
3727 my $pkg = shift;
3728
3729 # expand to full symbol table name if needed
3730 unless ($pkg =~ /^main::.*::$/) {
3731 $pkg = "main$pkg" if $pkg =~ /^::/;
3732 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3733 $pkg .= '::' unless $pkg =~ /::$/;
3734 }
3735
3736 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3737 my $stem_symtab = *{$stem}{HASH};
3738
3739 defined $stem_symtab and exists $stem_symtab->{$leaf}
3740 or return;
3741
3742 # clear all symbols
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 }
3748 warn "cleared package $pkg\n";#d#
3536} 3749}
3537 3750
3538sub do_reload_perl() { 3751sub do_reload_perl() {
3539 # can/must only be called in main 3752 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3754 warn "can only reload from main coroutine";
3542 return; 3755 return;
3543 } 3756 }
3544 3757
3758 return if $RELOAD++;
3759
3760 my $t1 = EV::time;
3761
3762 while ($RELOAD) {
3545 warn "reloading..."; 3763 warn "reloading...";
3546 3764
3547 warn "entering sync_job"; 3765 warn "entering sync_job";
3548 3766
3549 cf::sync_job { 3767 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3768 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3769 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3770 cf::write_runtime_sync; # external watchdog should not bark
3553 3771
3554 warn "syncing database to disk"; 3772 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3773 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3774
3557 # if anything goes wrong in here, we should simply crash as we already saved 3775 # if anything goes wrong in here, we should simply crash as we already saved
3558 3776
3559 warn "flushing outstanding aio requests"; 3777 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3778 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3780 }
3591 3781
3592 warn "... nuking $pkg"; 3782 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3783 $_->cancel for values %EXT_CORO;
3594 } 3784 %EXT_CORO = ();
3595 3785
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3786 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3787 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3788
3789 warn "removing ext/exti commands";
3790 %EXTCMD = ();
3791 %EXTICMD = ();
3792
3793 warn "unloading/nuking all extensions";
3794 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3795 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3796
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3797 if (my $cb = $pkg->can ("unload")) {
3798 eval {
3607 $cb->(); 3799 $cb->($pkg);
3800 1
3801 } or warn "$pkg unloaded, but with errors: $@";
3802 }
3803
3804 warn "... clearing $pkg";
3805 clear_package $pkg;
3608 } 3806 }
3609 3807
3610 Symbol::delete_package $k; 3808 warn "unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811
3812 warn "... unloading $k";
3813 delete $INC{$k};
3814
3815 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g;
3817
3818 if (my $cb = $k->can ("unload_module")) {
3819 $cb->();
3820 }
3821
3822 clear_package $k;
3611 } 3823 }
3612 3824
3613 warn "getting rid of safe::, as good as possible"; 3825 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3826 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3828
3617 warn "unloading cf.pm \"a bit\""; 3829 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3830 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3832
3621 # don't, removes xs symbols, too, 3833 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3834 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3835 #clear_package __PACKAGE__;
3624 3836
3625 warn "unload completed, starting to reload now"; 3837 warn "unload completed, starting to reload now";
3626 3838
3627 warn "reloading cf.pm"; 3839 warn "reloading cf.pm";
3628 require cf; 3840 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3841 cf::_connect_to_perl_1;
3630 3842
3631 warn "loading config and database again"; 3843 warn "loading config and database again";
3632 cf::reload_config; 3844 cf::reload_config;
3633 3845
3634 warn "loading extensions"; 3846 warn "loading extensions";
3635 cf::load_extensions; 3847 cf::load_extensions;
3636 3848
3849 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3850 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3851 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3852 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3853 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3854 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3855 reattach $_ for values %PLAYER;
3856 }
3643 3857
3858 warn "running post_init jobs";
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860
3644 warn "leaving sync_job"; 3861 warn "leaving sync_job";
3645 3862
3646 1 3863 1
3647 } or do { 3864 } or do {
3648 warn $@; 3865 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3866 cf::cleanup "error while reloading, exiting.";
3650 }; 3867 };
3651 3868
3652 warn "reloaded"; 3869 warn "reloaded";
3870 --$RELOAD;
3871 }
3872
3873 $t1 = EV::time - $t1;
3874 warn "reload completed in ${t1}s\n";
3653}; 3875};
3654 3876
3655our $RELOAD_WATCHER; # used only during reload 3877our $RELOAD_WATCHER; # used only during reload
3656 3878
3657sub reload_perl() { 3879sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3880 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3881 # coro crashes during coro_state_free->destroy here.
3660 3882
3883 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions;
3885
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3887 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3888 undef $RELOAD_WATCHER;
3889 };
3664 }; 3890 };
3665} 3891}
3666 3892
3667register_command "reload" => sub { 3893register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3894 my ($who, $arg) = @_;
3682 3908
3683our @WAIT_FOR_TICK; 3909our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3910our @WAIT_FOR_TICK_BEGIN;
3685 3911
3686sub wait_for_tick { 3912sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 3914
3690 my $signal = new Coro::Signal; 3915 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3916 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3917 $signal->wait;
3693} 3918}
3694 3919
3695sub wait_for_tick_begin { 3920sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 3922
3699 my $signal = new Coro::Signal; 3923 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3924 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3925 $signal->wait;
3702} 3926}
3707 unless ++$bug_warning > 10; 3931 unless ++$bug_warning > 10;
3708 return; 3932 return;
3709 } 3933 }
3710 3934
3711 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3712 3938
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 3941 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
3739} 3965}
3740 3966
3741{ 3967{
3742 # configure BDB 3968 # configure BDB
3743 3969
3744 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3747 3973
3748 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3977 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3978 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3979 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3980 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3981
3755 cf::sync_job { 3982 cf::sync_job {
3756 eval { 3983 eval {
3782{ 4009{
3783 # configure IO::AIO 4010 # configure IO::AIO
3784 4011
3785 IO::AIO::min_parallel 8; 4012 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4013 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4014 undef $AnyEvent::AIO::WATCHER;
3788} 4015}
3789 4016
3790my $_log_backtrace; 4017my $_log_backtrace;
3791 4018
3792sub _log_backtrace { 4019sub _log_backtrace {
3795 $msg =~ s/\n//; 4022 $msg =~ s/\n//;
3796 4023
3797 # limit the # of concurrent backtraces 4024 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4025 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 4026 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg;
3800 async { 4028 async {
3801 $Coro::current->{desc} = "abt $msg"; 4029 $Coro::current->{desc} = "abt $msg";
3802 4030
3803 my @bt = fork_call { 4031 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4032 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4043 }
3816 4044
3817 @funcs 4045 @funcs
3818 }; 4046 };
3819 4047
3820 LOG llevInfo, "[ABT] $msg\n"; 4048 LOG llevInfo, "[ABT] $perl_bt\n";
4049 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4050 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4051 --$_log_backtrace;
3823 }; 4052 };
3824 } else { 4053 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4054 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4055 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4056 }
3828} 4057}
3829 4058
3830# load additional modules 4059# load additional modules
3831use cf::pod; 4060require "cf/$_.pm" for @EXTRA_MODULES;
4061cf::_connect_to_perl_2;
3832 4062
3833END { cf::emergency_save } 4063END { cf::emergency_save }
3834 4064
38351 40651
3836 4066

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines