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.427 by root, Sat Apr 26 12:25:45 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
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 aio_chmod $fh, SAVE_MODE; 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 aio_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 aio_chmod $fh, SAVE_MODE; 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 aio_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];
1519 my ($pl) = @_; 1573 my ($pl) = @_;
1520 1574
1521 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1522 1576
1523 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1524 $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
1525 1579
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1581 $pl->deactivate;
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1584 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1585 $pl->ns->destroy if $pl->ns;
1530 1586
1531 my $path = playerdir $pl; 1587 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1588 my $temp = "$path~$cf::RUNTIME~deleting~";
1613 } 1669 }
1614 1670
1615 \@paths 1671 \@paths
1616} 1672}
1617 1673
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1675
1620Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1677
1711=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1712 1679
1713Sends an ext reply to the player. 1680Sends an ext reply to the player.
1714 1681
1927 1894
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1930} 1897}
1931 1898
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1899sub decay_objects {
1942 my ($self) = @_; 1900 my ($self) = @_;
1943 1901
1944 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1945 1903
2027sub find { 1985sub find {
2028 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2029 1987
2030 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2031 1989
2032 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1992
2035 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2040 or return; 1995 or return;
2041 1996
2042 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2043 1998
2045 or return; 2000 or return;
2046 2001
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2002 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2003 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2004 #$cf::WAIT_FOR_TICK->wait;
2005 undef $guard2;
2050 undef $guard1; 2006 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2007 $map->reset;
2053 return find $path; 2008 return find $path;
2054 } 2009 }
2055 2010
2056 $cf::MAP{$path} = $map 2011 $cf::MAP{$path} = $map
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2039 $f->skip_block;
2085 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2086 or return; 2041 or return;
2087 2042
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2089 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2090 2045
2091 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2047 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2067 $self->decay_objects;
2113 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2114 $self->update_buttons; 2069 $self->update_buttons;
2115 cf::cede_to_tick; 2070 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2071 $self->activate;
2119 } 2072 }
2120 2073
2121 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2288 2241
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2243
2291 return if $self->players; 2244 return if $self->players;
2292 2245
2293 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2294 2247
2295 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2296 2249
2297 # need to save uniques path 2250 # need to save uniques path
2298 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2389 : normalise $_ 2342 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2344 ]
2392} 2345}
2393 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
2394=back 2379=back
2395 2380
2396=head3 cf::object 2381=head3 cf::object
2397 2382
2398=cut 2383=cut
2459can 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
2460dialogue with the given NPC character. 2445dialogue with the given NPC character.
2461 2446
2462=cut 2447=cut
2463 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
2464# rough implementation of a future "reply" method that works 2463# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2464# with dialog boxes.
2466#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
2467sub cf::object::player::reply($$$;$) { 2466sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2467 my ($self, $npc, $msg, $flags) = @_;
2479 my $dialog = $pl->{npc_dialog}; 2478 my $dialog = $pl->{npc_dialog};
2480 $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));
2481 2480
2482 } else { 2481 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2482 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2483 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2484 }
2486 } 2485 }
2487} 2486}
2488 2487
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2488=item $object->send_msg ($channel, $msg, $color, [extra...])
2514 2513
2515=item $player_object->enter_link 2514=item $player_object->enter_link
2516 2515
2517Freezes 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}>).
2518 2517
2519The 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.
2520I<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.
2521 2522
2522Will never block. 2523Will never block.
2523 2524
2524=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2525 2526
2577 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2579 2580
2580 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2583 2584
2584 $map->load; 2585 $map->load;
2585 $map->load_neighbours; 2586 $map->load_neighbours;
2586 2587
2587 return unless $self->contr->active; 2588 return unless $self->contr->active;
2588 $self->activate_recursive;
2589 2589
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $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;
2592} 2595}
2593 2596
2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2595 2598
2596Moves 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
2597her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2598that 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
2599the 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
2600be 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 >>.
2601 2607
2602=cut 2608=cut
2603 2609
2604our $GOTOGEN; 2610our $GOTOGEN;
2605 2611
2684} 2690}
2685 2691
2686sub prepare_random_map { 2692sub prepare_random_map {
2687 my ($exit) = @_; 2693 my ($exit) = @_;
2688 2694
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2695 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2696 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2697 # that depends on the exit object
2694 2698
2695 my $rmp = parse_random_map_params $exit->msg; 2699 my $rmp = parse_random_map_params $exit->msg;
2697 if ($exit->map) { 2701 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2702 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2703 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2704 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2705 $rmp->{origin_y} = $exit->y;
2706
2707 $exit->map->touch;
2702 } 2708 }
2703 2709
2704 $rmp->{random_seed} ||= $exit->random_seed; 2710 $rmp->{random_seed} ||= $exit->random_seed;
2705 2711
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2712 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2716 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2717 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2718 undef $fh;
2713 aio_rename "$meta~", $meta; 2719 aio_rename "$meta~", $meta;
2714 2720
2721 my $slaying = "?random/$md5";
2722
2723 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2724 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2725 $exit->msg (undef);
2726 }
2717 } 2727 }
2718} 2728}
2719 2729
2720sub cf::object::player::enter_exit { 2730sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2731 my ($self, $exit) = @_;
2722 2732
2723 return unless $self->type == cf::PLAYER; 2733 return unless $self->type == cf::PLAYER;
2724 2734
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2735 $self->enter_link;
2737 2736
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2737 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2738 $Coro::current->{desc} = "enter_exit";
2744 2739
2745 $self->deactivate_recursive; # just to be sure
2746 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
2747 $self->goto ($slaying, $hp, $sp); 2755 $self->goto ($map, $x, $y);
2748 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
2749 1; 2761 1
2750 }) { 2762 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "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. "
2753 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2755 2767
2756 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2786 2798
2787=cut 2799=cut
2788 2800
2789# non-persistent channels (usually the info channel) 2801# non-persistent channels (usually the info channel)
2790our %CHANNEL = ( 2802our %CHANNEL = (
2803 "c/motd" => {
2804 id => "infobox",
2805 title => "MOTD",
2806 reply => undef,
2807 tooltip => "The message of the day",
2808 },
2791 "c/identify" => { 2809 "c/identify" => {
2792 id => "infobox", 2810 id => "infobox",
2793 title => "Identify", 2811 title => "Identify",
2794 reply => undef, 2812 reply => undef,
2795 tooltip => "Items recently identified", 2813 tooltip => "Items recently identified",
2797 "c/examine" => { 2815 "c/examine" => {
2798 id => "infobox", 2816 id => "infobox",
2799 title => "Examine", 2817 title => "Examine",
2800 reply => undef, 2818 reply => undef,
2801 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",
2802 }, 2826 },
2803 "c/book" => { 2827 "c/book" => {
2804 id => "infobox", 2828 id => "infobox",
2805 title => "Book", 2829 title => "Book",
2806 reply => undef, 2830 reply => undef,
2822 id => "infobox", 2846 id => "infobox",
2823 title => "Body Parts", 2847 title => "Body Parts",
2824 reply => undef, 2848 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 2849 tooltip => "Shows which body parts you posess and are available",
2826 }, 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 },
2827 "c/uptime" => { 2887 "c/uptime" => {
2828 id => "infobox", 2888 id => "infobox",
2829 title => "Uptime", 2889 title => "Uptime",
2830 reply => undef, 2890 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 2891 tooltip => "How long the server has been running since last restart",
2840 id => "party", 2900 id => "party",
2841 title => "Party", 2901 title => "Party",
2842 reply => "gsay ", 2902 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party", 2903 tooltip => "Messages and chat related to your party",
2844 }, 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,
2845); 2913);
2846 2914
2847sub cf::client::send_msg { 2915sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 2916 my ($self, $channel, $msg, $color, @extra) = @_;
2849 2917
2850 $msg = $self->pl->expand_cfpod ($msg); 2918 $msg = $self->pl->expand_cfpod ($msg)
2919 unless $color & cf::NDI_VERBATIM;
2851 2920
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 2921 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 2922
2854 # check predefined channels, for the benefit of C 2923 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 2924 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel}; 2925 $channel = $CHANNEL{$channel};
2857 2926
2858 $self->ext_msg (channel_info => $channel) 2927 $self->ext_msg (channel_info => $channel);
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id}; 2928 $channel = $channel->{id};
2862 2929
2863 } elsif (ref $channel) { 2930 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent 2931 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) { 2932 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel; 2933 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel) 2934 $self->ext_msg (channel_info => $channel);
2868 if $self->can_msg;
2869 } 2935 }
2870 2936
2871 $channel = $channel->{id}; 2937 $channel = $channel->{id};
2872 } 2938 }
2873 2939
2874 return unless @extra || length $msg; 2940 return unless @extra || length $msg;
2875 2941
2876 if ($self->can_msg) {
2877 # default colour, mask it out 2942 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2943 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 2944 if $color & cf::NDI_DEF;
2880 2945
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2946 my $pkt = "msg "
2947 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2883 } else { 2949 );
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894 2950
2895 $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};
2896 2954
2897 utf8::encode $msg; 2955 # split very large packets
2898 2956 if (8192 < length $pkt and $self->{can_lzf}) {
2899 if (0 && $msg =~ /\[/) { 2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2900 # COMMAND/INFO 2958 $pkt = "frag";
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 } 2959 }
2960
2961 $self->send_packet ($pkt);
2908} 2962}
2909 2963
2910=item $client->ext_msg ($type, @msg) 2964=item $client->ext_msg ($type, @msg)
2911 2965
2912Sends an ext event to the client. 2966Sends an ext event to the client.
3087The following functions and methods are available within a safe environment: 3141The following functions and methods are available within a safe environment:
3088 3142
3089 cf::object 3143 cf::object
3090 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
3091 insert remove name archname title slaying race decrease split 3145 insert remove name archname title slaying race decrease split
3146 value
3092 3147
3093 cf::object::player 3148 cf::object::player
3094 player 3149 player
3095 3150
3096 cf::player 3151 cf::player
3101 3156
3102=cut 3157=cut
3103 3158
3104for ( 3159for (
3105 ["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
3106 insert remove inv name archname title slaying race 3161 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3162 decrease split destroy change_exp value msg lore send_msg)],
3108 ["cf::object::player" => qw(player)], 3163 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3164 ["cf::player" => qw(peaceful send_msg)],
3110 ["cf::map" => qw(trigger)], 3165 ["cf::map" => qw(trigger)],
3111) { 3166) {
3112 no strict 'refs'; 3167 no strict 'refs';
3113 my ($pkg, @funs) = @$_; 3168 my ($pkg, @funs) = @$_;
3114 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131 my ($code, %vars) = @_; 3186 my ($code, %vars) = @_;
3132 3187
3133 my $qcode = $code; 3188 my $qcode = $code;
3134 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3135 $qcode =~ s/\n/\\n/g; 3190 $qcode =~ s/\n/\\n/g;
3191
3192 %vars = (_dummy => 0) unless %vars;
3136 3193
3137 local $_; 3194 local $_;
3138 local @safe::cf::_safe_eval_args = values %vars; 3195 local @safe::cf::_safe_eval_args = values %vars;
3139 3196
3140 my $eval = 3197 my $eval =
3370 reload_treasures; 3427 reload_treasures;
3371 3428
3372 warn "finished reloading resource files\n"; 3429 warn "finished reloading resource files\n";
3373} 3430}
3374 3431
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379}
3380
3381sub reload_config { 3432sub reload_config {
3433 warn "reloading config file...\n";
3434
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3435 open my $fh, "<:utf8", "$CONFDIR/config"
3383 or return; 3436 or return;
3384 3437
3385 local $/; 3438 local $/;
3386 *CFG = YAML::Load <$fh>; 3439 *CFG = YAML::XS::Load scalar <$fh>;
3387 3440
3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3389 3442
3390 $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};
3391 $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};
3395 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3396 and die "WARNING: m(un)lockall failed: $!\n"; 3449 and die "WARNING: m(un)lockall failed: $!\n";
3397 }; 3450 };
3398 warn $@ if $@; 3451 warn $@ if $@;
3399 } 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;
3400} 3483}
3401 3484
3402sub 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
3403 # we must not ever block the main coroutine 3500 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3501 local $Coro::idle = sub {
3405 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#
3406 (async { 3503 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3504 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3505 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3506 })->prio (Coro::PRIO_MAX);
3410 }; 3507 };
3411 3508
3412 { 3509 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3510
3511 cf::sync_job {
3512 reload_resources;
3414 reload_config; 3513 reload_config;
3415 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
3416 load_extensions; 3527 load_extensions;
3417 3528
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3529 utime time, time, $RUNTIMEFILE;
3419 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;
3420 } 3536 };
3421 3537
3422 EV::loop; 3538 main_loop;
3423} 3539}
3424 3540
3425############################################################################# 3541#############################################################################
3426# initialisation and cleanup 3542# initialisation and cleanup
3427 3543
3434 }; 3550 };
3435 } 3551 }
3436} 3552}
3437 3553
3438sub write_runtime_sync { 3554sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime";
3440
3441 # first touch the runtime file to show we are still running: 3555 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3556 # the fsync below can take a very very long time.
3443 3557
3444 IO::AIO::aio_utime $runtime, undef, undef; 3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3559
3446 my $guard = cf::lock_acquire "write_runtime"; 3560 my $guard = cf::lock_acquire "write_runtime";
3447 3561
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3449 or return; 3563 or return;
3450 3564
3451 my $value = $cf::RUNTIME + 90 + 10; 3565 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3566 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3567 # 60 allows for the watchdog to kill the server.
3463 aio_utime $fh, undef, undef; 3577 aio_utime $fh, undef, undef;
3464 3578
3465 close $fh 3579 close $fh
3466 or return; 3580 or return;
3467 3581
3468 aio_rename "$runtime~", $runtime 3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3583 and return;
3470 3584
3471 warn "runtime file written.\n"; 3585 warn "runtime file written.\n";
3472 3586
3473 1 3587 1
3485 my $uuid = "$LOCALDIR/uuid"; 3599 my $uuid = "$LOCALDIR/uuid";
3486 3600
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3601 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3602 or return;
3489 3603
3490 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;
3491 $uuid_skip = 0; 3612 $uuid_skip = 0;
3492 3613
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3614 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3615 and return;
3495 3616
3517} 3638}
3518 3639
3519sub emergency_save() { 3640sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3641 my $freeze_guard = cf::freeze_mainloop;
3521 3642
3522 warn "enter emergency perl save\n"; 3643 warn "emergency_perl_save: enter\n";
3523 3644
3524 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
3525 # use a peculiar iteration method to avoid tripping on perl 3651 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3652 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3653 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3654 warn "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3655 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3656 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3657 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3659 $pl->save;
3534 } 3660 }
3535 warn "end emergency player save\n"; 3661 warn "emergency_perl_save: end player save\n";
3536 3662
3537 warn "begin emergency map save\n"; 3663 warn "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3664 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3665 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3666 $map->valid or next;
3541 $map->save; 3667 $map->save;
3542 } 3668 }
3543 warn "end emergency map save\n"; 3669 warn "emergency_perl_save: end map save\n";
3544 3670
3545 warn "begin emergency database checkpoint\n"; 3671 warn "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3672 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3673 warn "emergency_perl_save: end database checkpoint\n";
3548 3674
3549 warn "begin write uuid\n"; 3675 warn "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3676 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3677 warn "emergency_perl_save: end write uuid\n";
3552 }; 3678 };
3553 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
3554 warn "leave emergency perl save\n"; 3685 warn "emergency_perl_save: leave\n";
3555} 3686}
3556 3687
3557sub post_cleanup { 3688sub post_cleanup {
3558 my ($make_core) = @_; 3689 my ($make_core) = @_;
3559 3690
3560 warn Carp::longmess "post_cleanup backtrace" 3691 warn Carp::longmess "post_cleanup backtrace"
3561 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#
3562} 3722}
3563 3723
3564sub do_reload_perl() { 3724sub do_reload_perl() {
3565 # can/must only be called in main 3725 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3726 if ($Coro::current != $Coro::main) {
3567 warn "can only reload from main coroutine"; 3727 warn "can only reload from main coroutine";
3568 return; 3728 return;
3569 } 3729 }
3570 3730
3731 return if $RELOAD++;
3732
3733 my $t1 = EV::time;
3734
3735 while ($RELOAD) {
3571 warn "reloading..."; 3736 warn "reloading...";
3572 3737
3573 warn "entering sync_job"; 3738 warn "entering sync_job";
3574 3739
3575 cf::sync_job { 3740 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3742 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3743 cf::write_runtime_sync; # external watchdog should not bark
3579 3744
3580 warn "syncing database to disk"; 3745 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3746 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3747
3583 # 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
3584 3749
3585 warn "flushing outstanding aio requests"; 3750 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3751 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3753 }
3617 3754
3618 warn "... nuking $pkg"; 3755 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3756 $_->cancel for values %EXT_CORO;
3620 } 3757 %EXT_CORO = ();
3621 3758
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3759 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3760 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3761
3762 warn "removing ext/exti commands";
3763 %EXTCMD = ();
3764 %EXTICMD = ();
3765
3766 warn "unloading/nuking all extensions";
3767 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3768 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3769
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3770 if (my $cb = $pkg->can ("unload")) {
3771 eval {
3633 $cb->(); 3772 $cb->($pkg);
3773 1
3774 } or warn "$pkg unloaded, but with errors: $@";
3775 }
3776
3777 warn "... clearing $pkg";
3778 clear_package $pkg;
3634 } 3779 }
3635 3780
3636 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;
3637 } 3796 }
3638 3797
3639 warn "getting rid of safe::, as good as possible"; 3798 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3799 clear_package "safe::$_"
3641 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);
3642 3801
3643 warn "unloading cf.pm \"a bit\""; 3802 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3803 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3646 3805
3647 # don't, removes xs symbols, too, 3806 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3807 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3808 #clear_package __PACKAGE__;
3650 3809
3651 warn "unload completed, starting to reload now"; 3810 warn "unload completed, starting to reload now";
3652 3811
3653 warn "reloading cf.pm"; 3812 warn "reloading cf.pm";
3654 require cf; 3813 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3814 cf::_connect_to_perl_1;
3656 3815
3657 warn "loading config and database again"; 3816 warn "loading config and database again";
3658 cf::reload_config; 3817 cf::reload_config;
3659 3818
3660 warn "loading extensions"; 3819 warn "loading extensions";
3661 cf::load_extensions; 3820 cf::load_extensions;
3662 3821
3822 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 3823 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3824 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3825 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3826 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3827 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3828 reattach $_ for values %PLAYER;
3829 }
3669 3830
3831 warn "running post_init jobs";
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833
3670 warn "leaving sync_job"; 3834 warn "leaving sync_job";
3671 3835
3672 1 3836 1
3673 } or do { 3837 } or do {
3674 warn $@; 3838 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3839 cf::cleanup "error while reloading, exiting.";
3676 }; 3840 };
3677 3841
3678 warn "reloaded"; 3842 warn "reloaded";
3843 --$RELOAD;
3844 }
3845
3846 $t1 = EV::time - $t1;
3847 warn "reload completed in ${t1}s\n";
3679}; 3848};
3680 3849
3681our $RELOAD_WATCHER; # used only during reload 3850our $RELOAD_WATCHER; # used only during reload
3682 3851
3683sub reload_perl() { 3852sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 3853 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 3854 # coro crashes during coro_state_free->destroy here.
3686 3855
3856 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions;
3858
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 3860 do_reload_perl;
3689 undef $RELOAD_WATCHER; 3861 undef $RELOAD_WATCHER;
3862 };
3690 }; 3863 };
3691} 3864}
3692 3865
3693register_command "reload" => sub { 3866register_command "reload" => sub {
3694 my ($who, $arg) = @_; 3867 my ($who, $arg) = @_;
3765{ 3938{
3766 # configure BDB 3939 # configure BDB
3767 3940
3768 BDB::min_parallel 8; 3941 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3942 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3943 $AnyEvent::BDB::WATCHER->priority (1);
3771 3944
3772 unless ($DB_ENV) { 3945 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3946 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | 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;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3951 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3952
3779 cf::sync_job { 3953 cf::sync_job {
3780 eval { 3954 eval {
3806{ 3980{
3807 # configure IO::AIO 3981 # configure IO::AIO
3808 3982
3809 IO::AIO::min_parallel 8; 3983 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3984 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3985 undef $AnyEvent::AIO::WATCHER;
3812} 3986}
3813 3987
3814my $_log_backtrace; 3988my $_log_backtrace;
3815 3989
3816sub _log_backtrace { 3990sub _log_backtrace {
3819 $msg =~ s/\n//; 3993 $msg =~ s/\n//;
3820 3994
3821 # limit the # of concurrent backtraces 3995 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 3996 if ($_log_backtrace < 2) {
3823 ++$_log_backtrace; 3997 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg;
3824 async { 3999 async {
3825 $Coro::current->{desc} = "abt $msg"; 4000 $Coro::current->{desc} = "abt $msg";
3826 4001
3827 my @bt = fork_call { 4002 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 4003 @addr = map { sprintf "%x", $_ } @addr;
3839 } 4014 }
3840 4015
3841 @funcs 4016 @funcs
3842 }; 4017 };
3843 4018
3844 LOG llevInfo, "[ABT] $msg\n"; 4019 LOG llevInfo, "[ABT] $perl_bt\n";
4020 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 4021 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 4022 --$_log_backtrace;
3847 }; 4023 };
3848 } else { 4024 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 4025 LOG llevInfo, "[ABT] $msg\n";
3850 LOG llevInfo, "[ABT] [suppressed]\n"; 4026 LOG llevInfo, "[ABT] [suppressed]\n";
3851 } 4027 }
3852} 4028}
3853 4029
3854# load additional modules 4030# load additional modules
3855use cf::pod; 4031require "cf/$_.pm" for @EXTRA_MODULES;
4032cf::_connect_to_perl_2;
3856 4033
3857END { cf::emergency_save } 4034END { cf::emergency_save }
3858 4035
38591 40361
3860 4037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines