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.423 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 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; 58use Digest::MD5;
52use Fcntl; 59use Fcntl;
53use YAML (); 60use YAML::XS ();
54use IO::AIO 2.51 (); 61use IO::AIO ();
55use Time::HiRes; 62use Time::HiRes;
56use Compress::LZF; 63use Compress::LZF;
57use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
58 67
59# configure various modules to our taste 68# configure various modules to our taste
60# 69#
61$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 71Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
72
73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
74
75# make sure c-lzf reinitialises itself
76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 78
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 81
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 83
69our %COMMAND = (); 84our %COMMAND = ();
70our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
73our %EXTCMD = (); 88our %EXTCMD = ();
74our %EXTICMD = (); 89our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
77 92
78our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
80 97
81our $CONFDIR = confdir; 98our $CONFDIR = confdir;
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
92our %RESOURCE; 112our %RESOURCE;
93 113
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 116our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
99 118
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 122our $DB_ENV;
105 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
106our %CFG; 126our %CFG;
107 127
108our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 129our $RUNTIME;
110our $NOW; 130our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 141our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
123 143
144our @POST_INIT;
145
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
148
124binmode STDOUT; 149binmode STDOUT;
125binmode STDERR; 150binmode STDERR;
126 151
127# read virtual server time, if available 152# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
132} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
133 160
134mkdir $_ 161mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 163
137our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
138 165
139sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 178
141############################################################################# 179#############################################################################
142 180
143=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
144 182
191returns directly I<after> the tick processing (and consequently, can only wake one process 229returns 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. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 231
194=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
195 233
196This array contains the results of the last C<invoke ()> call. When 234This 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 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 236that call.
199 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
200=back 244=back
201 245
202=cut 246=cut
203 247
204BEGIN { 248$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 249 my $msg = join "", @_;
207 250
208 $msg .= "\n" 251 $msg .= "\n"
209 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
210 253
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 255
213 LOG llevError, $msg; 256 LOG llevError, $msg;
214 }; 257};
215}
216 258
217$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
219 263
220 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 266 return;#d#
223 }#d# 267 }#d#
224 268
225 # kill coroutine otherwise 269 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 270 Coro::terminate
228}; 271};
229
230$SIG{__DIE__} = sub { }; #d#?
231 272
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 283for my $pkg (qw(
243 cf::global cf::attachable 284 cf::global cf::attachable
244 cf::object cf::object::player 285 cf::object cf::object::player
245 cf::client cf::player 286 cf::client cf::player
246 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
247 cf::map cf::party cf::region 289 cf::party cf::region
248)) { 290)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 292}
252 293
253$EV::DIED = sub { 294$EV::DIED = sub {
254 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
255}; 296};
256 297
257############################################################################# 298#############################################################################
258 299
259=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 338
298sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
300 341
342=item cf::post_init { BLOCK }
343
344Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again.
346
347The cdoeblock will have a single boolean argument to indicate whether this
348is a reload or not.
349
350=cut
351
352sub post_init(&) {
353 push @POST_INIT, shift;
354}
355
301=item cf::lock_wait $string 356=item cf::lock_wait $string
302 357
303Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
304 359
305=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
306 361
307Wait until the given lock is available and then acquires it and returns 362Wait 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, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
310returned. 365returned.
311 366
312Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 368deadlocked coro.
319 374
320Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
321 376
322=cut 377=cut
323 378
324our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 380
327sub lock_wait($) { 381sub lock_wait($) {
328 my ($key) = @_; 382 $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} 383}
341 384
342sub lock_acquire($) { 385sub lock_acquire($) {
343 my ($key) = @_; 386 $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} 387}
357 388
358sub lock_active($) { 389sub lock_active($) {
359 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
724 753
725############################################################################# 754#############################################################################
726 755
727=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
728 757
729Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
732 761
733In the following description, CLASS can be any of C<global>, C<object> 762In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 763C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
785 814
786Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
788 817
789Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
791 820
792These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
793 822
794=over 4 823=over 4
1085 1114
1086sub reattach { 1115sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1117 my ($obj) = @_;
1089 1118
1119 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1121
1092 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1093 1123
1094 @$registry = (); 1124 @$registry = ();
1095 1125
1141 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1144 1174
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1149 close $fh; 1182 aio_close $fh;
1150 1183
1151 if (@$objs) { 1184 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1186 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1157 close $fh; 1193 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1195 }
1160 } else { 1196 } else {
1161 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1162 } 1198 }
1163 1199
1164 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1204 } else {
1166 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1167 } 1206 }
1168 } else { 1207 } else {
1169 aio_unlink $filename; 1208 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1171 } 1210 }
1262 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1263 1302
1264 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1265} 1304}
1266 1305
1306use File::Glob ();
1307
1267cf::player->attach ( 1308cf::player->attach (
1268 on_command => sub { 1309 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1270 1311
1271 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1303 1344
1304 cf::override; 1345 cf::override;
1305 }, 1346 },
1306); 1347);
1307 1348
1349# "readahead" all extensions
1350sub cache_extensions {
1351 my $grp = IO::AIO::aio_group;
1352
1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1354 for (grep /\.ext$/, @{$_[0]}) {
1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1356 }
1357 };
1358
1359 $grp
1360}
1361
1308sub load_extensions { 1362sub load_extensions {
1309 cf::sync_job { 1363 cf::sync_job {
1310 my %todo; 1364 my %todo;
1311 1365
1312 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1331 1385
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1388
1335 $ext{source} = 1389 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1338 . $source 1392 . $source
1339 . "\n};\n1"; 1393 . "\n};\n1";
1340 1394
1341 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1381 1435
1382=back 1436=back
1383 1437
1384=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1385 1439
1386Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1387 1441
1388=cut 1442=cut
1389 1443
1390package cf::player; 1444package cf::player;
1391 1445
1434 1488
1435sub exists($) { 1489sub exists($) {
1436 my ($login) = @_; 1490 my ($login) = @_;
1437 1491
1438 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1440} 1494}
1441 1495
1442sub find($) { 1496sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1498 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1510 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1511 or return;
1458 1512
1459 my $pl = cf::player::load_pl $f 1513 my $pl = cf::player::load_pl $f
1460 or return; 1514 or return;
1515
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1516 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1517 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1518 $cf::PLAYER{$login} = $pl
1464 } 1519 }
1465 } 1520 }
1518 my ($pl) = @_; 1573 my ($pl) = @_;
1519 1574
1520 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1521 1576
1522 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1579
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1529 1586
1530 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1627
1571 for my $login (@$dirs) { 1628 for my $login (@$dirs) {
1572 my $path = path $login; 1629 my $path = path $login;
1573 1630
1574 # a .pst is a dead give-away for a valid player 1631 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1632 # if no pst file found, open and chekc for blocked users
1633 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1634 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1635 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1636 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1637 }
1580 1638
1611 } 1669 }
1612 1670
1613 \@paths 1671 \@paths
1614} 1672}
1615 1673
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1675
1618Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1677
1709=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1710 1679
1711Sends an ext reply to the player. 1680Sends an ext reply to the player.
1712 1681
1925 1894
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1928} 1897}
1929 1898
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1899sub decay_objects {
1940 my ($self) = @_; 1900 my ($self) = @_;
1941 1901
1942 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1943 1903
2025sub find { 1985sub find {
2026 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2027 1987
2028 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2029 1989
2030 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1992
2033 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2038 or return; 1995 or return;
2039 1996
2040 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2041 1998
2043 or return; 2000 or return;
2044 2001
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2048 undef $guard1; 2006 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2007 $map->reset;
2051 return find $path; 2008 return find $path;
2052 } 2009 }
2053 2010
2054 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2039 $f->skip_block;
2083 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2084 or return; 2041 or return;
2085 2042
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2087 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2088 2045
2089 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2047 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2067 $self->decay_objects;
2111 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2112 $self->update_buttons; 2069 $self->update_buttons;
2113 cf::cede_to_tick; 2070 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2071 $self->activate;
2117 } 2072 }
2118 2073
2119 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2286 2241
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2243
2289 return if $self->players; 2244 return if $self->players;
2290 2245
2291 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2292 2247
2293 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2294 2249
2295 # need to save uniques path 2250 # need to save uniques path
2296 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2387 : normalise $_ 2342 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2344 ]
2390} 2345}
2391 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2392=back 2379=back
2393 2380
2394=head3 cf::object 2381=head3 cf::object
2395 2382
2396=cut 2383=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2444can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2445dialogue with the given NPC character.
2459 2446
2460=cut 2447=cut
2461 2448
2449our $SAY_CHANNEL = {
2450 id => "say",
2451 title => "Map",
2452 reply => "say ",
2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2454};
2455
2456our $CHAT_CHANNEL = {
2457 id => "chat",
2458 title => "Chat",
2459 reply => "chat ",
2460 tooltip => "Player chat and shouts, global to the server.",
2461};
2462
2462# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2464# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2465#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2479 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2480
2480 } else { 2481 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2484 }
2484 } 2485 }
2485} 2486}
2486 2487
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2513
2513=item $player_object->enter_link 2514=item $player_object->enter_link
2514 2515
2515Freezes the player and moves him/her to a special map (C<{link}>). 2516Freezes the player and moves him/her to a special map (C<{link}>).
2516 2517
2517The player should be reasonably safe there for short amounts of time. You 2518The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2519for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link
2521map.
2519 2522
2520Will never block. 2523Will never block.
2521 2524
2522=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2523 2526
2575 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2577 2580
2578 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2581 2584
2582 $map->load; 2585 $map->load;
2583 $map->load_neighbours; 2586 $map->load_neighbours;
2584 2587
2585 return unless $self->contr->active; 2588 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2589
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2590} 2595}
2591 2596
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2598
2594Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2601that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2602the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2603be called at the end of this process.
2604
2605Note that $check will be called with a potentially non-loaded map, so if
2606it needs a loaded map it has to call C<< ->load >>.
2599 2607
2600=cut 2608=cut
2601 2609
2602our $GOTOGEN; 2610our $GOTOGEN;
2603 2611
2682} 2690}
2683 2691
2684sub prepare_random_map { 2692sub prepare_random_map {
2685 my ($exit) = @_; 2693 my ($exit) = @_;
2686 2694
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2697 # that depends on the exit object
2692 2698
2693 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2701 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2700 } 2708 }
2701 2709
2702 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2703 2711
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2718 undef $fh;
2711 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2712 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2715 } 2727 }
2716} 2728}
2717 2729
2718sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2720 2732
2721 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2722 2734
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2735 $self->enter_link;
2735 2736
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2737 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2742 2739
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2740 unless (eval {
2741 $self->deactivate_recursive; # just to be sure
2742
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2752 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp;
2754
2745 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2746 2756
2757 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y)
2759 if $exit->flag (cf::FLAG_DAMNED);
2760
2747 1; 2761 1
2748 }) { 2762 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2764 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2767
2754 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2784 2798
2785=cut 2799=cut
2786 2800
2787# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2789 "c/identify" => { 2809 "c/identify" => {
2790 id => "infobox", 2810 id => "infobox",
2791 title => "Identify", 2811 title => "Identify",
2792 reply => undef, 2812 reply => undef,
2793 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2795 "c/examine" => { 2815 "c/examine" => {
2796 id => "infobox", 2816 id => "infobox",
2797 title => "Examine", 2817 title => "Examine",
2798 reply => undef, 2818 reply => undef,
2799 tooltip => "Signs and other items you examined", 2819 tooltip => "Signs and other items you examined",
2820 },
2821 "c/shopinfo" => {
2822 id => "infobox",
2823 title => "Shop Info",
2824 reply => undef,
2825 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2826 },
2801 "c/book" => { 2827 "c/book" => {
2802 id => "infobox", 2828 id => "infobox",
2803 title => "Book", 2829 title => "Book",
2804 reply => undef, 2830 reply => undef,
2820 id => "infobox", 2846 id => "infobox",
2821 title => "Body Parts", 2847 title => "Body Parts",
2822 reply => undef, 2848 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2824 }, 2850 },
2851 "c/statistics" => {
2852 id => "infobox",
2853 title => "Statistics",
2854 reply => undef,
2855 tooltip => "Shows your primary statistics",
2856 },
2857 "c/skills" => {
2858 id => "infobox",
2859 title => "Skills",
2860 reply => undef,
2861 tooltip => "Shows your experience per skill and item power",
2862 },
2863 "c/shopitems" => {
2864 id => "infobox",
2865 title => "Shop Items",
2866 reply => undef,
2867 tooltip => "Shows the items currently for sale in this shop",
2868 },
2869 "c/resistances" => {
2870 id => "infobox",
2871 title => "Resistances",
2872 reply => undef,
2873 tooltip => "Shows your resistances",
2874 },
2875 "c/pets" => {
2876 id => "infobox",
2877 title => "Pets",
2878 reply => undef,
2879 tooltip => "Shows information abotu your pets/a specific pet",
2880 },
2881 "c/perceiveself" => {
2882 id => "infobox",
2883 title => "Perceive Self",
2884 reply => undef,
2885 tooltip => "You gained detailed knowledge about yourself",
2886 },
2825 "c/uptime" => { 2887 "c/uptime" => {
2826 id => "infobox", 2888 id => "infobox",
2827 title => "Uptime", 2889 title => "Uptime",
2828 reply => undef, 2890 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2894 id => "infobox",
2833 title => "Map Info", 2895 title => "Map Info",
2834 reply => undef, 2896 reply => undef,
2835 tooltip => "Information related to the maps", 2897 tooltip => "Information related to the maps",
2836 }, 2898 },
2899 "c/party" => {
2900 id => "party",
2901 title => "Party",
2902 reply => "gsay ",
2903 tooltip => "Messages and chat related to your party",
2904 },
2905 "c/death" => {
2906 id => "death",
2907 title => "Death",
2908 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death",
2910 },
2911 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL,
2837); 2913);
2838 2914
2839sub cf::client::send_msg { 2915sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2917
2842 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2843 2920
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2922
2846 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2849 2926
2850 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2854 2929
2855 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2935 }
2862 2936
2863 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2864 } 2938 }
2865 2939
2866 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2867 2941
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2942 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2872 2945
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2949 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2950
2887 $color &= cf::NDI_COLOR_MASK; 2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2888 2954
2889 utf8::encode $msg; 2955 # split very large packets
2890 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2958 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2959 }
2960
2961 $self->send_packet ($pkt);
2900} 2962}
2901 2963
2902=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2903 2965
2904Sends an ext event to the client. 2966Sends an ext event to the client.
3078 3140
3079The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3080 3142
3081 cf::object 3143 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3144 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3145 insert remove name archname title slaying race decrease split
3146 value
3084 3147
3085 cf::object::player 3148 cf::object::player
3086 player 3149 player
3087 3150
3088 cf::player 3151 cf::player
3093 3156
3094=cut 3157=cut
3095 3158
3096for ( 3159for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3160 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3103) { 3166) {
3104 no strict 'refs'; 3167 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3124 3187
3125 my $qcode = $code; 3188 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3128 3193
3129 local $_; 3194 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3131 3196
3132 my $eval = 3197 my $eval =
3313 $ns->fx_want ($k, $v); 3378 $ns->fx_want ($k, $v);
3314 } 3379 }
3315}; 3380};
3316 3381
3317sub load_resource_file($) { 3382sub load_resource_file($) {
3383 my $guard = lock_acquire "load_resource_file";
3384
3318 my $status = load_resource_file_ $_[0]; 3385 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3386 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3387 cf::arch::commit_load;
3388
3321 $status 3389 $status
3322} 3390}
3323 3391
3324sub reload_regions { 3392sub reload_regions {
3325 # HACK to clear player env face cache, we need some signal framework 3393 # HACK to clear player env face cache, we need some signal framework
3359 reload_treasures; 3427 reload_treasures;
3360 3428
3361 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3362} 3430}
3363 3431
3364sub init {
3365 my $guard = freeze_mainloop;
3366
3367 reload_resources;
3368}
3369
3370sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3436 or return;
3373 3437
3374 local $/; 3438 local $/;
3375 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3376 3440
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3378 3442
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3384 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3385 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3386 }; 3450 };
3387 warn $@ if $@; 3451 warn $@ if $@;
3388 } 3452 }
3453
3454 warn "finished reloading resource files\n";
3455}
3456
3457sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!";
3460 flock $fh, &Fcntl::LOCK_EX
3461 or die "$PIDFILE: flock: $!";
3462 $fh
3463}
3464
3465# make sure only one server instance is running at any one time
3466sub atomic {
3467 my $fh = pidfile;
3468
3469 my $pid = <$fh>;
3470 kill 9, $pid if $pid > 0;
3471
3472 seek $fh, 0, 0;
3473 print $fh $$;
3474}
3475
3476sub main_loop {
3477 warn "EV::loop starting\n";
3478 if (1) {
3479 EV::loop;
3480 }
3481 warn "EV::loop returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP;
3389} 3483}
3390 3484
3391sub main { 3485sub main {
3486 cf::init_globals; # initialise logging
3487
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499
3392 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3393 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3395 (async { 3503 (async {
3396 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3398 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3399 }; 3507 };
3400 3508
3401 { 3509 evthread_start IO::AIO::poll_fileno;
3402 my $guard = freeze_mainloop; 3510
3511 cf::sync_job {
3512 reload_resources;
3403 reload_config; 3513 reload_config;
3404 db_init; 3514 db_init;
3515
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid;
3519 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills;
3522
3523 cf::init_beforeplay;
3524
3525 atomic;
3526
3405 load_extensions; 3527 load_extensions;
3406 3528
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3529 utime time, time, $RUNTIMEFILE;
3408 evthread_start IO::AIO::poll_fileno; 3530
3531 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534
3535 (pop @POST_INIT)->(0) while @POST_INIT;
3409 } 3536 };
3410 3537
3411 EV::loop; 3538 main_loop;
3412} 3539}
3413 3540
3414############################################################################# 3541#############################################################################
3415# initialisation and cleanup 3542# initialisation and cleanup
3416 3543
3423 }; 3550 };
3424 } 3551 }
3425} 3552}
3426 3553
3427sub write_runtime_sync { 3554sub write_runtime_sync {
3428 my $runtime = "$LOCALDIR/runtime";
3429
3430 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3432 3557
3433 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3559
3435 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3436 3561
3437 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3438 or return; 3563 or return;
3439 3564
3440 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3452 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3453 3578
3454 close $fh 3579 close $fh
3455 or return; 3580 or return;
3456 3581
3457 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3583 and return;
3459 3584
3460 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3461 3586
3462 1 3587 1
3474 my $uuid = "$LOCALDIR/uuid"; 3599 my $uuid = "$LOCALDIR/uuid";
3475 3600
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3602 or return;
3478 3603
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3604 my $value = uuid_seq uuid_cur;
3605
3606 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n";
3608 return;
3609 }
3610
3611 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3612 $uuid_skip = 0;
3481 3613
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3615 and return;
3484 3616
3506} 3638}
3507 3639
3508sub emergency_save() { 3640sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3510 3642
3511 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3512 3644
3513 cf::sync_job { 3645 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650
3514 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3657 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3659 $pl->save;
3523 } 3660 }
3524 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3525 3662
3526 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3666 $map->valid or next;
3530 $map->save; 3667 $map->save;
3531 } 3668 }
3532 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3533 3670
3534 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3537 3674
3538 warn "begin write uuid\n"; 3675 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3676 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3677 warn "emergency_perl_save: end write uuid\n";
3541 }; 3678 };
3542 3679
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3543 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3544} 3686}
3545 3687
3546sub post_cleanup { 3688sub post_cleanup {
3547 my ($make_core) = @_; 3689 my ($make_core) = @_;
3548 3690
3549 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 3692 if $make_core;
3693
3694 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$;
3696}
3697
3698# a safer delete_package, copied from Symbol
3699sub clear_package($) {
3700 my $pkg = shift;
3701
3702 # expand to full symbol table name if needed
3703 unless ($pkg =~ /^main::.*::$/) {
3704 $pkg = "main$pkg" if $pkg =~ /^::/;
3705 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3706 $pkg .= '::' unless $pkg =~ /::$/;
3707 }
3708
3709 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3710 my $stem_symtab = *{$stem}{HASH};
3711
3712 defined $stem_symtab and exists $stem_symtab->{$leaf}
3713 or return;
3714
3715 # clear all symbols
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 }
3721 warn "cleared package $pkg\n";#d#
3551} 3722}
3552 3723
3553sub do_reload_perl() { 3724sub do_reload_perl() {
3554 # can/must only be called in main 3725 # can/must only be called in main
3555 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3556 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3557 return; 3728 return;
3558 } 3729 }
3559 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3560 warn "reloading..."; 3736 warn "reloading...";
3561 3737
3562 warn "entering sync_job"; 3738 warn "entering sync_job";
3563 3739
3564 cf::sync_job { 3740 cf::sync_job {
3565 cf::write_runtime_sync; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3566 cf::emergency_save; 3742 cf::emergency_save;
3567 cf::write_runtime_sync; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3568 3744
3569 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3571 3747
3572 # if anything goes wrong in here, we should simply crash as we already saved 3748 # if anything goes wrong in here, we should simply crash as we already saved
3573 3749
3574 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3575 for (;;) {
3576 BDB::flush;
3577 IO::AIO::flush;
3578 Coro::cede_notself;
3579 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3580 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3581 }
3582
3583 ++$RELOAD;
3584
3585 warn "cancelling all extension coros";
3586 $_->cancel for values %EXT_CORO;
3587 %EXT_CORO = ();
3588
3589 warn "removing commands";
3590 %COMMAND = ();
3591
3592 warn "removing ext/exti commands";
3593 %EXTCMD = ();
3594 %EXTICMD = ();
3595
3596 warn "unloading/nuking all extensions";
3597 for my $pkg (@EXTS) {
3598 warn "... unloading $pkg";
3599
3600 if (my $cb = $pkg->can ("unload")) {
3601 eval {
3602 $cb->($pkg);
3603 1
3604 } or warn "$pkg unloaded, but with errors: $@";
3605 } 3753 }
3606 3754
3607 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3608 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3609 } 3757 %EXT_CORO = ();
3610 3758
3611 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3612 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3613 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3614 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3615 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3616 delete $INC{$k};
3617 3769
3618 $k =~ s/\.pm$//;
3619 $k =~ s/\//::/g;
3620
3621 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3622 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3623 } 3779 }
3624 3780
3625 Symbol::delete_package $k; 3781 warn "unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784
3785 warn "... unloading $k";
3786 delete $INC{$k};
3787
3788 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g;
3790
3791 if (my $cb = $k->can ("unload_module")) {
3792 $cb->();
3793 }
3794
3795 clear_package $k;
3626 } 3796 }
3627 3797
3628 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3629 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3630 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3631 3801
3632 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3633 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3634 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3635 3805
3636 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3637 # and global variables created in xs 3807 # and global variables created in xs
3638 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3639 3809
3640 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3641 3811
3642 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3643 require cf; 3813 require cf;
3644 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3645 3815
3646 warn "loading config and database again"; 3816 warn "loading config and database again";
3647 cf::reload_config; 3817 cf::reload_config;
3648 3818
3649 warn "loading extensions"; 3819 warn "loading extensions";
3650 cf::load_extensions; 3820 cf::load_extensions;
3651 3821
3822 if ($REATTACH_ON_RELOAD) {
3652 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3653 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3654 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3655 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3656 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3657 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3658 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3659 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3660 3835
3661 1 3836 1
3662 } or do { 3837 } or do {
3663 warn $@; 3838 warn $@;
3664 cf::cleanup "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3665 }; 3840 };
3666 3841
3667 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3668}; 3848};
3669 3849
3670our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3671 3851
3672sub reload_perl() { 3852sub reload_perl() {
3673 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3674 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3675 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3677 do_reload_perl; 3860 do_reload_perl;
3678 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3862 };
3679 }; 3863 };
3680} 3864}
3681 3865
3682register_command "reload" => sub { 3866register_command "reload" => sub {
3683 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3754{ 3938{
3755 # configure BDB 3939 # configure BDB
3756 3940
3757 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3758 BDB::max_poll_reqs $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3759 $Coro::BDB::WATCHER->priority (1); 3943 $AnyEvent::BDB::WATCHER->priority (1);
3760 3944
3761 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3762 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3764 | BDB::LOG_AUTOREMOVE, 1); 3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3949 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3767 3952
3768 cf::sync_job { 3953 cf::sync_job {
3769 eval { 3954 eval {
3795{ 3980{
3796 # configure IO::AIO 3981 # configure IO::AIO
3797 3982
3798 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3799 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3800 $Coro::AIO::WATCHER->priority (1); 3985 undef $AnyEvent::AIO::WATCHER;
3801} 3986}
3802 3987
3803my $_log_backtrace; 3988my $_log_backtrace;
3804 3989
3805sub _log_backtrace { 3990sub _log_backtrace {
3808 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3809 3994
3810 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3811 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3812 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3813 async { 3999 async {
3814 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3815 4001
3816 my @bt = fork_call { 4002 my @bt = fork_call {
3817 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3828 } 4014 }
3829 4015
3830 @funcs 4016 @funcs
3831 }; 4017 };
3832 4018
3833 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3834 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3835 --$_log_backtrace; 4022 --$_log_backtrace;
3836 }; 4023 };
3837 } else { 4024 } else {
3838 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3839 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3840 } 4027 }
3841} 4028}
3842 4029
3843# load additional modules 4030# load additional modules
3844use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3845 4033
3846END { cf::emergency_save } 4034END { cf::emergency_save }
3847 4035
38481 40361
3849 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines