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.432 by root, Mon May 5 22:38:47 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;
1528 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1529 $pl->ob->check_score; 1583 $pl->ob->check_score;
1615 } 1669 }
1616 1670
1617 \@paths 1671 \@paths
1618} 1672}
1619 1673
1620=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1621 1675
1622Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1623
1624=cut
1625
1626use re 'eval';
1627
1628my $group;
1629my $interior; $interior = qr{
1630 # match a pod interior sequence sans C<< >>
1631 (?:
1632 \ (.*?)\ (?{ $group = $^N })
1633 | < (??{$interior}) >
1634 )
1635}x;
1636
1637sub expand_cfpod {
1638 my ($self, $pod) = @_;
1639
1640 my $xml;
1641
1642 while () {
1643 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1644 $group = $1;
1645
1646 $group =~ s/&/&amp;/g;
1647 $group =~ s/</&lt;/g;
1648
1649 $xml .= $group;
1650 } elsif ($pod =~ m%\G
1651 ([BCGHITU])
1652 <
1653 (?:
1654 ([^<>]*) (?{ $group = $^N })
1655 | < $interior >
1656 )
1657 >
1658 %gcsx
1659 ) {
1660 my ($code, $data) = ($1, $group);
1661
1662 if ($code eq "B") {
1663 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1664 } elsif ($code eq "I") {
1665 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1666 } elsif ($code eq "U") {
1667 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1668 } elsif ($code eq "C") {
1669 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1670 } elsif ($code eq "T") {
1671 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1672 } elsif ($code eq "G") {
1673 my ($male, $female) = split /\|/, $data;
1674 $data = $self->gender ? $female : $male;
1675 $xml .= expand_cfpod ($self, $data);
1676 } elsif ($code eq "H") {
1677 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1678 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1679 "")
1680 [$self->{hintmode}];
1681 } else {
1682 $xml .= "error processing '$code($data)' directive";
1683 }
1684 } else {
1685 if ($pod =~ /\G(.+)/) {
1686 warn "parse error while expanding $pod (at $1)";
1687 }
1688 last;
1689 }
1690 }
1691
1692 for ($xml) {
1693 # create single paragraphs (very hackish)
1694 s/(?<=\S)\n(?=\w)/ /g;
1695
1696 # compress some whitespace
1697 s/\s+\n/\n/g; # ws line-ends
1698 s/\n\n+/\n/g; # double lines
1699 s/^\n+//; # beginning lines
1700 s/\n+$//; # ending lines
1701 }
1702
1703 $xml
1704}
1705
1706no re 'eval';
1707
1708sub hintmode {
1709 $_[0]{hintmode} = $_[1] if @_ > 1;
1710 $_[0]{hintmode}
1711}
1712 1677
1713=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1714 1679
1715Sends an ext reply to the player. 1680Sends an ext reply to the player.
1716 1681
1929 1894
1930 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1931 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1932} 1897}
1933 1898
1934# and all this just because we cannot iterate over
1935# all maps in C++...
1936sub change_all_map_light {
1937 my ($change) = @_;
1938
1939 $_->change_map_light ($change)
1940 for grep $_->outdoor, values %cf::MAP;
1941}
1942
1943sub decay_objects { 1899sub decay_objects {
1944 my ($self) = @_; 1900 my ($self) = @_;
1945 1901
1946 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1947 1903
2029sub find { 1985sub find {
2030 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2031 1987
2032 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2033 1989
2034 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2035 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2036 1992
2037 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2038 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2039 my $guard2 = cf::lock_acquire "map_find:$path";
2040
2041 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2042 or return; 1995 or return;
2043 1996
2044 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2045 1998
2085 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2086 $f->skip_block; 2039 $f->skip_block;
2087 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2088 or return; 2041 or return;
2089 2042
2090 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2091 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2092 2045
2093 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2094 utf8::encode $uniq; 2047 utf8::encode $uniq;
2095 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2113 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2114 $self->decay_objects; 2067 $self->decay_objects;
2115 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2116 $self->update_buttons; 2069 $self->update_buttons;
2117 cf::cede_to_tick; 2070 cf::cede_to_tick;
2118 $self->set_darkness_map;
2119 cf::cede_to_tick;
2120 $self->activate; 2071 $self->activate;
2121 } 2072 }
2122 2073
2123 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2124 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2290 2241
2291 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2292 2243
2293 return if $self->players; 2244 return if $self->players;
2294 2245
2295 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2296 2247
2297 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2298 2249
2299 # need to save uniques path 2250 # need to save uniques path
2300 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2391 : normalise $_ 2342 : normalise $_
2392 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2393 ] 2344 ]
2394} 2345}
2395 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
2396=back 2379=back
2397 2380
2398=head3 cf::object 2381=head3 cf::object
2399 2382
2400=cut 2383=cut
2465 2448
2466our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2467 id => "say", 2450 id => "say",
2468 title => "Map", 2451 title => "Map",
2469 reply => "say ", 2452 reply => "say ",
2470 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.",
2471}; 2454};
2472 2455
2473our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2474 id => "chat", 2457 id => "chat",
2475 title => "Chat", 2458 title => "Chat",
2530 2513
2531=item $player_object->enter_link 2514=item $player_object->enter_link
2532 2515
2533Freezes 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}>).
2534 2517
2535The 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.
2536I<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.
2537 2522
2538Will never block. 2523Will never block.
2539 2524
2540=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2541 2526
2593 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2594 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2595 2580
2596 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2597 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2598 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2599 2584
2600 $map->load; 2585 $map->load;
2601 $map->load_neighbours; 2586 $map->load_neighbours;
2602 2587
2603 return unless $self->contr->active; 2588 return unless $self->contr->active;
2604 $self->activate_recursive;
2605 2589
2606 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2607 $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;
2608} 2595}
2609 2596
2610=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2611 2598
2612Moves 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
2613her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2614that 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
2615the 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
2616be 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 >>.
2617 2607
2618=cut 2608=cut
2619 2609
2620our $GOTOGEN; 2610our $GOTOGEN;
2621 2611
2768 $self->contr->savebed ($map, $x, $y) 2758 $self->contr->savebed ($map, $x, $y)
2769 if $exit->flag (cf::FLAG_DAMNED); 2759 if $exit->flag (cf::FLAG_DAMNED);
2770 2760
2771 1 2761 1
2772 }) { 2762 }) {
2773 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2774 . "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. "
2775 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2776 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2777 2767
2778 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2795sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2796 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2797 2787
2798 utf8::encode $text; 2788 utf8::encode $text;
2799 $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);
2800} 2815}
2801 2816
2802=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2803 2818
2804Send 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
2808 2823
2809=cut 2824=cut
2810 2825
2811# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2812our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2813 "c/identify" => { 2834 "c/identify" => {
2814 id => "infobox", 2835 id => "infobox",
2815 title => "Identify", 2836 title => "Identify",
2816 reply => undef, 2837 reply => undef,
2817 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2819 "c/examine" => { 2840 "c/examine" => {
2820 id => "infobox", 2841 id => "infobox",
2821 title => "Examine", 2842 title => "Examine",
2822 reply => undef, 2843 reply => undef,
2823 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",
2824 }, 2851 },
2825 "c/book" => { 2852 "c/book" => {
2826 id => "infobox", 2853 id => "infobox",
2827 title => "Book", 2854 title => "Book",
2828 reply => undef, 2855 reply => undef,
2844 id => "infobox", 2871 id => "infobox",
2845 title => "Body Parts", 2872 title => "Body Parts",
2846 reply => undef, 2873 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2848 }, 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 },
2849 "c/uptime" => { 2912 "c/uptime" => {
2850 id => "infobox", 2913 id => "infobox",
2851 title => "Uptime", 2914 title => "Uptime",
2852 reply => undef, 2915 reply => undef,
2853 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2862 id => "party", 2925 id => "party",
2863 title => "Party", 2926 title => "Party",
2864 reply => "gsay ", 2927 reply => "gsay ",
2865 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2866 }, 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,
2867); 2938);
2868 2939
2869sub cf::client::send_msg { 2940sub cf::client::send_msg {
2870 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2871 2942
2872 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2873 2945
2874 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2875 2947
2876 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2877 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2878 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2879 2951
2880 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2881 if $self->can_msg;
2882
2883 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2884 2954
2885 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2886 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2887 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2888 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2889 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891 } 2960 }
2892 2961
2893 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2894 } 2963 }
2895 2964
2896 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2897 2966
2898 if ($self->can_msg) {
2899 # default colour, mask it out 2967 # default colour, mask it out
2900 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2901 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2902 2970
2903 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2904 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2905 } else { 2974 );
2906 if ($color >= 0) {
2907 # replace some tags by gcfclient-compatible ones
2908 for ($msg) {
2909 1 while
2910 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2911 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2912 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2913 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2914 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2915 }
2916 2975
2917 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2918
2919 utf8::encode $msg;
2920
2921 if (0 && $msg =~ /\[/) {
2922 # COMMAND/INFO
2923 $self->send_packet ("drawextinfo $color 10 8 $msg")
2924 } else {
2925 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2926 $self->send_packet ("drawinfo $color $msg")
2927 }
2928 }
2929 }
2930} 2977}
2931 2978
2932=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2933 2980
2934Sends an ext event to the client. 2981Sends an ext event to the client.
2937 2984
2938sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2939 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2940 2987
2941 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2943 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2944 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2946 } 2993 }
2947} 2994}
2948 2995
2949=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2950 2997
2954 3001
2955sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2956 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2957 3004
2958 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2959 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2960 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2961 #TODO: version 1, remove 3008 #TODO: version 1, remove
2962 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2963 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2964 } 3011 }
2965} 3012}
2966 3013
2967=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2968 3015
3109The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3110 3157
3111 cf::object 3158 cf::object
3112 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
3113 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3114 3162
3115 cf::object::player 3163 cf::object::player
3116 player 3164 player
3117 3165
3118 cf::player 3166 cf::player
3124=cut 3172=cut
3125 3173
3126for ( 3174for (
3127 ["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
3128 insert remove inv nrof name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3129 decrease split destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3130 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3131 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3132 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3133) { 3181) {
3134 no strict 'refs'; 3182 no strict 'refs';
3135 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3153 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3154 3202
3155 my $qcode = $code; 3203 my $qcode = $code;
3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3157 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3158 3208
3159 local $_; 3209 local $_;
3160 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3161 3211
3162 my $eval = 3212 my $eval =
3392 reload_treasures; 3442 reload_treasures;
3393 3443
3394 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3395} 3445}
3396 3446
3397sub init {
3398 my $guard = freeze_mainloop;
3399
3400 reload_resources;
3401}
3402
3403sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3404 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3405 or return; 3451 or return;
3406 3452
3407 local $/; 3453 local $/;
3408 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3409 3455
3410 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3411 3457
3412 $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};
3413 $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};
3417 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3418 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3419 }; 3465 };
3420 warn $@ if $@; 3466 warn $@ if $@;
3421 } 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;
3422} 3498}
3423 3499
3424sub 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
3425 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3426 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3427 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#
3428 (async { 3518 (async {
3429 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3430 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3431 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3432 }; 3522 };
3433 3523
3434 { 3524 evthread_start IO::AIO::poll_fileno;
3435 my $guard = freeze_mainloop; 3525
3526 cf::sync_job {
3527 reload_resources;
3436 reload_config; 3528 reload_config;
3437 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
3438 load_extensions; 3542 load_extensions;
3439 3543
3440 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3544 utime time, time, $RUNTIMEFILE;
3441 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;
3442 } 3551 };
3443 3552
3444 EV::loop; 3553 main_loop;
3445} 3554}
3446 3555
3447############################################################################# 3556#############################################################################
3448# initialisation and cleanup 3557# initialisation and cleanup
3449 3558
3456 }; 3565 };
3457 } 3566 }
3458} 3567}
3459 3568
3460sub write_runtime_sync { 3569sub write_runtime_sync {
3461 my $runtime = "$LOCALDIR/runtime";
3462
3463 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3465 3572
3466 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3574
3468 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3469 3576
3470 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3471 or return; 3578 or return;
3472 3579
3473 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3485 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3486 3593
3487 close $fh 3594 close $fh
3488 or return; 3595 or return;
3489 3596
3490 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3598 and return;
3492 3599
3493 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3494 3601
3495 1 3602 1
3507 my $uuid = "$LOCALDIR/uuid"; 3614 my $uuid = "$LOCALDIR/uuid";
3508 3615
3509 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3510 or return; 3617 or return;
3511 3618
3512 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;
3513 $uuid_skip = 0; 3627 $uuid_skip = 0;
3514 3628
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return; 3630 and return;
3517 3631
3539} 3653}
3540 3654
3541sub emergency_save() { 3655sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3543 3657
3544 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3545 3659
3546 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
3547 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3548 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3549 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3550 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3551 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3552 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3553 $pl->valid or next; 3672 $pl->valid or next;
3554 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3555 $pl->save; 3674 $pl->save;
3556 } 3675 }
3557 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3558 3677
3559 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3560 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3561 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3562 $map->valid or next; 3681 $map->valid or next;
3563 $map->save; 3682 $map->save;
3564 } 3683 }
3565 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3566 3685
3567 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3568 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3569 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3570 3689
3571 warn "begin write uuid\n"; 3690 warn "emergency_perl_save: begin write uuid\n";
3572 write_uuid_sync 1; 3691 write_uuid_sync 1;
3573 warn "end write uuid\n"; 3692 warn "emergency_perl_save: end write uuid\n";
3574 }; 3693 };
3575 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
3576 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3577} 3701}
3578 3702
3579sub post_cleanup { 3703sub post_cleanup {
3580 my ($make_core) = @_; 3704 my ($make_core) = @_;
3581 3705
3582 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3583 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#
3584} 3737}
3585 3738
3586sub do_reload_perl() { 3739sub do_reload_perl() {
3587 # can/must only be called in main 3740 # can/must only be called in main
3588 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3589 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3590 return; 3743 return;
3591 } 3744 }
3592 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3593 warn "reloading..."; 3751 warn "reloading...";
3594 3752
3595 warn "entering sync_job"; 3753 warn "entering sync_job";
3596 3754
3597 cf::sync_job { 3755 cf::sync_job {
3598 cf::write_runtime_sync; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3599 cf::emergency_save; 3757 cf::emergency_save;
3600 cf::write_runtime_sync; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3601 3759
3602 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3604 3762
3605 # 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
3606 3764
3607 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3608 for (;;) {
3609 BDB::flush;
3610 IO::AIO::flush;
3611 Coro::cede_notself;
3612 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3613 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3614 }
3615
3616 ++$RELOAD;
3617
3618 warn "cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = ();
3621
3622 warn "removing commands";
3623 %COMMAND = ();
3624
3625 warn "removing ext/exti commands";
3626 %EXTCMD = ();
3627 %EXTICMD = ();
3628
3629 warn "unloading/nuking all extensions";
3630 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg";
3632
3633 if (my $cb = $pkg->can ("unload")) {
3634 eval {
3635 $cb->($pkg);
3636 1
3637 } or warn "$pkg unloaded, but with errors: $@";
3638 } 3768 }
3639 3769
3640 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3641 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3642 } 3772 %EXT_CORO = ();
3643 3773
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3645 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3648 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3649 delete $INC{$k};
3650 3784
3651 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g;
3653
3654 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3655 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3656 } 3794 }
3657 3795
3658 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;
3659 } 3811 }
3660 3812
3661 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3662 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3663 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);
3664 3816
3665 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3820
3669 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3822 # and global variables created in xs
3671 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3672 3824
3673 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3674 3826
3675 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3676 require cf; 3828 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3678 3830
3679 warn "loading config and database again"; 3831 warn "loading config and database again";
3680 cf::reload_config; 3832 cf::reload_config;
3681 3833
3682 warn "loading extensions"; 3834 warn "loading extensions";
3683 cf::load_extensions; 3835 cf::load_extensions;
3684 3836
3837 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3691 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3692 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3693 3850
3694 1 3851 1
3695 } or do { 3852 } or do {
3696 warn $@; 3853 warn $@;
3697 cf::cleanup "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3698 }; 3855 };
3699 3856
3700 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3701}; 3863};
3702 3864
3703our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3704 3866
3705sub reload_perl() { 3867sub reload_perl() {
3706 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3707 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3708 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3709 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3710 do_reload_perl; 3875 do_reload_perl;
3711 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3877 };
3712 }; 3878 };
3713} 3879}
3714 3880
3715register_command "reload" => sub { 3881register_command "reload" => sub {
3716 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3787{ 3953{
3788 # configure BDB 3954 # configure BDB
3789 3955
3790 BDB::min_parallel 8; 3956 BDB::min_parallel 8;
3791 BDB::max_poll_reqs $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3792 $Coro::BDB::WATCHER->priority (1); 3958 $AnyEvent::BDB::WATCHER->priority (1);
3793 3959
3794 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3795 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3796 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3797 | 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;
3798 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3799 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3800 3967
3801 cf::sync_job { 3968 cf::sync_job {
3802 eval { 3969 eval {
3828{ 3995{
3829 # configure IO::AIO 3996 # configure IO::AIO
3830 3997
3831 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3832 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3833 $Coro::AIO::WATCHER->priority (1); 4000 undef $AnyEvent::AIO::WATCHER;
3834} 4001}
3835 4002
3836my $_log_backtrace; 4003my $_log_backtrace;
3837 4004
3838sub _log_backtrace { 4005sub _log_backtrace {
3841 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3842 4009
3843 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3844 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3845 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3846 async { 4014 async {
3847 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3848 4016
3849 my @bt = fork_call { 4017 my @bt = fork_call {
3850 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3861 } 4029 }
3862 4030
3863 @funcs 4031 @funcs
3864 }; 4032 };
3865 4033
3866 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3867 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3868 --$_log_backtrace; 4037 --$_log_backtrace;
3869 }; 4038 };
3870 } else { 4039 } else {
3871 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 4042 }
3874} 4043}
3875 4044
3876# load additional modules 4045# load additional modules
3877use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3878 4048
3879END { cf::emergency_save } 4049END { cf::emergency_save }
3880 4050
38811 40511
3882 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines