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.415 by root, Thu Apr 10 15:35:16 2008 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 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 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
1775our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1777 1749
1778sub generate_random_map { 1750sub generate_random_map {
1779 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1780 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1756 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1881
1907# the temporary/swap location 1882# the temporary/swap location
1908sub save_path { 1883sub save_path {
1909 my ($self) = @_; 1884 my ($self) = @_;
1910 1885
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1913} 1888}
1914 1889
1915# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1916sub uniq_path { 1891sub uniq_path {
1917 my ($self) = @_; 1892 my ($self) = @_;
1918 1893
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1896}
1931 1897
1932sub decay_objects { 1898sub decay_objects {
1933 my ($self) = @_; 1899 my ($self) = @_;
1934 1900
2018sub find { 1984sub find {
2019 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2020 1986
2021 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2022 1988
2023 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1991
2026 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2031 or return; 1994 or return;
2032 1995
2033 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2034 1997
2036 or return; 1999 or return;
2037 2000
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2041 undef $guard1; 2005 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2006 $map->reset;
2044 return find $path; 2007 return find $path;
2045 } 2008 }
2046 2009
2047 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2048 } 2011 }
2049} 2012}
2050 2013
2051sub pre_load { } 2014sub pre_load { }
2052sub post_load { } 2015#sub post_load { } # XS
2053 2016
2054sub load { 2017sub load {
2055 my ($self) = @_; 2018 my ($self) = @_;
2056 2019
2057 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2038 $f->skip_block;
2076 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2077 or return; 2040 or return;
2078 2041
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2080 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2081 2044
2082 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2046 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2066 $self->decay_objects;
2104 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2105 $self->update_buttons; 2068 $self->update_buttons;
2106 cf::cede_to_tick; 2069 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2070 $self->activate;
2110 } 2071 }
2111 2072
2112 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2114 2075
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2077 }
2117 2078
2118 $self->post_load; 2079 $self->post_load;
2119} 2080}
2120 2081
2178 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2179 2140
2180 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2181 2142
2182 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2145 }
2185 2146
2186 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2187 2148
2188 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2186 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2228 }; 2189 };
2229 2190
2191 cf::get_slot 0.02;
2192
2230 if ($uniq) { 2193 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2196 } else {
2234 $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);
2242 $self->save; 2205 $self->save;
2243 2206
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2208
2246 return if $self->players; 2209 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2249 2212
2250 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2251 2214
2252 $self->deactivate; 2215 $self->deactivate;
2277 2240
2278 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279 2242
2280 return if $self->players; 2243 return if $self->players;
2281 2244
2282 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2283 2246
2284 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2285 2248
2286 # need to save uniques path 2249 # need to save uniques path
2287 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2370 2333
2371sub unique_maps() { 2334sub unique_maps() {
2372 [ 2335 [
2373 map { 2336 map {
2374 utf8::decode $_; 2337 utf8::decode $_;
2375 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2376 ? normalise $_ 2341 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2343 ]
2380} 2344}
2381 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
2382=back 2378=back
2383 2379
2384=head3 cf::object 2380=head3 cf::object
2385 2381
2386=cut 2382=cut
2389 2385
2390=over 4 2386=over 4
2391 2387
2392=item $ob->inv_recursive 2388=item $ob->inv_recursive
2393 2389
2394Returns 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.
2395 2392
2396=cut 2393=cut
2397 2394
2398sub inv_recursive_; 2395sub inv_recursive_;
2399sub inv_recursive_ { 2396sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2405} 2402}
2406 2403
2407=item $ref = $ob->ref 2404=item $ref = $ob->ref
2408 2405
2409creates 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.
2410 2407
2411=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2412 2409
2413returns 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,
2414even if the object actually exists. May block. 2411even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2444dialogue with the given NPC character.
2448 2445
2449=cut 2446=cut
2450 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
2451# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2463# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2479
2469 } else { 2480 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2483 }
2473 } 2484 }
2474} 2485}
2475 2486
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2512
2502=item $player_object->enter_link 2513=item $player_object->enter_link
2503 2514
2504Freezes 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}>).
2505 2516
2506The 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.
2507I<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.
2508 2521
2509Will never block. 2522Will never block.
2510 2523
2511=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2512 2525
2564 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2566 2579
2567 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2570 2583
2571 $map->load; 2584 $map->load;
2572 $map->load_neighbours; 2585 $map->load_neighbours;
2573 2586
2574 return unless $self->contr->active; 2587 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2588
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $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;
2579} 2594}
2580 2595
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2582 2597
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2606
2589=cut 2607=cut
2590 2608
2591our $GOTOGEN; 2609our $GOTOGEN;
2592 2610
2671} 2689}
2672 2690
2673sub prepare_random_map { 2691sub prepare_random_map {
2674 my ($exit) = @_; 2692 my ($exit) = @_;
2675 2693
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2696 # that depends on the exit object
2681 2697
2682 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2700 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2689 } 2707 }
2690 2708
2691 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2692 2710
2693 my $data = cf::encode_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2696 2714
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2717 undef $fh;
2700 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2701 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2704 } 2726 }
2705} 2727}
2706 2728
2707sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2709 2731
2710 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2711 2733
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2734 $self->enter_link;
2724 2735
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2736 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2737 $Coro::current->{desc} = "enter_exit";
2731 2738
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2735 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
2736 1; 2760 1
2737 }) { 2761 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2766
2743 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2760sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2762 2786
2763 utf8::encode $text; 2787 utf8::encode $text;
2764 $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);
2765} 2814}
2766 2815
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2817
2769Send 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
2773 2822
2774=cut 2823=cut
2775 2824
2776# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2778 "c/identify" => { 2833 "c/identify" => {
2779 id => "infobox", 2834 id => "infobox",
2780 title => "Identify", 2835 title => "Identify",
2781 reply => undef, 2836 reply => undef,
2782 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2784 "c/examine" => { 2839 "c/examine" => {
2785 id => "infobox", 2840 id => "infobox",
2786 title => "Examine", 2841 title => "Examine",
2787 reply => undef, 2842 reply => undef,
2788 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",
2789 }, 2850 },
2790 "c/book" => { 2851 "c/book" => {
2791 id => "infobox", 2852 id => "infobox",
2792 title => "Book", 2853 title => "Book",
2793 reply => undef, 2854 reply => undef,
2809 id => "infobox", 2870 id => "infobox",
2810 title => "Body Parts", 2871 title => "Body Parts",
2811 reply => undef, 2872 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 2911 "c/uptime" => {
2815 id => "infobox", 2912 id => "infobox",
2816 title => "Uptime", 2913 title => "Uptime",
2817 reply => undef, 2914 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2918 id => "infobox",
2822 title => "Map Info", 2919 title => "Map Info",
2823 reply => undef, 2920 reply => undef,
2824 tooltip => "Information related to the maps", 2921 tooltip => "Information related to the maps",
2825 }, 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,
2826); 2937);
2827 2938
2828sub cf::client::send_msg { 2939sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2941
2831 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2832 2944
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2946
2835 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2838 2950
2839 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2843 2953
2844 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2959 }
2851 2960
2852 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2853 } 2962 }
2854 2963
2855 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2856 2965
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2966 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2861 2969
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2973 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 2974
2876 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 2976}
2890 2977
2891=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2892 2979
2893Sends an ext event to the client. 2980Sends an ext event to the client.
2896 2983
2897sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2899 2986
2900 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 2992 }
2906} 2993}
2907 2994
2908=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2909 2996
2913 3000
2914sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2916 3003
2917 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3007 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3010 }
2924} 3011}
2925 3012
2926=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2927 3014
3054our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3055 3142
3056$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3057 3144
3058$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3061 sort time 3148 sort time
3062)); 3149));
3063 3150
3064# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
3067 3154
3068The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3069 3156
3070 cf::object 3157 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
3073 3161
3074 cf::object::player 3162 cf::object::player
3075 player 3163 player
3076 3164
3077 cf::player 3165 cf::player
3082 3170
3083=cut 3171=cut
3084 3172
3085for ( 3173for (
3086 ["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
3087 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3092) { 3180) {
3093 no strict 'refs'; 3181 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3113 3201
3114 my $qcode = $code; 3202 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3117 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
3118 local $_; 3209 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3210
3121 my $eval = 3211 my $eval =
3122 "do {\n" 3212 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3215 . $code
3126 . "\n}" 3216 . "\n}"
3127 ; 3217 ;
3128 3218
3219 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3132 3228
3133 if ($@) { 3229 if ($@) {
3134 warn "$@"; 3230 warn "$@";
3135 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
3155=cut 3251=cut
3156 3252
3157sub register_script_function { 3253sub register_script_function {
3158 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3159 3255
3160 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3162} 3258}
3163 3259
3164=back 3260=back
3165 3261
3166=cut 3262=cut
3187 3283
3188 $facedata->{version} == 2 3284 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3286
3191 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3192 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3290 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3195 }; 3293 };
3196 cf::cede_to_tick; 3294 cf::cede_to_tick;
3197 3295
3198 { 3296 {
3199 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3301
3204 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3306
3209 cf::cede_to_tick; 3307 cf::cede_to_tick;
3210 } 3308 }
3211 3309
3212 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
3236 3334
3237 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3238 } 3336 }
3239 3337
3240 { 3338 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3244 3340
3245 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3342 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3344
3250 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3346 cf::face::set_type $idx, $info->{type};
3265 } else { 3347 } else {
3266 $RESOURCE{$name} = $info; 3348 $RESOURCE{$name} = $info;
3267 } 3349 }
3268 3350
3301 while (my ($k, $v) = each %$want) { 3383 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3384 $ns->fx_want ($k, $v);
3303 } 3385 }
3304}; 3386};
3305 3387
3388sub load_resource_file($) {
3389 my $guard = lock_acquire "load_resource_file";
3390
3391 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100;
3393 cf::arch::commit_load;
3394
3395 $status
3396}
3397
3306sub reload_regions { 3398sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3399 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3400 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3401 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3402
3323} 3415}
3324 3416
3325sub reload_archetypes { 3417sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3418 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3419 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3420}
3334 3421
3335sub reload_treasures { 3422sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3423 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3424 or die "unable to load treasurelists\n";
3338} 3425}
3339 3426
3340sub reload_resources { 3427sub reload_resources {
3341 warn "reloading resource files...\n"; 3428 warn "reloading resource files...\n";
3342 3429
3430 reload_facedata;
3431 reload_archetypes;
3343 reload_regions; 3432 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3433 reload_treasures;
3348 3434
3349 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3350} 3436}
3351 3437
3352sub init {
3353 reload_resources;
3354}
3355
3356sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3442 or return;
3359 3443
3360 local $/; 3444 local $/;
3361 *CFG = YAML::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3362 3446
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3364 3448
3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3372 }; 3456 };
3373 warn $@ if $@; 3457 warn $@ if $@;
3374 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3461}
3462
3463sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!";
3466 flock $fh, &Fcntl::LOCK_EX
3467 or die "$PIDFILE: flock: $!";
3468 $fh
3469}
3470
3471# make sure only one server instance is running at any one time
3472sub atomic {
3473 my $fh = pidfile;
3474
3475 my $pid = <$fh>;
3476 kill 9, $pid if $pid > 0;
3477
3478 seek $fh, 0, 0;
3479 print $fh $$;
3480}
3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
3375} 3489}
3376 3490
3377sub main { 3491sub main {
3492 cf::init_globals; # initialise logging
3493
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505
3378 # we must not ever block the main coroutine 3506 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3507 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3509 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3510 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3511 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3512 })->prio (Coro::PRIO_MAX);
3385 }; 3513 };
3386 3514
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3515 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3516
3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3521 reload_resources;
3522 reload_config;
3523 db_init;
3524
3525 cf::init_uuid;
3526 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills;
3529
3530 cf::init_beforeplay;
3531
3532 atomic;
3533
3534 load_extensions;
3535
3536 utime time, time, $RUNTIMEFILE;
3537
3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541
3542 (pop @POST_INIT)->(0) while @POST_INIT;
3543 };
3544
3545 main_loop;
3394} 3546}
3395 3547
3396############################################################################# 3548#############################################################################
3397# initialisation and cleanup 3549# initialisation and cleanup
3398 3550
3404 cf::cleanup "SIG$signal"; 3556 cf::cleanup "SIG$signal";
3405 }; 3557 };
3406 } 3558 }
3407} 3559}
3408 3560
3409sub write_runtime { 3561sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3562 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3563 # the fsync below can take a very very long time.
3414 3564
3415 IO::AIO::aio_utime $runtime, undef, undef; 3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3566
3417 my $guard = cf::lock_acquire "write_runtime"; 3567 my $guard = cf::lock_acquire "write_runtime";
3418 3568
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3570 or return;
3421 3571
3422 my $value = $cf::RUNTIME + 90 + 10; 3572 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3573 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3574 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3584 aio_utime $fh, undef, undef;
3435 3585
3436 close $fh 3586 close $fh
3437 or return; 3587 or return;
3438 3588
3439 aio_rename "$runtime~", $runtime 3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3590 and return;
3441 3591
3442 warn "runtime file written.\n"; 3592 warn "runtime file written.\n";
3443 3593
3444 1 3594 1
3595}
3596
3597our $uuid_lock;
3598our $uuid_skip;
3599
3600sub write_uuid_sync($) {
3601 $uuid_skip ||= $_[0];
3602
3603 return if $uuid_lock;
3604 local $uuid_lock = 1;
3605
3606 my $uuid = "$LOCALDIR/uuid";
3607
3608 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3609 or return;
3610
3611 my $value = uuid_seq uuid_cur;
3612
3613 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n";
3615 return;
3616 }
3617
3618 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0;
3620
3621 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3622 and return;
3623
3624 # always fsync - this file is important
3625 aio_fsync $fh
3626 and return;
3627
3628 close $fh
3629 or return;
3630
3631 aio_rename "$uuid~", $uuid
3632 and return;
3633
3634 warn "uuid file written ($value).\n";
3635
3636 1
3637
3638}
3639
3640sub write_uuid($$) {
3641 my ($skip, $sync) = @_;
3642
3643 $sync ? write_uuid_sync $skip
3644 : async { write_uuid_sync $skip };
3445} 3645}
3446 3646
3447sub emergency_save() { 3647sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3648 my $freeze_guard = cf::freeze_mainloop;
3449 3649
3450 warn "enter emergency perl save\n"; 3650 warn "emergency_perl_save: enter\n";
3451 3651
3452 cf::sync_job { 3652 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657
3453 # use a peculiar iteration method to avoid tripping on perl 3658 # use a peculiar iteration method to avoid tripping on perl
3454 # refcount bugs in for. also avoids problems with players 3659 # refcount bugs in for. also avoids problems with players
3455 # and maps saved/destroyed asynchronously. 3660 # and maps saved/destroyed asynchronously.
3456 warn "begin emergency player save\n"; 3661 warn "emergency_perl_save: begin player save\n";
3457 for my $login (keys %cf::PLAYER) { 3662 for my $login (keys %cf::PLAYER) {
3458 my $pl = $cf::PLAYER{$login} or next; 3663 my $pl = $cf::PLAYER{$login} or next;
3459 $pl->valid or next; 3664 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3461 $pl->save; 3666 $pl->save;
3462 } 3667 }
3463 warn "end emergency player save\n"; 3668 warn "emergency_perl_save: end player save\n";
3464 3669
3465 warn "begin emergency map save\n"; 3670 warn "emergency_perl_save: begin map save\n";
3466 for my $path (keys %cf::MAP) { 3671 for my $path (keys %cf::MAP) {
3467 my $map = $cf::MAP{$path} or next; 3672 my $map = $cf::MAP{$path} or next;
3468 $map->valid or next; 3673 $map->valid or next;
3469 $map->save; 3674 $map->save;
3470 } 3675 }
3471 warn "end emergency map save\n"; 3676 warn "emergency_perl_save: end map save\n";
3472 3677
3473 warn "begin emergency database checkpoint\n"; 3678 warn "emergency_perl_save: begin database checkpoint\n";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3475 warn "end emergency database checkpoint\n"; 3680 warn "emergency_perl_save: end database checkpoint\n";
3681
3682 warn "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n";
3476 }; 3685 };
3477 3686
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3478 warn "leave emergency perl save\n"; 3692 warn "emergency_perl_save: leave\n";
3479} 3693}
3480 3694
3481sub post_cleanup { 3695sub post_cleanup {
3482 my ($make_core) = @_; 3696 my ($make_core) = @_;
3483 3697
3484 warn Carp::longmess "post_cleanup backtrace" 3698 warn Carp::longmess "post_cleanup backtrace"
3485 if $make_core; 3699 if $make_core;
3700
3701 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$;
3703}
3704
3705# a safer delete_package, copied from Symbol
3706sub clear_package($) {
3707 my $pkg = shift;
3708
3709 # expand to full symbol table name if needed
3710 unless ($pkg =~ /^main::.*::$/) {
3711 $pkg = "main$pkg" if $pkg =~ /^::/;
3712 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3713 $pkg .= '::' unless $pkg =~ /::$/;
3714 }
3715
3716 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3717 my $stem_symtab = *{$stem}{HASH};
3718
3719 defined $stem_symtab and exists $stem_symtab->{$leaf}
3720 or return;
3721
3722 # clear all symbols
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 }
3728 warn "cleared package $pkg\n";#d#
3486} 3729}
3487 3730
3488sub do_reload_perl() { 3731sub do_reload_perl() {
3489 # can/must only be called in main 3732 # can/must only be called in main
3490 if ($Coro::current != $Coro::main) { 3733 if ($Coro::current != $Coro::main) {
3491 warn "can only reload from main coroutine"; 3734 warn "can only reload from main coroutine";
3492 return; 3735 return;
3493 } 3736 }
3494 3737
3738 return if $RELOAD++;
3739
3740 my $t1 = EV::time;
3741
3742 while ($RELOAD) {
3495 warn "reloading..."; 3743 warn "reloading...";
3496 3744
3497 warn "entering sync_job"; 3745 warn "entering sync_job";
3498 3746
3499 cf::sync_job { 3747 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark 3748 cf::write_runtime_sync; # external watchdog should not bark
3501 cf::emergency_save; 3749 cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark 3750 cf::write_runtime_sync; # external watchdog should not bark
3503 3751
3504 warn "syncing database to disk"; 3752 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3506 3754
3507 # if anything goes wrong in here, we should simply crash as we already saved 3755 # if anything goes wrong in here, we should simply crash as we already saved
3508 3756
3509 warn "flushing outstanding aio requests"; 3757 warn "flushing outstanding aio requests";
3510 for (;;) {
3511 BDB::flush;
3512 IO::AIO::flush;
3513 Coro::cede_notself;
3514 last unless IO::AIO::nreqs || BDB::nreqs; 3758 while (IO::AIO::nreqs || BDB::nreqs) {
3515 warn "iterate..."; 3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3516 }
3517
3518 ++$RELOAD;
3519
3520 warn "cancelling all extension coros";
3521 $_->cancel for values %EXT_CORO;
3522 %EXT_CORO = ();
3523
3524 warn "removing commands";
3525 %COMMAND = ();
3526
3527 warn "removing ext/exti commands";
3528 %EXTCMD = ();
3529 %EXTICMD = ();
3530
3531 warn "unloading/nuking all extensions";
3532 for my $pkg (@EXTS) {
3533 warn "... unloading $pkg";
3534
3535 if (my $cb = $pkg->can ("unload")) {
3536 eval {
3537 $cb->($pkg);
3538 1
3539 } or warn "$pkg unloaded, but with errors: $@";
3540 } 3760 }
3541 3761
3542 warn "... nuking $pkg"; 3762 warn "cancelling all extension coros";
3543 Symbol::delete_package $pkg; 3763 $_->cancel for values %EXT_CORO;
3544 } 3764 %EXT_CORO = ();
3545 3765
3546 warn "unloading all perl modules loaded from $LIBDIR"; 3766 warn "removing commands";
3547 while (my ($k, $v) = each %INC) { 3767 %COMMAND = ();
3548 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3549 3768
3769 warn "removing ext/exti commands";
3770 %EXTCMD = ();
3771 %EXTICMD = ();
3772
3773 warn "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) {
3550 warn "... unloading $k"; 3775 warn "... unloading $pkg";
3551 delete $INC{$k};
3552 3776
3553 $k =~ s/\.pm$//;
3554 $k =~ s/\//::/g;
3555
3556 if (my $cb = $k->can ("unload_module")) { 3777 if (my $cb = $pkg->can ("unload")) {
3778 eval {
3557 $cb->(); 3779 $cb->($pkg);
3780 1
3781 } or warn "$pkg unloaded, but with errors: $@";
3782 }
3783
3784 warn "... clearing $pkg";
3785 clear_package $pkg;
3558 } 3786 }
3559 3787
3560 Symbol::delete_package $k; 3788 warn "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791
3792 warn "... unloading $k";
3793 delete $INC{$k};
3794
3795 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g;
3797
3798 if (my $cb = $k->can ("unload_module")) {
3799 $cb->();
3800 }
3801
3802 clear_package $k;
3561 } 3803 }
3562 3804
3563 warn "getting rid of safe::, as good as possible"; 3805 warn "getting rid of safe::, as good as possible";
3564 Symbol::delete_package "safe::$_" 3806 clear_package "safe::$_"
3565 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3566 3808
3567 warn "unloading cf.pm \"a bit\""; 3809 warn "unloading cf.pm \"a bit\"";
3568 delete $INC{"cf.pm"}; 3810 delete $INC{"cf.pm"};
3569 delete $INC{"cf/pod.pm"}; 3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3570 3812
3571 # don't, removes xs symbols, too, 3813 # don't, removes xs symbols, too,
3572 # and global variables created in xs 3814 # and global variables created in xs
3573 #Symbol::delete_package __PACKAGE__; 3815 #clear_package __PACKAGE__;
3574 3816
3575 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3576 3818
3577 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3578 require cf; 3820 require cf;
3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3580 3822
3581 warn "loading config and database again"; 3823 warn "loading config and database again";
3582 cf::reload_config; 3824 cf::reload_config;
3583 3825
3584 warn "loading extensions"; 3826 warn "loading extensions";
3585 cf::load_extensions; 3827 cf::load_extensions;
3586 3828
3829 if ($REATTACH_ON_RELOAD) {
3587 warn "reattaching attachments to objects/players"; 3830 warn "reattaching attachments to objects/players";
3588 _global_reattach; # objects, sockets 3831 _global_reattach; # objects, sockets
3589 warn "reattaching attachments to maps"; 3832 warn "reattaching attachments to maps";
3590 reattach $_ for values %MAP; 3833 reattach $_ for values %MAP;
3591 warn "reattaching attachments to players"; 3834 warn "reattaching attachments to players";
3592 reattach $_ for values %PLAYER; 3835 reattach $_ for values %PLAYER;
3836 }
3593 3837
3838 warn "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840
3594 warn "leaving sync_job"; 3841 warn "leaving sync_job";
3595 3842
3596 1 3843 1
3597 } or do { 3844 } or do {
3598 warn $@; 3845 warn $@;
3599 cf::cleanup "error while reloading, exiting."; 3846 cf::cleanup "error while reloading, exiting.";
3600 }; 3847 };
3601 3848
3602 warn "reloaded"; 3849 warn "reloaded";
3850 --$RELOAD;
3851 }
3852
3853 $t1 = EV::time - $t1;
3854 warn "reload completed in ${t1}s\n";
3603}; 3855};
3604 3856
3605our $RELOAD_WATCHER; # used only during reload 3857our $RELOAD_WATCHER; # used only during reload
3606 3858
3607sub reload_perl() { 3859sub reload_perl() {
3608 # doing reload synchronously and two reloads happen back-to-back, 3860 # doing reload synchronously and two reloads happen back-to-back,
3609 # coro crashes during coro_state_free->destroy here. 3861 # coro crashes during coro_state_free->destroy here.
3610 3862
3863 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions;
3865
3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3612 do_reload_perl; 3867 do_reload_perl;
3613 undef $RELOAD_WATCHER; 3868 undef $RELOAD_WATCHER;
3869 };
3614 }; 3870 };
3615} 3871}
3616 3872
3617register_command "reload" => sub { 3873register_command "reload" => sub {
3618 my ($who, $arg) = @_; 3874 my ($who, $arg) = @_;
3632 3888
3633our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3634our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3635 3891
3636sub wait_for_tick { 3892sub wait_for_tick {
3637 return if tick_inhibit;
3638 return if $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3639 3894
3640 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3641 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3642 $signal->wait; 3897 $signal->wait;
3643} 3898}
3644 3899
3645sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3646 return if tick_inhibit;
3647 return if $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3648 3902
3649 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3650 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3651 $signal->wait; 3905 $signal->wait;
3652} 3906}
3662 3916
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3917 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3665 Coro::async_pool { 3919 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 3920 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 3921 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 3922 or warn "ERROR: unable to write runtime file: $!";
3669 }; 3923 };
3670 } 3924 }
3671 3925
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3691{ 3945{
3692 # configure BDB 3946 # configure BDB
3693 3947
3694 BDB::min_parallel 8; 3948 BDB::min_parallel 8;
3695 BDB::max_poll_reqs $TICK * 0.1; 3949 BDB::max_poll_reqs $TICK * 0.1;
3696 $Coro::BDB::WATCHER->priority (1); 3950 $AnyEvent::BDB::WATCHER->priority (1);
3697 3951
3698 unless ($DB_ENV) { 3952 unless ($DB_ENV) {
3699 $DB_ENV = BDB::db_env_create; 3953 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3701 | BDB::LOG_AUTOREMOVE, 1); 3955 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3956 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3957 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3958 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3704 3959
3705 cf::sync_job { 3960 cf::sync_job {
3706 eval { 3961 eval {
3732{ 3987{
3733 # configure IO::AIO 3988 # configure IO::AIO
3734 3989
3735 IO::AIO::min_parallel 8; 3990 IO::AIO::min_parallel 8;
3736 IO::AIO::max_poll_time $TICK * 0.1; 3991 IO::AIO::max_poll_time $TICK * 0.1;
3737 $Coro::AIO::WATCHER->priority (1); 3992 undef $AnyEvent::AIO::WATCHER;
3738} 3993}
3739 3994
3740my $_log_backtrace; 3995my $_log_backtrace;
3741 3996
3742sub _log_backtrace { 3997sub _log_backtrace {
3745 $msg =~ s/\n//; 4000 $msg =~ s/\n//;
3746 4001
3747 # limit the # of concurrent backtraces 4002 # limit the # of concurrent backtraces
3748 if ($_log_backtrace < 2) { 4003 if ($_log_backtrace < 2) {
3749 ++$_log_backtrace; 4004 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg;
3750 async { 4006 async {
3751 $Coro::current->{desc} = "abt $msg"; 4007 $Coro::current->{desc} = "abt $msg";
3752 4008
3753 my @bt = fork_call { 4009 my @bt = fork_call {
3754 @addr = map { sprintf "%x", $_ } @addr; 4010 @addr = map { sprintf "%x", $_ } @addr;
3765 } 4021 }
3766 4022
3767 @funcs 4023 @funcs
3768 }; 4024 };
3769 4025
3770 LOG llevInfo, "[ABT] $msg\n"; 4026 LOG llevInfo, "[ABT] $perl_bt\n";
4027 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3771 LOG llevInfo, "[ABT] $_\n" for @bt; 4028 LOG llevInfo, "[ABT] $_\n" for @bt;
3772 --$_log_backtrace; 4029 --$_log_backtrace;
3773 }; 4030 };
3774 } else { 4031 } else {
3775 LOG llevInfo, "[ABT] $msg\n"; 4032 LOG llevInfo, "[ABT] $msg\n";
3776 LOG llevInfo, "[ABT] [suppressed]\n"; 4033 LOG llevInfo, "[ABT] [suppressed]\n";
3777 } 4034 }
3778} 4035}
3779 4036
3780# load additional modules 4037# load additional modules
3781use cf::pod; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3782 4040
3783END { cf::emergency_save } 4041END { cf::emergency_save }
3784 4042
37851 40431
3786 4044

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines