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.497 by root, Fri Dec 18 03:49:46 2009 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 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
427 } 455 }
428 } 456 }
429}; 457};
430 458
431sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
432 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
433 463
434 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
436 466
722 752
723############################################################################# 753#############################################################################
724 754
725=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
726 756
727Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
730 760
731In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
783 813
784Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
786 816
787Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
789 819
790These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
791 821
792=over 4 822=over 4
1083 1113
1084sub reattach { 1114sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1116 my ($obj) = @_;
1087 1117
1118 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1120
1090 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1091 1122
1092 @$registry = (); 1123 @$registry = ();
1093 1124
1139 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1142 1173
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1147 close $fh; 1181 aio_close $fh;
1148 1182
1149 if (@$objs) { 1183 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1155 close $fh; 1192 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1194 }
1158 } else { 1195 } else {
1159 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1160 } 1197 }
1161 1198
1162 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1203 } else {
1164 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1165 } 1205 }
1166 } else { 1206 } else {
1167 aio_unlink $filename; 1207 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1169 } 1209 }
1260 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1261 1301
1262 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1263} 1303}
1264 1304
1305use File::Glob ();
1306
1265cf::player->attach ( 1307cf::player->attach (
1266 on_command => sub { 1308 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1268 1310
1269 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1301 1343
1302 cf::override; 1344 cf::override;
1303 }, 1345 },
1304); 1346);
1305 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1306sub load_extensions { 1361sub load_extensions {
1307 cf::sync_job { 1362 cf::sync_job {
1308 my %todo; 1363 my %todo;
1309 1364
1310 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1329 1384
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1387
1333 $ext{source} = 1388 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1336 . $source 1391 . $source
1337 . "\n};\n1"; 1392 . "\n};\n1";
1338 1393
1339 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1379 1434
1380=back 1435=back
1381 1436
1382=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1383 1438
1384Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1385 1440
1386=cut 1441=cut
1387 1442
1388package cf::player; 1443package cf::player;
1389 1444
1432 1487
1433sub exists($) { 1488sub exists($) {
1434 my ($login) = @_; 1489 my ($login) = @_;
1435 1490
1436 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1438} 1493}
1439 1494
1440sub find($) { 1495sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1497 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1510 or return;
1456 1511
1457 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1458 or return; 1513 or return;
1514
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1462 } 1518 }
1463 } 1519 }
1473 1529
1474 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1475 1531
1476 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1478 1536
1479 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1538 cf::cede_to_tick;
1481} 1539}
1482 1540
1514 my ($pl) = @_; 1572 my ($pl) = @_;
1515 1573
1516 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1517 1575
1518 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1578
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1525 1585
1526 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1626
1567 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1568 my $path = path $login; 1628 my $path = path $login;
1569 1629
1570 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1636 }
1576 1637
1607 } 1668 }
1608 1669
1609 \@paths 1670 \@paths
1610} 1671}
1611 1672
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1674
1614Expand crossfire pod fragments into protocol xml. 1675Expand 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 1676
1705=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1706 1678
1707Sends an ext reply to the player. 1679Sends an ext reply to the player.
1708 1680
1909 1881
1910# the temporary/swap location 1882# the temporary/swap location
1911sub save_path { 1883sub save_path {
1912 my ($self) = @_; 1884 my ($self) = @_;
1913 1885
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1916} 1888}
1917 1889
1918# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1919sub uniq_path { 1891sub uniq_path {
1920 my ($self) = @_; 1892 my ($self) = @_;
1921 1893
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1895 "$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} 1896}
1934 1897
1935sub decay_objects { 1898sub decay_objects {
1936 my ($self) = @_; 1899 my ($self) = @_;
1937 1900
2021sub find { 1984sub find {
2022 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2023 1986
2024 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2025 1988
2026 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1991
2029 $cf::MAP{$path} || do { 1992 $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 1993 my $map = new_from_path cf::map $path
2034 or return; 1994 or return;
2035 1995
2036 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2037 1997
2039 or return; 1999 or return;
2040 2000
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2044 undef $guard1; 2005 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2006 $map->reset;
2047 return find $path; 2007 return find $path;
2048 } 2008 }
2049 2009
2050 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2038 $f->skip_block;
2079 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2080 or return; 2040 or return;
2081 2041
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2083 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2084 2044
2085 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2046 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2066 $self->decay_objects;
2107 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2108 $self->update_buttons; 2068 $self->update_buttons;
2109 cf::cede_to_tick; 2069 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2070 $self->activate;
2113 } 2071 }
2114 2072
2115 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2117 2075
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2077 }
2120 2078
2121 $self->post_load; 2079 $self->post_load;
2122} 2080}
2123 2081
2181 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2182 2140
2183 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2184 2142
2185 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2145 }
2188 2146
2189 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2190 2148
2191 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2186 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2231 }; 2189 };
2232 2190
2191 cf::get_slot 0.02;
2192
2233 if ($uniq) { 2193 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2196 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2205 $self->save;
2246 2206
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2208
2249 return if $self->players; 2209 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2252 2212
2253 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2254 2214
2255 $self->deactivate; 2215 $self->deactivate;
2280 2240
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2242
2283 return if $self->players; 2243 return if $self->players;
2284 2244
2285 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2286 2246
2287 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2288 2248
2289 # need to save uniques path 2249 # need to save uniques path
2290 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2373 2333
2374sub unique_maps() { 2334sub unique_maps() {
2375 [ 2335 [
2376 map { 2336 map {
2377 utf8::decode $_; 2337 utf8::decode $_;
2378 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2379 ? normalise $_ 2341 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2343 ]
2383} 2344}
2384 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2385=back 2378=back
2386 2379
2387=head3 cf::object 2380=head3 cf::object
2388 2381
2389=cut 2382=cut
2392 2385
2393=over 4 2386=over 4
2394 2387
2395=item $ob->inv_recursive 2388=item $ob->inv_recursive
2396 2389
2397Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2398 2392
2399=cut 2393=cut
2400 2394
2401sub inv_recursive_; 2395sub inv_recursive_;
2402sub inv_recursive_ { 2396sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2408} 2402}
2409 2403
2410=item $ref = $ob->ref 2404=item $ref = $ob->ref
2411 2405
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2413 2407
2414=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2415 2409
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2411even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2444dialogue with the given NPC character.
2451 2445
2452=cut 2446=cut
2453 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2454# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2463# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2479
2472 } else { 2480 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2483 }
2476 } 2484 }
2477} 2485}
2478 2486
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2512
2505=item $player_object->enter_link 2513=item $player_object->enter_link
2506 2514
2507Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2508 2516
2509The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2511 2521
2512Will never block. 2522Will never block.
2513 2523
2514=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2515 2525
2567 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2569 2579
2570 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2573 2583
2574 $map->load; 2584 $map->load;
2575 $map->load_neighbours; 2585 $map->load_neighbours;
2576 2586
2577 return unless $self->contr->active; 2587 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2588
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2582} 2594}
2583 2595
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2585 2597
2586Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2600that 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 2601the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2602be called at the end of this process.
2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2591 2606
2592=cut 2607=cut
2593 2608
2594our $GOTOGEN; 2609our $GOTOGEN;
2595 2610
2674} 2689}
2675 2690
2676sub prepare_random_map { 2691sub prepare_random_map {
2677 my ($exit) = @_; 2692 my ($exit) = @_;
2678 2693
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2696 # that depends on the exit object
2684 2697
2685 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2700 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2692 } 2707 }
2693 2708
2694 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2695 2710
2696 my $data = cf::encode_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2699 2714
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2717 undef $fh;
2703 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2704 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2707 } 2726 }
2708} 2727}
2709 2728
2710sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2712 2731
2713 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2714 2733
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; 2734 $self->enter_link;
2727 2735
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 { 2736 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2737 $Coro::current->{desc} = "enter_exit";
2734 2738
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2737 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2738 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2739 1; 2760 1
2740 }) { 2761 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2766
2746 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2765 2786
2766 utf8::encode $text; 2787 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2768} 2814}
2769 2815
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2817
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2822
2777=cut 2823=cut
2778 2824
2779# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2781 "c/identify" => { 2833 "c/identify" => {
2782 id => "infobox", 2834 id => "infobox",
2783 title => "Identify", 2835 title => "Identify",
2784 reply => undef, 2836 reply => undef,
2785 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2787 "c/examine" => { 2839 "c/examine" => {
2788 id => "infobox", 2840 id => "infobox",
2789 title => "Examine", 2841 title => "Examine",
2790 reply => undef, 2842 reply => undef,
2791 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2850 },
2793 "c/book" => { 2851 "c/book" => {
2794 id => "infobox", 2852 id => "infobox",
2795 title => "Book", 2853 title => "Book",
2796 reply => undef, 2854 reply => undef,
2812 id => "infobox", 2870 id => "infobox",
2813 title => "Body Parts", 2871 title => "Body Parts",
2814 reply => undef, 2872 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2816 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2817 "c/uptime" => { 2911 "c/uptime" => {
2818 id => "infobox", 2912 id => "infobox",
2819 title => "Uptime", 2913 title => "Uptime",
2820 reply => undef, 2914 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2918 id => "infobox",
2825 title => "Map Info", 2919 title => "Map Info",
2826 reply => undef, 2920 reply => undef,
2827 tooltip => "Information related to the maps", 2921 tooltip => "Information related to the maps",
2828 }, 2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2829); 2937);
2830 2938
2831sub cf::client::send_msg { 2939sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2941
2834 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2835 2944
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2946
2838 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2841 2950
2842 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2846 2953
2847 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 2959 }
2854 2960
2855 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2856 } 2962 }
2857 2963
2858 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2859 2965
2860 if ($self->can_msg) {
2861 # default colour, mask it out 2966 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2864 2969
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 2973 );
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 2974
2879 $color &= cf::NDI_COLOR_MASK; 2975 $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} 2976}
2893 2977
2894=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2895 2979
2896Sends an ext event to the client. 2980Sends an ext event to the client.
2899 2983
2900sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2902 2986
2903 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 2992 }
2909} 2993}
2910 2994
2911=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2912 2996
2916 3000
2917sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2919 3003
2920 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3007 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3010 }
2927} 3011}
2928 3012
2929=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2930 3014
3070 3154
3071The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3072 3156
3073 cf::object 3157 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
3076 3161
3077 cf::object::player 3162 cf::object::player
3078 player 3163 player
3079 3164
3080 cf::player 3165 cf::player
3085 3170
3086=cut 3171=cut
3087 3172
3088for ( 3173for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3095) { 3180) {
3096 no strict 'refs'; 3181 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3115 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3116 3201
3117 my $qcode = $code; 3202 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3120 3207
3121 local $_; 3208 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3123 3210
3124 my $eval = 3211 my $eval =
3204 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3293
3207 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3298
3212 cf::cede_to_tick; 3299 cf::cede_to_tick;
3213 } 3300 }
3214 3301
3215 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
3239 3326
3240 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3241 } 3328 }
3242 3329
3243 { 3330 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3247 3332
3248 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3336
3253 if ($info->{type} & 1) { 3337 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}; 3338 cf::face::set_type $idx, $info->{type};
3268 } else { 3339 } else {
3269 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3270 } 3341 }
3271 3342
3304 while (my ($k, $v) = each %$want) { 3375 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3376 $ns->fx_want ($k, $v);
3306 } 3377 }
3307}; 3378};
3308 3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
3309sub reload_regions { 3390sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3391 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3392 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3394
3326} 3407}
3327 3408
3328sub reload_archetypes { 3409sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3411 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} 3412}
3337 3413
3338sub reload_treasures { 3414sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
3341} 3417}
3342 3418
3343sub reload_resources { 3419sub reload_resources {
3344 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
3345 3421
3422 reload_facedata;
3423 reload_archetypes;
3346 reload_regions; 3424 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3425 reload_treasures;
3351 3426
3352 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3353} 3428}
3354 3429
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3434 or return;
3362 3435
3363 local $/; 3436 local $/;
3364 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3365 3438
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3367 3440
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $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}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3448 };
3376 warn $@ if $@; 3449 warn $@ if $@;
3377 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3378} 3481}
3379 3482
3380sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3381 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3501 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3388 }; 3505 };
3389 3506
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; 3507 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3514 reload_config;
3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3526 load_extensions;
3527
3528 utime time, time, $RUNTIMEFILE;
3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
3397} 3538}
3398 3539
3399############################################################################# 3540#############################################################################
3400# initialisation and cleanup 3541# initialisation and cleanup
3401 3542
3408 }; 3549 };
3409 } 3550 }
3410} 3551}
3411 3552
3412sub write_runtime_sync { 3553sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime";
3414
3415 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3417 3556
3418 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3558
3420 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3421 3560
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423 or return; 3562 or return;
3424 3563
3425 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3438 3577
3439 close $fh 3578 close $fh
3440 or return; 3579 or return;
3441 3580
3442 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3582 and return;
3444 3583
3445 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3446 3585
3447 1 3586 1
3459 my $uuid = "$LOCALDIR/uuid"; 3598 my $uuid = "$LOCALDIR/uuid";
3460 3599
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3601 or return;
3463 3602
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3611 $uuid_skip = 0;
3466 3612
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3614 and return;
3469 3615
3491} 3637}
3492 3638
3493sub emergency_save() { 3639sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3495 3641
3496 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3497 3643
3498 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3499 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3656 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3658 $pl->save;
3508 } 3659 }
3509 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3510 3661
3511 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3665 $map->valid or next;
3515 $map->save; 3666 $map->save;
3516 } 3667 }
3517 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3518 3669
3519 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3522 3673
3523 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3675 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3526 }; 3677 };
3527 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3528 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3529} 3685}
3530 3686
3531sub post_cleanup { 3687sub post_cleanup {
3532 my ($make_core) = @_; 3688 my ($make_core) = @_;
3533 3689
3534 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3536} 3721}
3537 3722
3538sub do_reload_perl() { 3723sub do_reload_perl() {
3539 # can/must only be called in main 3724 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3542 return; 3727 return;
3543 } 3728 }
3544 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3545 warn "reloading..."; 3735 warn "reloading...";
3546 3736
3547 warn "entering sync_job"; 3737 warn "entering sync_job";
3548 3738
3549 cf::sync_job { 3739 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3741 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3553 3743
3554 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3746
3557 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3558 3748
3559 warn "flushing outstanding aio requests"; 3749 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; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3751 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 } 3752 }
3591 3753
3592 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3594 } 3756 %EXT_CORO = ();
3595 3757
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3768
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3607 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3608 } 3778 }
3609 3779
3610 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3611 } 3795 }
3612 3796
3613 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3800
3617 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3804
3621 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3806 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3624 3808
3625 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3626 3810
3627 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3628 require cf; 3812 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3630 3814
3631 warn "loading config and database again"; 3815 warn "loading config and database again";
3632 cf::reload_config; 3816 cf::reload_config;
3633 3817
3634 warn "loading extensions"; 3818 warn "loading extensions";
3635 cf::load_extensions; 3819 cf::load_extensions;
3636 3820
3821 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3643 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3644 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3645 3834
3646 1 3835 1
3647 } or do { 3836 } or do {
3648 warn $@; 3837 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3650 }; 3839 };
3651 3840
3652 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3653}; 3847};
3654 3848
3655our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3656 3850
3657sub reload_perl() { 3851sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3660 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3859 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3664 }; 3862 };
3665} 3863}
3666 3864
3667register_command "reload" => sub { 3865register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3682 3880
3683our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3685 3883
3686sub wait_for_tick { 3884sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 3886
3690 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3889 $signal->wait;
3693} 3890}
3694 3891
3695sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 3894
3699 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3897 $signal->wait;
3702} 3898}
3741{ 3937{
3742 # configure BDB 3938 # configure BDB
3743 3939
3744 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3745 BDB::max_poll_reqs $TICK * 0.1; 3941 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3942 $AnyEvent::BDB::WATCHER->priority (1);
3747 3943
3748 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3951
3755 cf::sync_job { 3952 cf::sync_job {
3756 eval { 3953 eval {
3782{ 3979{
3783 # configure IO::AIO 3980 # configure IO::AIO
3784 3981
3785 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 3984 undef $AnyEvent::AIO::WATCHER;
3788} 3985}
3789 3986
3790my $_log_backtrace; 3987my $_log_backtrace;
3791 3988
3792sub _log_backtrace { 3989sub _log_backtrace {
3795 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3796 3993
3797 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3800 async { 3998 async {
3801 $Coro::current->{desc} = "abt $msg"; 3999 $Coro::current->{desc} = "abt $msg";
3802 4000
3803 my @bt = fork_call { 4001 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4013 }
3816 4014
3817 @funcs 4015 @funcs
3818 }; 4016 };
3819 4017
3820 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4021 --$_log_backtrace;
3823 }; 4022 };
3824 } else { 4023 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4026 }
3828} 4027}
3829 4028
3830# load additional modules 4029# load additional modules
3831use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3832 4032
3833END { cf::emergency_save } 4033END { cf::emergency_save }
3834 4034
38351 40351
3836 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines