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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.494 by root, Mon Oct 26 05:18:00 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_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
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
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
2463 2448
2464our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2465 id => "say", 2450 id => "say",
2466 title => "Map", 2451 title => "Map",
2467 reply => "say ", 2452 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2454};
2470 2455
2471our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2472 id => "chat", 2457 id => "chat",
2473 title => "Chat", 2458 title => "Chat",
2528 2513
2529=item $player_object->enter_link 2514=item $player_object->enter_link
2530 2515
2531Freezes 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}>).
2532 2517
2533The 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.
2534I<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.
2535 2522
2536Will never block. 2523Will never block.
2537 2524
2538=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2539 2526
2591 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2593 2580
2594 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2597 2584
2598 $map->load; 2585 $map->load;
2599 $map->load_neighbours; 2586 $map->load_neighbours;
2600 2587
2601 return unless $self->contr->active; 2588 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2589
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $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;
2606} 2595}
2607 2596
2608=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2609 2598
2610Moves 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
2611her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2612that 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
2613the 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
2614be 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 >>.
2615 2607
2616=cut 2608=cut
2617 2609
2618our $GOTOGEN; 2610our $GOTOGEN;
2619 2611
2766 $self->contr->savebed ($map, $x, $y) 2758 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 2759 if $exit->flag (cf::FLAG_DAMNED);
2768 2760
2769 1 2761 1
2770 }) { 2762 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "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. "
2773 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2775 2767
2776 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2793sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2794 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2795 2787
2796 utf8::encode $text; 2788 utf8::encode $text;
2797 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2790}
2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2798} 2815}
2799 2816
2800=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2801 2818
2802Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2806 2823
2807=cut 2824=cut
2808 2825
2809# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2810our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2811 "c/identify" => { 2834 "c/identify" => {
2812 id => "infobox", 2835 id => "infobox",
2813 title => "Identify", 2836 title => "Identify",
2814 reply => undef, 2837 reply => undef,
2815 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2817 "c/examine" => { 2840 "c/examine" => {
2818 id => "infobox", 2841 id => "infobox",
2819 title => "Examine", 2842 title => "Examine",
2820 reply => undef, 2843 reply => undef,
2821 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2822 }, 2851 },
2823 "c/book" => { 2852 "c/book" => {
2824 id => "infobox", 2853 id => "infobox",
2825 title => "Book", 2854 title => "Book",
2826 reply => undef, 2855 reply => undef,
2842 id => "infobox", 2871 id => "infobox",
2843 title => "Body Parts", 2872 title => "Body Parts",
2844 reply => undef, 2873 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2846 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2882 "c/skills" => {
2883 id => "infobox",
2884 title => "Skills",
2885 reply => undef,
2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2911 },
2847 "c/uptime" => { 2912 "c/uptime" => {
2848 id => "infobox", 2913 id => "infobox",
2849 title => "Uptime", 2914 title => "Uptime",
2850 reply => undef, 2915 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2860 id => "party", 2925 id => "party",
2861 title => "Party", 2926 title => "Party",
2862 reply => "gsay ", 2927 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2864 }, 2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2865); 2938);
2866 2939
2867sub cf::client::send_msg { 2940sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2869 2942
2870 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2871 2945
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 2947
2874 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2877 2951
2878 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2882 2954
2883 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 2960 }
2890 2961
2891 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2892 } 2963 }
2893 2964
2894 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2895 2966
2896 if ($self->can_msg) {
2897 # default colour, mask it out 2967 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2900 2970
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 2974 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 2975
2915 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2916
2917 utf8::encode $msg;
2918
2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 }
2928} 2977}
2929 2978
2930=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2931 2980
2932Sends an ext event to the client. 2981Sends an ext event to the client.
2935 2984
2936sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2937 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2938 2987
2939 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2942 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 } 2993 }
2945} 2994}
2946 2995
2947=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2948 2997
2952 3001
2953sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2955 3004
2956 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove 3008 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 } 3011 }
2963} 3012}
2964 3013
2965=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2966 3015
3107The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3108 3157
3109 cf::object 3158 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3112 3162
3113 cf::object::player 3163 cf::object::player
3114 player 3164 player
3115 3165
3116 cf::player 3166 cf::player
3121 3171
3122=cut 3172=cut
3123 3173
3124for ( 3174for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3131) { 3181) {
3132 no strict 'refs'; 3182 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3151 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3152 3202
3153 my $qcode = $code; 3203 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3156 3208
3157 local $_; 3209 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3159 3211
3160 my $eval = 3212 my $eval =
3390 reload_treasures; 3442 reload_treasures;
3391 3443
3392 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3393} 3445}
3394 3446
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399}
3400
3401sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3403 or return; 3451 or return;
3404 3452
3405 local $/; 3453 local $/;
3406 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3407 3455
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3409 3457
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3416 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3417 }; 3465 };
3418 warn $@ if $@; 3466 warn $@ if $@;
3419 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3470}
3471
3472sub pidfile() {
3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3474 or die "$PIDFILE: $!";
3475 flock $fh, &Fcntl::LOCK_EX
3476 or die "$PIDFILE: flock: $!";
3477 $fh
3478}
3479
3480# make sure only one server instance is running at any one time
3481sub atomic {
3482 my $fh = pidfile;
3483
3484 my $pid = <$fh>;
3485 kill 9, $pid if $pid > 0;
3486
3487 seek $fh, 0, 0;
3488 print $fh $$;
3489}
3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3420} 3498}
3421 3499
3422sub main { 3500sub main {
3501 cf::init_globals; # initialise logging
3502
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514
3423 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3517 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3518 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3430 }; 3522 };
3431 3523
3432 { 3524 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3525
3526 cf::sync_job {
3527 reload_resources;
3434 reload_config; 3528 reload_config;
3435 db_init; 3529 db_init;
3530
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid;
3534 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills;
3537
3538 cf::init_beforeplay;
3539
3540 atomic;
3541
3436 load_extensions; 3542 load_extensions;
3437 3543
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3544 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3545
3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549
3550 (pop @POST_INIT)->(0) while @POST_INIT;
3440 } 3551 };
3441 3552
3442 EV::loop; 3553 main_loop;
3443} 3554}
3444 3555
3445############################################################################# 3556#############################################################################
3446# initialisation and cleanup 3557# initialisation and cleanup
3447 3558
3454 }; 3565 };
3455 } 3566 }
3456} 3567}
3457 3568
3458sub write_runtime_sync { 3569sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime";
3460
3461 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3463 3572
3464 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3574
3466 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3467 3576
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3469 or return; 3578 or return;
3470 3579
3471 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3483 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3484 3593
3485 close $fh 3594 close $fh
3486 or return; 3595 or return;
3487 3596
3488 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3598 and return;
3490 3599
3491 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3492 3601
3493 1 3602 1
3505 my $uuid = "$LOCALDIR/uuid"; 3614 my $uuid = "$LOCALDIR/uuid";
3506 3615
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3617 or return;
3509 3618
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3619 my $value = uuid_seq uuid_cur;
3620
3621 unless ($value) {
3622 warn "cowardly refusing to write zero uuid value!\n";
3623 return;
3624 }
3625
3626 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3627 $uuid_skip = 0;
3512 3628
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3630 and return;
3515 3631
3537} 3653}
3538 3654
3539sub emergency_save() { 3655sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3541 3657
3542 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3543 3659
3544 cf::sync_job { 3660 cf::sync_job {
3661 # this is a trade-off: we want to be very quick here, so
3662 # save all maps without fsync, and later call a global sync
3663 # (which in turn might be very very slow)
3664 local $USE_FSYNC = 0;
3665
3545 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3672 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3674 $pl->save;
3554 } 3675 }
3555 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3556 3677
3557 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3681 $map->valid or next;
3561 $map->save; 3682 $map->save;
3562 } 3683 }
3563 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3564 3685
3565 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3568 3689
3569 warn "begin write uuid\n"; 3690 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3691 write_uuid_sync 1;
3571 warn "end write uuid\n"; 3692 warn "emergency_perl_save: end write uuid\n";
3572 }; 3693 };
3573 3694
3695 warn "emergency_perl_save: starting sync()\n";
3696 IO::AIO::aio_sync sub {
3697 warn "emergency_perl_save: finished sync()\n";
3698 };
3699
3574 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3575} 3701}
3576 3702
3577sub post_cleanup { 3703sub post_cleanup {
3578 my ($make_core) = @_; 3704 my ($make_core) = @_;
3579 3705
3580 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 3707 if $make_core;
3708
3709 my $fh = pidfile;
3710 unlink $PIDFILE if <$fh> == $$;
3711}
3712
3713# a safer delete_package, copied from Symbol
3714sub clear_package($) {
3715 my $pkg = shift;
3716
3717 # expand to full symbol table name if needed
3718 unless ($pkg =~ /^main::.*::$/) {
3719 $pkg = "main$pkg" if $pkg =~ /^::/;
3720 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3721 $pkg .= '::' unless $pkg =~ /::$/;
3722 }
3723
3724 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3725 my $stem_symtab = *{$stem}{HASH};
3726
3727 defined $stem_symtab and exists $stem_symtab->{$leaf}
3728 or return;
3729
3730 # clear all symbols
3731 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3732 for my $name (keys %$leaf_symtab) {
3733 _gv_clear *{"$pkg$name"};
3734# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3735 }
3736 warn "cleared package $pkg\n";#d#
3582} 3737}
3583 3738
3584sub do_reload_perl() { 3739sub do_reload_perl() {
3585 # can/must only be called in main 3740 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3588 return; 3743 return;
3589 } 3744 }
3590 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3591 warn "reloading..."; 3751 warn "reloading...";
3592 3752
3593 warn "entering sync_job"; 3753 warn "entering sync_job";
3594 3754
3595 cf::sync_job { 3755 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 3757 cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3599 3759
3600 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3602 3762
3603 # if anything goes wrong in here, we should simply crash as we already saved 3763 # if anything goes wrong in here, we should simply crash as we already saved
3604 3764
3605 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3611 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = ();
3619
3620 warn "removing commands";
3621 %COMMAND = ();
3622
3623 warn "removing ext/exti commands";
3624 %EXTCMD = ();
3625 %EXTICMD = ();
3626
3627 warn "unloading/nuking all extensions";
3628 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg";
3630
3631 if (my $cb = $pkg->can ("unload")) {
3632 eval {
3633 $cb->($pkg);
3634 1
3635 } or warn "$pkg unloaded, but with errors: $@";
3636 } 3768 }
3637 3769
3638 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3639 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3640 } 3772 %EXT_CORO = ();
3641 3773
3642 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3643 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3646 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3647 delete $INC{$k};
3648 3784
3649 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g;
3651
3652 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3653 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3654 } 3794 }
3655 3795
3656 Symbol::delete_package $k; 3796 warn "unloading all perl modules loaded from $LIBDIR";
3797 while (my ($k, $v) = each %INC) {
3798 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3799
3800 warn "... unloading $k";
3801 delete $INC{$k};
3802
3803 $k =~ s/\.pm$//;
3804 $k =~ s/\//::/g;
3805
3806 if (my $cb = $k->can ("unload_module")) {
3807 $cb->();
3808 }
3809
3810 clear_package $k;
3657 } 3811 }
3658 3812
3659 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 3816
3663 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 3820
3667 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3668 # and global variables created in xs 3822 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3670 3824
3671 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3672 3826
3673 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3674 require cf; 3828 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3676 3830
3677 warn "loading config and database again"; 3831 warn "loading config and database again";
3678 cf::reload_config; 3832 cf::reload_config;
3679 3833
3680 warn "loading extensions"; 3834 warn "loading extensions";
3681 cf::load_extensions; 3835 cf::load_extensions;
3682 3836
3837 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3686 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3689 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3690 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3691 3850
3692 1 3851 1
3693 } or do { 3852 } or do {
3694 warn $@; 3853 warn $@;
3695 cf::cleanup "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3696 }; 3855 };
3697 3856
3698 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3699}; 3863};
3700 3864
3701our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3702 3866
3703sub reload_perl() { 3867sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3706 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 3875 do_reload_perl;
3709 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3877 };
3710 }; 3878 };
3711} 3879}
3712 3880
3713register_command "reload" => sub { 3881register_command "reload" => sub {
3714 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3785{ 3953{
3786 # configure BDB 3954 # configure BDB
3787 3955
3788 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3789 BDB::max_poll_reqs $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 3958 $AnyEvent::BDB::WATCHER->priority (1);
3791 3959
3792 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 3963 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3964 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 3967
3799 cf::sync_job { 3968 cf::sync_job {
3800 eval { 3969 eval {
3826{ 3995{
3827 # configure IO::AIO 3996 # configure IO::AIO
3828 3997
3829 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 4000 undef $AnyEvent::AIO::WATCHER;
3832} 4001}
3833 4002
3834my $_log_backtrace; 4003my $_log_backtrace;
3835 4004
3836sub _log_backtrace { 4005sub _log_backtrace {
3839 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3840 4009
3841 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3843 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3844 async { 4014 async {
3845 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3846 4016
3847 my @bt = fork_call { 4017 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3859 } 4029 }
3860 4030
3861 @funcs 4031 @funcs
3862 }; 4032 };
3863 4033
3864 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 4037 --$_log_backtrace;
3867 }; 4038 };
3868 } else { 4039 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3871 } 4042 }
3872} 4043}
3873 4044
3874# load additional modules 4045# load additional modules
3875use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3876 4048
3877END { cf::emergency_save } 4049END { cf::emergency_save }
3878 4050
38791 40511
3880 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines