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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.496 by root, Sun Nov 15 18:03:59 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;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 77
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
96 112
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 115our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
101 117
102our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 121our $DB_ENV;
106 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
107our %CFG; 125our %CFG;
108 126
109our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 128our $RUNTIME;
111our $NOW; 129our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 140our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
124 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
125binmode STDOUT; 148binmode STDOUT;
126binmode STDERR; 149binmode STDERR;
127 150
128# read virtual server time, if available 151# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
133} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
134 159
135mkdir $_ 160mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 162
138our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
139 164
140sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 177
142############################################################################# 178#############################################################################
143 179
144=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
145 181
192returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 230
195=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
196 232
197This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 235that call.
200 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
201=back 243=back
202 244
203=cut 245=cut
204 246
205BEGIN { 247$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 248 my $msg = join "", @_;
208 249
209 $msg .= "\n" 250 $msg .= "\n"
210 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
211 252
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 254
214 LOG llevError, $msg; 255 LOG llevError, $msg;
215 }; 256};
216}
217 257
218$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
220 262
221 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 265 return;#d#
224 }#d# 266 }#d#
225 267
226 # kill coroutine otherwise 268 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 269 Coro::terminate
229}; 270};
230
231$SIG{__DIE__} = sub { }; #d#?
232 271
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 282for my $pkg (qw(
244 cf::global cf::attachable 283 cf::global cf::attachable
245 cf::object cf::object::player 284 cf::object cf::object::player
246 cf::client cf::player 285 cf::client cf::player
247 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
248 cf::map cf::party cf::region 288 cf::party cf::region
249)) { 289)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 291}
253 292
254$EV::DIED = sub { 293$EV::DIED = sub {
255 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
256}; 295};
257 296
258############################################################################# 297#############################################################################
259 298
260=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 337
299sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
301 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
302=item cf::lock_wait $string 355=item cf::lock_wait $string
303 356
304Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
305 358
306=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
307 360
308Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
311returned. 364returned.
312 365
313Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 367deadlocked coro.
320 373
321Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
322 375
323=cut 376=cut
324 377
325our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 379
328sub lock_wait($) { 380sub lock_wait($) {
329 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 382}
342 383
343sub lock_acquire($) { 384sub lock_acquire($) {
344 my ($key) = @_; 385 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 386}
358 387
359sub lock_active($) { 388sub lock_active($) {
360 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 390}
364 391
365sub freeze_mainloop { 392sub freeze_mainloop {
366 tick_inhibit_inc; 393 tick_inhibit_inc;
367 394
368 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
369} 396}
370 397
371=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
372 399
373Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
725 752
726############################################################################# 753#############################################################################
727 754
728=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
729 756
730Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
733 760
734In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
786 813
787Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
789 816
790Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
792 819
793These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
794 821
795=over 4 822=over 4
1086 1113
1087sub reattach { 1114sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1116 my ($obj) = @_;
1090 1117
1118 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1120
1093 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1094 1122
1095 @$registry = (); 1123 @$registry = ();
1096 1124
1144 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1145 1173
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1150 aio_close $fh; 1181 aio_close $fh;
1151 1182
1152 if (@$objs) { 1183 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1158 aio_close $fh; 1192 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1194 }
1161 } else { 1195 } else {
1162 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1163 } 1197 }
1164 1198
1165 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1203 } else {
1167 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1168 } 1205 }
1169 } else { 1206 } else {
1170 aio_unlink $filename; 1207 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1172 } 1209 }
1263 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1264 1301
1265 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1266} 1303}
1267 1304
1305use File::Glob ();
1306
1268cf::player->attach ( 1307cf::player->attach (
1269 on_command => sub { 1308 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1271 1310
1272 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1304 1343
1305 cf::override; 1344 cf::override;
1306 }, 1345 },
1307); 1346);
1308 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1309sub load_extensions { 1361sub load_extensions {
1310 cf::sync_job { 1362 cf::sync_job {
1311 my %todo; 1363 my %todo;
1312 1364
1313 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1332 1384
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1387
1336 $ext{source} = 1388 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1339 . $source 1391 . $source
1340 . "\n};\n1"; 1392 . "\n};\n1";
1341 1393
1342 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1382 1434
1383=back 1435=back
1384 1436
1385=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1386 1438
1387Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1388 1440
1389=cut 1441=cut
1390 1442
1391package cf::player; 1443package cf::player;
1392 1444
1435 1487
1436sub exists($) { 1488sub exists($) {
1437 my ($login) = @_; 1489 my ($login) = @_;
1438 1490
1439 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1441} 1493}
1442 1494
1443sub find($) { 1495sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1497 my $login = $_[0];
1520 my ($pl) = @_; 1572 my ($pl) = @_;
1521 1573
1522 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1523 1575
1524 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1578
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1580 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1582 $pl->ob->check_score;
1616 } 1668 }
1617 1669
1618 \@paths 1670 \@paths
1619} 1671}
1620 1672
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1674
1623Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1676
1714=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1715 1678
1716Sends an ext reply to the player. 1679Sends an ext reply to the player.
1717 1680
1930 1893
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1933} 1896}
1934 1897
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1898sub decay_objects {
1945 my ($self) = @_; 1899 my ($self) = @_;
1946 1900
1947 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1948 1902
2030sub find { 1984sub find {
2031 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2032 1986
2033 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2034 1988
2035 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1991
2038 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2043 or return; 1994 or return;
2044 1995
2045 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2046 1997
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2038 $f->skip_block;
2088 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2089 or return; 2040 or return;
2090 2041
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2092 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2093 2044
2094 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2046 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2066 $self->decay_objects;
2116 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2117 $self->update_buttons; 2068 $self->update_buttons;
2118 cf::cede_to_tick; 2069 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2070 $self->activate;
2122 } 2071 }
2123 2072
2124 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2291 2240
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2242
2294 return if $self->players; 2243 return if $self->players;
2295 2244
2296 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2297 2246
2298 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2299 2248
2300 # need to save uniques path 2249 # need to save uniques path
2301 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2392 : normalise $_ 2341 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2343 ]
2395} 2344}
2396 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2397=back 2378=back
2398 2379
2399=head3 cf::object 2380=head3 cf::object
2400 2381
2401=cut 2382=cut
2466 2447
2467our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2468 id => "say", 2449 id => "say",
2469 title => "Map", 2450 title => "Map",
2470 reply => "say ", 2451 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2453};
2473 2454
2474our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2475 id => "chat", 2456 id => "chat",
2476 title => "Chat", 2457 title => "Chat",
2531 2512
2532=item $player_object->enter_link 2513=item $player_object->enter_link
2533 2514
2534Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2535 2516
2536The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2538 2521
2539Will never block. 2522Will never block.
2540 2523
2541=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2542 2525
2594 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2596 2579
2597 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2600 2583
2601 $map->load; 2584 $map->load;
2602 $map->load_neighbours; 2585 $map->load_neighbours;
2603 2586
2604 return unless $self->contr->active; 2587 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2588
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2609} 2594}
2610 2595
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2597
2613Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2602be called at the end of this process.
2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2618 2606
2619=cut 2607=cut
2620 2608
2621our $GOTOGEN; 2609our $GOTOGEN;
2622 2610
2769 $self->contr->savebed ($map, $x, $y) 2757 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2758 if $exit->flag (cf::FLAG_DAMNED);
2771 2759
2772 1 2760 1
2773 }) { 2761 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2766
2779 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2796sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2798 2786
2799 utf8::encode $text; 2787 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2801} 2814}
2802 2815
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2817
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2822
2810=cut 2823=cut
2811 2824
2812# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2814 "c/identify" => { 2833 "c/identify" => {
2815 id => "infobox", 2834 id => "infobox",
2816 title => "Identify", 2835 title => "Identify",
2817 reply => undef, 2836 reply => undef,
2818 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
2820 "c/examine" => { 2839 "c/examine" => {
2821 id => "infobox", 2840 id => "infobox",
2822 title => "Examine", 2841 title => "Examine",
2823 reply => undef, 2842 reply => undef,
2824 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2850 },
2826 "c/book" => { 2851 "c/book" => {
2827 id => "infobox", 2852 id => "infobox",
2828 title => "Book", 2853 title => "Book",
2829 reply => undef, 2854 reply => undef,
2845 id => "infobox", 2870 id => "infobox",
2846 title => "Body Parts", 2871 title => "Body Parts",
2847 reply => undef, 2872 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2849 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2850 "c/uptime" => { 2911 "c/uptime" => {
2851 id => "infobox", 2912 id => "infobox",
2852 title => "Uptime", 2913 title => "Uptime",
2853 reply => undef, 2914 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
2863 id => "party", 2924 id => "party",
2864 title => "Party", 2925 title => "Party",
2865 reply => "gsay ", 2926 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2867 }, 2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2868); 2937);
2869 2938
2870sub cf::client::send_msg { 2939sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2941
2873 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2874 2944
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2946
2877 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2880 2950
2881 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2885 2953
2886 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 2959 }
2893 2960
2894 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2895 } 2962 }
2896 2963
2897 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2898 2965
2899 if ($self->can_msg) {
2900 # default colour, mask it out 2966 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2903 2969
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 2973 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 2974
2918 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 2976}
2932 2977
2933=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2934 2979
2935Sends an ext event to the client. 2980Sends an ext event to the client.
2938 2983
2939sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2941 2986
2942 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 2992 }
2948} 2993}
2949 2994
2950=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2951 2996
2955 3000
2956sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2958 3003
2959 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3007 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3010 }
2966} 3011}
2967 3012
2968=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2969 3014
3110The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3111 3156
3112 cf::object 3157 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3115 3161
3116 cf::object::player 3162 cf::object::player
3117 player 3163 player
3118 3164
3119 cf::player 3165 cf::player
3125=cut 3171=cut
3126 3172
3127for ( 3173for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3134) { 3180) {
3135 no strict 'refs'; 3181 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3154 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3155 3201
3156 my $qcode = $code; 3202 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3159 3207
3160 local $_; 3208 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3162 3210
3163 my $eval = 3211 my $eval =
3243 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3293
3246 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3250 3298
3251 cf::cede_to_tick; 3299 cf::cede_to_tick;
3252 } 3300 }
3253 3301
3254 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
3278 3326
3279 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3280 } 3328 }
3281 3329
3282 { 3330 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3286 3332
3287 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3336
3292 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3307 } else { 3339 } else {
3308 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3309 } 3341 }
3310 3342
3393 reload_treasures; 3425 reload_treasures;
3394 3426
3395 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3396} 3428}
3397 3429
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3434 or return;
3409 3435
3410 local $/; 3436 local $/;
3411 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3412 3438
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3440
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $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}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3448 };
3423 warn $@ if $@; 3449 warn $@ if $@;
3424 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3425} 3481}
3426 3482
3427sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3428 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3501 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3435 }; 3505 };
3436 3506
3437 { 3507 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3439 reload_config; 3514 reload_config;
3440 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3441 load_extensions; 3526 load_extensions;
3442 3527
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3528 utime time, time, $RUNTIMEFILE;
3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3535 };
3445 3536
3446 EV::loop; 3537 main_loop;
3447} 3538}
3448 3539
3449############################################################################# 3540#############################################################################
3450# initialisation and cleanup 3541# initialisation and cleanup
3451 3542
3458 }; 3549 };
3459 } 3550 }
3460} 3551}
3461 3552
3462sub write_runtime_sync { 3553sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3467 3556
3468 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3558
3470 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3471 3560
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3562 or return;
3474 3563
3475 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3488 3577
3489 close $fh 3578 close $fh
3490 or return; 3579 or return;
3491 3580
3492 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3582 and return;
3494 3583
3495 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3496 3585
3497 1 3586 1
3509 my $uuid = "$LOCALDIR/uuid"; 3598 my $uuid = "$LOCALDIR/uuid";
3510 3599
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3601 or return;
3513 3602
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3611 $uuid_skip = 0;
3516 3612
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3614 and return;
3519 3615
3541} 3637}
3542 3638
3543sub emergency_save() { 3639sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3545 3641
3546 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3547 3643
3548 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3549 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3656 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3658 $pl->save;
3558 } 3659 }
3559 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3560 3661
3561 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3665 $map->valid or next;
3565 $map->save; 3666 $map->save;
3566 } 3667 }
3567 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3568 3669
3569 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3572 3673
3573 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3675 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3576 }; 3677 };
3577 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3578 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3579} 3685}
3580 3686
3581sub post_cleanup { 3687sub post_cleanup {
3582 my ($make_core) = @_; 3688 my ($make_core) = @_;
3583 3689
3584 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
3586} 3721}
3587 3722
3588sub do_reload_perl() { 3723sub do_reload_perl() {
3589 # can/must only be called in main 3724 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3592 return; 3727 return;
3593 } 3728 }
3594 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
3595 warn "reloading..."; 3735 warn "reloading...";
3596 3736
3597 warn "entering sync_job"; 3737 warn "entering sync_job";
3598 3738
3599 cf::sync_job { 3739 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3741 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
3603 3743
3604 warn "syncing database to disk"; 3744 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3746
3607 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
3608 3748
3609 warn "flushing outstanding aio requests"; 3749 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; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3751 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 } 3752 }
3641 3753
3642 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
3644 } 3756 %EXT_CORO = ();
3645 3757
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3767 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3768
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
3657 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
3658 } 3778 }
3659 3779
3660 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
3661 } 3795 }
3662 3796
3663 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3800
3667 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3804
3671 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3806 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3674 3808
3675 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3676 3810
3677 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3678 require cf; 3812 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3680 3814
3681 warn "loading config and database again"; 3815 warn "loading config and database again";
3682 cf::reload_config; 3816 cf::reload_config;
3683 3817
3684 warn "loading extensions"; 3818 warn "loading extensions";
3685 cf::load_extensions; 3819 cf::load_extensions;
3686 3820
3821 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3693 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3694 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3695 3834
3696 1 3835 1
3697 } or do { 3836 } or do {
3698 warn $@; 3837 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3700 }; 3839 };
3701 3840
3702 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3703}; 3847};
3704 3848
3705our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3706 3850
3707sub reload_perl() { 3851sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3710 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3859 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3714 }; 3862 };
3715} 3863}
3716 3864
3717register_command "reload" => sub { 3865register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3793 BDB::max_poll_reqs $TICK * 0.1; 3941 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3942 $AnyEvent::BDB::WATCHER->priority (1);
3795 3943
3796 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3951
3803 cf::sync_job { 3952 cf::sync_job {
3804 eval { 3953 eval {
3843 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3844 3993
3845 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3848 async { 3998 async {
3849 $Coro::current->{desc} = "abt $msg"; 3999 $Coro::current->{desc} = "abt $msg";
3850 4000
3851 my @bt = fork_call { 4001 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4013 }
3864 4014
3865 @funcs 4015 @funcs
3866 }; 4016 };
3867 4017
3868 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4021 --$_log_backtrace;
3871 }; 4022 };
3872 } else { 4023 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4026 }
3876} 4027}
3877 4028
3878# load additional modules 4029# load additional modules
3879use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3880 4032
3881END { cf::emergency_save } 4033END { cf::emergency_save }
3882 4034
38831 40351
3884 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines