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.434 by root, Thu May 29 03:27: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; 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 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5; 58use Digest::MD5;
53use Fcntl; 59use Fcntl;
54use YAML (); 60use YAML::XS ();
55use IO::AIO (); 61use IO::AIO ();
56use Time::HiRes; 62use Time::HiRes;
57use Compress::LZF; 63use Compress::LZF;
58use Digest::MD5 (); 64use Digest::MD5 ();
59 65
60AnyEvent::detect; 66AnyEvent::detect;
61 67
62IO::AIO::max_poll_reqs 1;#d#
63
64# configure various modules to our taste 68# configure various modules to our taste
65# 69#
66$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 78
70$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" };
71 81
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 83
74our %COMMAND = (); 84our %COMMAND = ();
75our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
78our %EXTCMD = (); 88our %EXTCMD = ();
79our %EXTICMD = (); 89our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
82 92
83our $RELOAD; # number of reloads so far 93our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
85 97
86our $CONFDIR = confdir; 98our $CONFDIR = confdir;
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 103our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 104our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 106our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 107our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 108our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime";
111
97our %RESOURCE; 112our %RESOURCE;
98 113
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 116our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
103 118
104our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 122our $DB_ENV;
108 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
109our %CFG; 126our %CFG;
110 127
111our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 129our $RUNTIME;
113our $NOW; 130our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 139our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 140our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 141our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 149binmode STDOUT;
128binmode STDERR; 150binmode STDERR;
129 151
130# read virtual server time, if available 152# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 153unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 154 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
135} 157}
158
159eval "sub TICK() { $TICK } 1" or die;
136 160
137mkdir $_ 161mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 163
140our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
141 165
142sub 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::"} };
143 178
144############################################################################# 179#############################################################################
145 180
146=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
147 182
194returns 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
195per 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.
196 231
197=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
198 233
199This array contains the results of the last C<invoke ()> call. When 234This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 236that call.
202 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
203=back 244=back
204 245
205=cut 246=cut
206 247
207BEGIN { 248$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 249 my $msg = join "", @_;
210 250
211 $msg .= "\n" 251 $msg .= "\n"
212 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
213 253
214 $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;
215 255
216 LOG llevError, $msg; 256 LOG llevError, $msg;
217 }; 257};
218}
219 258
220$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
222 263
223 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 266 return;#d#
226 }#d# 267 }#d#
227 268
228 # kill coroutine otherwise 269 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 270 Coro::terminate
231}; 271};
232
233$SIG{__DIE__} = sub { }; #d#?
234 272
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
245for my $pkg (qw( 283for my $pkg (qw(
246 cf::global cf::attachable 284 cf::global cf::attachable
247 cf::object cf::object::player 285 cf::object cf::object::player
248 cf::client cf::player 286 cf::client cf::player
249 cf::arch cf::living 287 cf::arch cf::living
288 cf::map cf::mapspace
250 cf::map cf::party cf::region 289 cf::party cf::region
251)) { 290)) {
252 no strict 'refs';
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 292}
255 293
256$EV::DIED = sub { 294$EV::DIED = sub {
257 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
258}; 296};
259 297
260############################################################################# 298#############################################################################
261 299
262=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
299our $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
300 338
301sub encode_json($) { $json_coder->encode ($_[0]) } 339sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 340sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 356=item cf::lock_wait $string
305 357
306Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
307 359
308=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
309 361
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
313returned. 365returned.
314 366
315Locks 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
316deadlocked coro. 368deadlocked coro.
322 374
323Return 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.
324 376
325=cut 377=cut
326 378
327our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 380
330sub lock_wait($) { 381sub lock_wait($) {
331 my ($key) = @_; 382 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 383}
344 384
345sub lock_acquire($) { 385sub lock_acquire($) {
346 my ($key) = @_; 386 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 387}
360 388
361sub lock_active($) { 389sub lock_active($) {
362 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 391}
366 392
367sub freeze_mainloop { 393sub freeze_mainloop {
368 tick_inhibit_inc; 394 tick_inhibit_inc;
369 395
370 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
371} 397}
372 398
373=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
374 400
375Like 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
727 753
728############################################################################# 754#############################################################################
729 755
730=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
731 757
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
735 761
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
788 814
789Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
791 817
792Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 820
795These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
796 822
797=over 4 823=over 4
1088 1114
1089sub reattach { 1115sub reattach {
1090 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1091 my ($obj) = @_; 1117 my ($obj) = @_;
1092 1118
1119 # no longer needed after getting rid of delete_package?
1093 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
1094 1121
1095 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1096 1123
1097 @$registry = (); 1124 @$registry = ();
1098 1125
1146 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1147 1174
1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1149 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1151 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 }
1152 aio_close $fh; 1182 aio_close $fh;
1153 1183
1154 if (@$objs) { 1184 if (@$objs) {
1155 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) {
1156 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1158 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1159 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 }
1160 aio_close $fh; 1193 aio_close $fh;
1161 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1162 } 1195 }
1163 } else { 1196 } else {
1164 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1165 } 1198 }
1166 1199
1167 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1201
1202 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC;
1168 } else { 1204 } else {
1169 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1170 } 1206 }
1171 } else { 1207 } else {
1172 aio_unlink $filename; 1208 aio_unlink $filename;
1173 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1174 } 1210 }
1265 my ($name, $cb) = @_; 1301 my ($name, $cb) = @_;
1266 1302
1267 $EXTICMD{$name} = $cb; 1303 $EXTICMD{$name} = $cb;
1268} 1304}
1269 1305
1306use File::Glob ();
1307
1270cf::player->attach ( 1308cf::player->attach (
1271 on_command => sub { 1309 on_command => sub {
1272 my ($pl, $name, $params) = @_; 1310 my ($pl, $name, $params) = @_;
1273 1311
1274 my $cb = $COMMAND{$name} 1312 my $cb = $COMMAND{$name}
1306 1344
1307 cf::override; 1345 cf::override;
1308 }, 1346 },
1309); 1347);
1310 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
1311sub load_extensions { 1362sub load_extensions {
1312 cf::sync_job { 1363 cf::sync_job {
1313 my %todo; 1364 my %todo;
1314 1365
1315 for my $path (<$LIBDIR/*.ext>) { 1366 for my $path (<$LIBDIR/*.ext>) {
1334 1385
1335 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1336 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1337 1388
1338 $ext{source} = 1389 $ext{source} =
1339 "package $pkg; use strict; use utf8;\n" 1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1340 . "#line 1 \"$path\"\n{\n" 1391 . "#line 1 \"$path\"\n{\n"
1341 . $source 1392 . $source
1342 . "\n};\n1"; 1393 . "\n};\n1";
1343 1394
1344 $todo{$base} = \%ext; 1395 $todo{$base} = \%ext;
1384 1435
1385=back 1436=back
1386 1437
1387=head2 CORE EXTENSIONS 1438=head2 CORE EXTENSIONS
1388 1439
1389Functions and methods that extend core crossfire objects. 1440Functions and methods that extend core deliantra objects.
1390 1441
1391=cut 1442=cut
1392 1443
1393package cf::player; 1444package cf::player;
1394 1445
1437 1488
1438sub exists($) { 1489sub exists($) {
1439 my ($login) = @_; 1490 my ($login) = @_;
1440 1491
1441 $cf::PLAYER{$login} 1492 $cf::PLAYER{$login}
1442 or cf::sync_job { !aio_stat path $login } 1493 or !aio_stat path $login
1443} 1494}
1444 1495
1445sub find($) { 1496sub find($) {
1446 return $cf::PLAYER{$_[0]} || do { 1497 return $cf::PLAYER{$_[0]} || do {
1447 my $login = $_[0]; 1498 my $login = $_[0];
1522 my ($pl) = @_; 1573 my ($pl) = @_;
1523 1574
1524 my $name = $pl->ob->name; 1575 my $name = $pl->ob->name;
1525 1576
1526 $pl->{deny_save} = 1; 1577 $pl->{deny_save} = 1;
1527 $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
1528 1579
1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1530 $pl->deactivate; 1581 $pl->deactivate;
1531 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;
1532 $pl->ob->check_score; 1583 $pl->ob->check_score;
1618 } 1669 }
1619 1670
1620 \@paths 1671 \@paths
1621} 1672}
1622 1673
1623=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1674=item $protocol_xml = $player->expand_cfpod ($cfpod)
1624 1675
1625Expand crossfire pod fragments into protocol xml. 1676Expand deliantra pod fragments into protocol xml.
1626
1627=cut
1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1640sub expand_cfpod {
1641 my ($self, $pod) = @_;
1642
1643 my $xml;
1644
1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1648
1649 $group =~ s/&/&amp;/g;
1650 $group =~ s/</&lt;/g;
1651
1652 $xml .= $group;
1653 } elsif ($pod =~ m%\G
1654 ([BCGHITU])
1655 <
1656 (?:
1657 ([^<>]*) (?{ $group = $^N })
1658 | < $interior >
1659 )
1660 >
1661 %gcsx
1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1682 "")
1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1694
1695 for ($xml) {
1696 # create single paragraphs (very hackish)
1697 s/(?<=\S)\n(?=\w)/ /g;
1698
1699 # compress some whitespace
1700 s/\s+\n/\n/g; # ws line-ends
1701 s/\n\n+/\n/g; # double lines
1702 s/^\n+//; # beginning lines
1703 s/\n+$//; # ending lines
1704 }
1705
1706 $xml
1707}
1708
1709no re 'eval';
1710
1711sub hintmode {
1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1713 $_[0]{hintmode}
1714}
1715 1677
1716=item $player->ext_reply ($msgid, @msg) 1678=item $player->ext_reply ($msgid, @msg)
1717 1679
1718Sends an ext reply to the player. 1680Sends an ext reply to the player.
1719 1681
1932 1894
1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1934 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1935} 1897}
1936 1898
1937# and all this just because we cannot iterate over
1938# all maps in C++...
1939sub change_all_map_light {
1940 my ($change) = @_;
1941
1942 $_->change_map_light ($change)
1943 for grep $_->outdoor, values %cf::MAP;
1944}
1945
1946sub decay_objects { 1899sub decay_objects {
1947 my ($self) = @_; 1900 my ($self) = @_;
1948 1901
1949 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1950 1903
2032sub find { 1985sub find {
2033 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
2034 1987
2035 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
2036 1989
2037 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2038 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
2039 1992
2040 $cf::MAP{$path} || do { 1993 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
2044 my $map = new_from_path cf::map $path 1994 my $map = new_from_path cf::map $path
2045 or return; 1995 or return;
2046 1996
2047 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2048 1998
2088 my $f = new_from_file cf::object::thawer $self->{load_path}; 2038 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block; 2039 $f->skip_block;
2090 $self->_load_objects ($f) 2040 $self->_load_objects ($f)
2091 or return; 2041 or return;
2092 2042
2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2043 $self->post_load_original
2094 if delete $self->{load_original}; 2044 if delete $self->{load_original};
2095 2045
2096 if (my $uniq = $self->uniq_path) { 2046 if (my $uniq = $self->uniq_path) {
2097 utf8::encode $uniq; 2047 utf8::encode $uniq;
2098 unless (aio_stat $uniq) { 2048 unless (aio_stat $uniq) {
2116 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2117 $self->decay_objects; 2067 $self->decay_objects;
2118 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2119 $self->update_buttons; 2069 $self->update_buttons;
2120 cf::cede_to_tick; 2070 cf::cede_to_tick;
2121 $self->set_darkness_map;
2122 cf::cede_to_tick;
2123 $self->activate; 2071 $self->activate;
2124 } 2072 }
2125 2073
2126 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
2293 2241
2294 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2295 2243
2296 return if $self->players; 2244 return if $self->players;
2297 2245
2298 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2299 2247
2300 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2301 2249
2302 # need to save uniques path 2250 # need to save uniques path
2303 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
2394 : normalise $_ 2342 : normalise $_
2395 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2396 ] 2344 ]
2397} 2345}
2398 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
2399=back 2379=back
2400 2380
2401=head3 cf::object 2381=head3 cf::object
2402 2382
2403=cut 2383=cut
2468 2448
2469our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2470 id => "say", 2450 id => "say",
2471 title => "Map", 2451 title => "Map",
2472 reply => "say ", 2452 reply => "say ",
2473 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.",
2474}; 2454};
2475 2455
2476our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2477 id => "chat", 2457 id => "chat",
2478 title => "Chat", 2458 title => "Chat",
2533 2513
2534=item $player_object->enter_link 2514=item $player_object->enter_link
2535 2515
2536Freezes 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}>).
2537 2517
2538The 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.
2539I<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.
2540 2522
2541Will never block. 2523Will never block.
2542 2524
2543=item $player_object->leave_link ($map, $x, $y) 2525=item $player_object->leave_link ($map, $x, $y)
2544 2526
2596 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2597 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2598 2580
2599 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2602 2584
2603 $map->load; 2585 $map->load;
2604 $map->load_neighbours; 2586 $map->load_neighbours;
2605 2587
2606 return unless $self->contr->active; 2588 return unless $self->contr->active;
2607 $self->activate_recursive;
2608 2589
2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2610 $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;
2611} 2595}
2612 2596
2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2614 2598
2615Moves 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
2616her, loading and preparing them map, calling the provided $check callback 2600her, loading and preparing them map, calling the provided $check callback
2617that 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
2618the 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
2619be 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 >>.
2620 2607
2621=cut 2608=cut
2622 2609
2623our $GOTOGEN; 2610our $GOTOGEN;
2624 2611
2771 $self->contr->savebed ($map, $x, $y) 2758 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED); 2759 if $exit->flag (cf::FLAG_DAMNED);
2773 2760
2774 1 2761 1
2775 }) { 2762 }) {
2776 $self->message ("Something went wrong deep within the crossfire server. " 2763 $self->message ("Something went wrong deep within the deliantra server. "
2777 . "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. "
2778 . "Please report this to the dungeon master!", 2765 . "Please report this to the dungeon master!",
2779 cf::NDI_UNIQUE | cf::NDI_RED); 2766 cf::NDI_UNIQUE | cf::NDI_RED);
2780 2767
2781 warn "ERROR in enter_exit: $@"; 2768 warn "ERROR in enter_exit: $@";
2798sub cf::client::send_drawinfo { 2785sub cf::client::send_drawinfo {
2799 my ($self, $text, $flags) = @_; 2786 my ($self, $text, $flags) = @_;
2800 2787
2801 utf8::encode $text; 2788 utf8::encode $text;
2802 $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);
2803} 2815}
2804 2816
2805=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2806 2818
2807Send 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
2811 2823
2812=cut 2824=cut
2813 2825
2814# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2815our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2816 "c/identify" => { 2834 "c/identify" => {
2817 id => "infobox", 2835 id => "infobox",
2818 title => "Identify", 2836 title => "Identify",
2819 reply => undef, 2837 reply => undef,
2820 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
2822 "c/examine" => { 2840 "c/examine" => {
2823 id => "infobox", 2841 id => "infobox",
2824 title => "Examine", 2842 title => "Examine",
2825 reply => undef, 2843 reply => undef,
2826 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",
2827 }, 2851 },
2828 "c/book" => { 2852 "c/book" => {
2829 id => "infobox", 2853 id => "infobox",
2830 title => "Book", 2854 title => "Book",
2831 reply => undef, 2855 reply => undef,
2847 id => "infobox", 2871 id => "infobox",
2848 title => "Body Parts", 2872 title => "Body Parts",
2849 reply => undef, 2873 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2851 }, 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 },
2852 "c/uptime" => { 2912 "c/uptime" => {
2853 id => "infobox", 2913 id => "infobox",
2854 title => "Uptime", 2914 title => "Uptime",
2855 reply => undef, 2915 reply => undef,
2856 tooltip => "How long the server has been running since last restart", 2916 tooltip => "How long the server has been running since last restart",
2865 id => "party", 2925 id => "party",
2866 title => "Party", 2926 title => "Party",
2867 reply => "gsay ", 2927 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2869 }, 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,
2870); 2938);
2871 2939
2872sub cf::client::send_msg { 2940sub cf::client::send_msg {
2873 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2874 2942
2875 $msg = $self->pl->expand_cfpod ($msg); 2943 $msg = $self->pl->expand_cfpod ($msg)
2944 unless $color & cf::NDI_VERBATIM;
2876 2945
2877 $color &= cf::NDI_CLIENT_MASK; # just in case... 2946 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878 2947
2879 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2882 2951
2883 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2887 2954
2888 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2893 if $self->can_msg;
2894 } 2960 }
2895 2961
2896 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2897 } 2963 }
2898 2964
2899 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2900 2966
2901 if ($self->can_msg) {
2902 # default colour, mask it out 2967 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2905 2970
2906 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2971 my $pkt = "msg "
2972 . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2908 } else { 2974 );
2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919 2975
2920 $color &= cf::NDI_COLOR_MASK; 2976 $self->send_big_packet ($pkt);
2921
2922 utf8::encode $msg;
2923
2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2927 } else {
2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2929 $self->send_packet ("drawinfo $color $msg")
2930 }
2931 }
2932 }
2933} 2977}
2934 2978
2935=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2936 2980
2937Sends an ext event to the client. 2981Sends an ext event to the client.
2940 2984
2941sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2942 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2943 2987
2944 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2947 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 2993 }
2950} 2994}
2951 2995
2952=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2953 2997
2957 3001
2958sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2960 3004
2961 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove 3008 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 } 3011 }
2968} 3012}
2969 3013
2970=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2971 3015
3112The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3113 3157
3114 cf::object 3158 cf::object
3115 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
3116 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3117 3162
3118 cf::object::player 3163 cf::object::player
3119 player 3164 player
3120 3165
3121 cf::player 3166 cf::player
3127=cut 3172=cut
3128 3173
3129for ( 3174for (
3130 ["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
3131 insert remove inv nrof name archname title slaying race 3176 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3133 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3134 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3135 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3136) { 3181) {
3137 no strict 'refs'; 3182 no strict 'refs';
3138 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3139 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3156 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3157 3202
3158 my $qcode = $code; 3203 my $qcode = $code;
3159 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3160 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3161 3208
3162 local $_; 3209 local $_;
3163 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3164 3211
3165 my $eval = 3212 my $eval =
3395 reload_treasures; 3442 reload_treasures;
3396 3443
3397 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3398} 3445}
3399 3446
3400sub init {
3401 my $guard = freeze_mainloop;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3451 or return;
3409 3452
3410 local $/; 3453 local $/;
3411 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3412 3455
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3457
3415 $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};
3416 $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};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3465 };
3423 warn $@ if $@; 3466 warn $@ if $@;
3424 } 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;
3425} 3498}
3426 3499
3427sub 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
3428 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
3430 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#
3431 (async { 3518 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3519 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3520 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3521 })->prio (Coro::PRIO_MAX);
3435 }; 3522 };
3436 3523
3437 { 3524 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3525
3526 cf::sync_job {
3527 reload_resources;
3439 reload_config; 3528 reload_config;
3440 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
3441 load_extensions; 3542 load_extensions;
3442 3543
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3544 utime time, time, $RUNTIMEFILE;
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;
3444 } 3551 };
3445 3552
3446 EV::loop; 3553 main_loop;
3447} 3554}
3448 3555
3449############################################################################# 3556#############################################################################
3450# initialisation and cleanup 3557# initialisation and cleanup
3451 3558
3458 }; 3565 };
3459 } 3566 }
3460} 3567}
3461 3568
3462sub write_runtime_sync { 3569sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3570 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3571 # the fsync below can take a very very long time.
3467 3572
3468 IO::AIO::aio_utime $runtime, undef, undef; 3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3574
3470 my $guard = cf::lock_acquire "write_runtime"; 3575 my $guard = cf::lock_acquire "write_runtime";
3471 3576
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3578 or return;
3474 3579
3475 my $value = $cf::RUNTIME + 90 + 10; 3580 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3581 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3582 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3592 aio_utime $fh, undef, undef;
3488 3593
3489 close $fh 3594 close $fh
3490 or return; 3595 or return;
3491 3596
3492 aio_rename "$runtime~", $runtime 3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3598 and return;
3494 3599
3495 warn "runtime file written.\n"; 3600 warn "runtime file written.\n";
3496 3601
3497 1 3602 1
3509 my $uuid = "$LOCALDIR/uuid"; 3614 my $uuid = "$LOCALDIR/uuid";
3510 3615
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3616 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3617 or return;
3513 3618
3514 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;
3515 $uuid_skip = 0; 3627 $uuid_skip = 0;
3516 3628
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3629 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3630 and return;
3519 3631
3541} 3653}
3542 3654
3543sub emergency_save() { 3655sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3656 my $freeze_guard = cf::freeze_mainloop;
3545 3657
3546 warn "enter emergency perl save\n"; 3658 warn "emergency_perl_save: enter\n";
3547 3659
3548 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
3549 # use a peculiar iteration method to avoid tripping on perl 3666 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3667 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3668 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3669 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3670 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3671 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3672 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3673 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3674 $pl->save;
3558 } 3675 }
3559 warn "end emergency player save\n"; 3676 warn "emergency_perl_save: end player save\n";
3560 3677
3561 warn "begin emergency map save\n"; 3678 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3679 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3680 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3681 $map->valid or next;
3565 $map->save; 3682 $map->save;
3566 } 3683 }
3567 warn "end emergency map save\n"; 3684 warn "emergency_perl_save: end map save\n";
3568 3685
3569 warn "begin emergency database checkpoint\n"; 3686 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3687 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3688 warn "emergency_perl_save: end database checkpoint\n";
3572 3689
3573 warn "begin write uuid\n"; 3690 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3691 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3692 warn "emergency_perl_save: end write uuid\n";
3576 }; 3693 };
3577 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
3578 warn "leave emergency perl save\n"; 3700 warn "emergency_perl_save: leave\n";
3579} 3701}
3580 3702
3581sub post_cleanup { 3703sub post_cleanup {
3582 my ($make_core) = @_; 3704 my ($make_core) = @_;
3583 3705
3584 warn Carp::longmess "post_cleanup backtrace" 3706 warn Carp::longmess "post_cleanup backtrace"
3585 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#
3586} 3737}
3587 3738
3588sub do_reload_perl() { 3739sub do_reload_perl() {
3589 # can/must only be called in main 3740 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3741 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3742 warn "can only reload from main coroutine";
3592 return; 3743 return;
3593 } 3744 }
3594 3745
3746 return if $RELOAD++;
3747
3748 my $t1 = EV::time;
3749
3750 while ($RELOAD) {
3595 warn "reloading..."; 3751 warn "reloading...";
3596 3752
3597 warn "entering sync_job"; 3753 warn "entering sync_job";
3598 3754
3599 cf::sync_job { 3755 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3756 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3757 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3758 cf::write_runtime_sync; # external watchdog should not bark
3603 3759
3604 warn "syncing database to disk"; 3760 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3761 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3762
3607 # 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
3608 3764
3609 warn "flushing outstanding aio requests"; 3765 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3766 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3767 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3768 }
3641 3769
3642 warn "... nuking $pkg"; 3770 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3771 $_->cancel for values %EXT_CORO;
3644 } 3772 %EXT_CORO = ();
3645 3773
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3774 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3775 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3776
3777 warn "removing ext/exti commands";
3778 %EXTCMD = ();
3779 %EXTICMD = ();
3780
3781 warn "unloading/nuking all extensions";
3782 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3783 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3784
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3785 if (my $cb = $pkg->can ("unload")) {
3786 eval {
3657 $cb->(); 3787 $cb->($pkg);
3788 1
3789 } or warn "$pkg unloaded, but with errors: $@";
3790 }
3791
3792 warn "... clearing $pkg";
3793 clear_package $pkg;
3658 } 3794 }
3659 3795
3660 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;
3661 } 3811 }
3662 3812
3663 warn "getting rid of safe::, as good as possible"; 3813 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3814 clear_package "safe::$_"
3665 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);
3666 3816
3667 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3820
3671 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3822 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3674 3824
3675 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3676 3826
3677 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3678 require cf; 3828 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3680 3830
3681 warn "loading config and database again"; 3831 warn "loading config and database again";
3682 cf::reload_config; 3832 cf::reload_config;
3683 3833
3684 warn "loading extensions"; 3834 warn "loading extensions";
3685 cf::load_extensions; 3835 cf::load_extensions;
3686 3836
3837 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3838 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3839 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3840 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3841 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3842 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3843 reattach $_ for values %PLAYER;
3844 }
3693 3845
3846 warn "running post_init jobs";
3847 (pop @POST_INIT)->(1) while @POST_INIT;
3848
3694 warn "leaving sync_job"; 3849 warn "leaving sync_job";
3695 3850
3696 1 3851 1
3697 } or do { 3852 } or do {
3698 warn $@; 3853 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3854 cf::cleanup "error while reloading, exiting.";
3700 }; 3855 };
3701 3856
3702 warn "reloaded"; 3857 warn "reloaded";
3858 --$RELOAD;
3859 }
3860
3861 $t1 = EV::time - $t1;
3862 warn "reload completed in ${t1}s\n";
3703}; 3863};
3704 3864
3705our $RELOAD_WATCHER; # used only during reload 3865our $RELOAD_WATCHER; # used only during reload
3706 3866
3707sub reload_perl() { 3867sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3868 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3869 # coro crashes during coro_state_free->destroy here.
3710 3870
3871 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions;
3873
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3875 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3876 undef $RELOAD_WATCHER;
3877 };
3714 }; 3878 };
3715} 3879}
3716 3880
3717register_command "reload" => sub { 3881register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3882 my ($who, $arg) = @_;
3793 BDB::max_poll_reqs $TICK * 0.1; 3957 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3958 $AnyEvent::BDB::WATCHER->priority (1);
3795 3959
3796 unless ($DB_ENV) { 3960 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3961 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3962 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | 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;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3965 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3967
3803 cf::sync_job { 3968 cf::sync_job {
3804 eval { 3969 eval {
3830{ 3995{
3831 # configure IO::AIO 3996 # configure IO::AIO
3832 3997
3833 IO::AIO::min_parallel 8; 3998 IO::AIO::min_parallel 8;
3834 IO::AIO::max_poll_time $TICK * 0.1; 3999 IO::AIO::max_poll_time $TICK * 0.1;
3835 #undef $AnyEvent::AIO::WATCHER; 4000 undef $AnyEvent::AIO::WATCHER;
3836} 4001}
3837 4002
3838my $_log_backtrace; 4003my $_log_backtrace;
3839 4004
3840sub _log_backtrace { 4005sub _log_backtrace {
3843 $msg =~ s/\n//; 4008 $msg =~ s/\n//;
3844 4009
3845 # limit the # of concurrent backtraces 4010 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4011 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4012 ++$_log_backtrace;
4013 my $perl_bt = Carp::longmess $msg;
3848 async { 4014 async {
3849 $Coro::current->{desc} = "abt $msg"; 4015 $Coro::current->{desc} = "abt $msg";
3850 4016
3851 my @bt = fork_call { 4017 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4018 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4029 }
3864 4030
3865 @funcs 4031 @funcs
3866 }; 4032 };
3867 4033
3868 LOG llevInfo, "[ABT] $msg\n"; 4034 LOG llevInfo, "[ABT] $perl_bt\n";
4035 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4036 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4037 --$_log_backtrace;
3871 }; 4038 };
3872 } else { 4039 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4040 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4042 }
3876} 4043}
3877 4044
3878# load additional modules 4045# load additional modules
3879use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3880 4048
3881END { cf::emergency_save } 4049END { cf::emergency_save }
3882 4050
3883evthread_start IO::AIO::poll_fileno;
3884
38851 40511
3886 4052

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines