ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
35 37
38use Guard ();
36use Coro 4.50 (); 39use Coro ();
37use Coro::State; 40use Coro::State;
38use Coro::Handle; 41use Coro::Handle;
39use Coro::EV; 42use Coro::EV;
43use Coro::AnyEvent;
40use Coro::Timer; 44use Coro::Timer;
41use Coro::Signal; 45use Coro::Signal;
42use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
43use Coro::AIO; 49use Coro::AIO;
44use Coro::BDB; 50use Coro::BDB 1.6;
45use Coro::Storable; 51use Coro::Storable;
46use Coro::Util (); 52use Coro::Util ();
47 53
48use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
49use BDB (); 55use BDB ();
50use Data::Dumper; 56use Data::Dumper;
51use Digest::MD5; 57use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$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" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 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
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub 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::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
195 232
196This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 235that call.
199 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
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $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;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
296our $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
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks 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
313deadlocked coro. 367deadlocked coro.
319 373
320Return 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.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like 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
724 752
725############################################################################# 753#############################################################################
726 754
727=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
728 756
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
732 760
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
785 813
786Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
788 816
789Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 819
792These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
793 821
794=over 4 822=over 4
1085 1113
1086sub reattach { 1114sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1116 my ($obj) = @_;
1089 1117
1118 # no longer needed after getting rid of delete_package?
1090 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
1091 1120
1092 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1093 1122
1094 @$registry = (); 1123 @$registry = ();
1095 1124
1143 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1144 1173
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 aio_close $fh; 1181 aio_close $fh;
1150 1182
1151 if (@$objs) { 1183 if (@$objs) {
1152 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) {
1153 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 aio_close $fh; 1192 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1194 }
1160 } else { 1195 } else {
1161 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1162 } 1197 }
1163 1198
1164 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1203 } else {
1166 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1167 } 1205 }
1168 } else { 1206 } else {
1169 aio_unlink $filename; 1207 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1171 } 1209 }
1262 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1263 1301
1264 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1265} 1303}
1266 1304
1305use File::Glob ();
1306
1267cf::player->attach ( 1307cf::player->attach (
1268 on_command => sub { 1308 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1270 1310
1271 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1303 1343
1304 cf::override; 1344 cf::override;
1305 }, 1345 },
1306); 1346);
1307 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
1308sub load_extensions { 1361sub load_extensions {
1309 cf::sync_job { 1362 cf::sync_job {
1310 my %todo; 1363 my %todo;
1311 1364
1312 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1331 1384
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1387
1335 $ext{source} = 1388 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1338 . $source 1391 . $source
1339 . "\n};\n1"; 1392 . "\n};\n1";
1340 1393
1341 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1381 1434
1382=back 1435=back
1383 1436
1384=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1385 1438
1386Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1387 1440
1388=cut 1441=cut
1389 1442
1390package cf::player; 1443package cf::player;
1391 1444
1434 1487
1435sub exists($) { 1488sub exists($) {
1436 my ($login) = @_; 1489 my ($login) = @_;
1437 1490
1438 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1440} 1493}
1441 1494
1442sub find($) { 1495sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1497 my $login = $_[0];
1519 my ($pl) = @_; 1572 my ($pl) = @_;
1520 1573
1521 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1522 1575
1523 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1524 $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
1525 1578
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1527 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1529 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1530 1585
1531 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1613 } 1668 }
1614 1669
1615 \@paths 1670 \@paths
1616} 1671}
1617 1672
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1674
1620Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1676
1711=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1712 1678
1713Sends an ext reply to the player. 1679Sends an ext reply to the player.
1714 1680
1927 1893
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1930} 1896}
1931 1897
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 1898sub decay_objects {
1942 my ($self) = @_; 1899 my ($self) = @_;
1943 1900
1944 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1945 1902
2027sub find { 1984sub find {
2028 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2029 1986
2030 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2031 1988
2032 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2034 1991
2035 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2040 or return; 1994 or return;
2041 1995
2042 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2043 1997
2045 or return; 1999 or return;
2046 2000
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2050 undef $guard1; 2005 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2006 $map->reset;
2053 return find $path; 2007 return find $path;
2054 } 2008 }
2055 2009
2056 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2038 $f->skip_block;
2085 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2086 or return; 2040 or return;
2087 2041
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2089 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2090 2044
2091 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2046 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2111 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2066 $self->decay_objects;
2113 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2114 $self->update_buttons; 2068 $self->update_buttons;
2115 cf::cede_to_tick; 2069 cf::cede_to_tick;
2116 $self->set_darkness_map;
2117 cf::cede_to_tick;
2118 $self->activate; 2070 $self->activate;
2119 } 2071 }
2120 2072
2121 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2288 2240
2289 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290 2242
2291 return if $self->players; 2243 return if $self->players;
2292 2244
2293 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2294 2246
2295 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2296 2248
2297 # need to save uniques path 2249 # need to save uniques path
2298 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2459can be C<undef>. Does the right thing when the player is currently in a 2411can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2412dialogue with the given NPC character.
2461 2413
2462=cut 2414=cut
2463 2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2429
2464# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2431# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
2479 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2447
2482 } else { 2448 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2451 }
2486 } 2452 }
2487} 2453}
2488 2454
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2514 2480
2515=item $player_object->enter_link 2481=item $player_object->enter_link
2516 2482
2517Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2518 2484
2519The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2520I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2521 2489
2522Will never block. 2490Will never block.
2523 2491
2524=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2525 2493
2583 2551
2584 $map->load; 2552 $map->load;
2585 $map->load_neighbours; 2553 $map->load_neighbours;
2586 2554
2587 return unless $self->contr->active; 2555 return unless $self->contr->active;
2588 $self->activate_recursive;
2589 2556
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2592} 2562}
2593 2563
2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2595 2565
2596Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2568that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2569the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2570be called at the end of this process.
2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2601 2574
2602=cut 2575=cut
2603 2576
2604our $GOTOGEN; 2577our $GOTOGEN;
2605 2578
2684} 2657}
2685 2658
2686sub prepare_random_map { 2659sub prepare_random_map {
2687 my ($exit) = @_; 2660 my ($exit) = @_;
2688 2661
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2664 # that depends on the exit object
2694 2665
2695 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
2697 if ($exit->map) { 2668 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2702 } 2675 }
2703 2676
2704 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2705 2678
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2685 undef $fh;
2713 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2714 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2717 } 2694 }
2718} 2695}
2719 2696
2720sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2722 2699
2723 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2724 2701
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2702 $self->enter_link;
2737 2703
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2704 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2705 $Coro::current->{desc} = "enter_exit";
2744 2706
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2747 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2748 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2749 1; 2728 1
2750 }) { 2729 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2755 2734
2756 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2822 id => "infobox", 2801 id => "infobox",
2823 title => "Body Parts", 2802 title => "Body Parts",
2824 reply => undef, 2803 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 2804 tooltip => "Shows which body parts you posess and are available",
2826 }, 2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2812 "c/skills" => {
2813 id => "infobox",
2814 title => "Skills",
2815 reply => undef,
2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2841 },
2827 "c/uptime" => { 2842 "c/uptime" => {
2828 id => "infobox", 2843 id => "infobox",
2829 title => "Uptime", 2844 title => "Uptime",
2830 reply => undef, 2845 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 2846 tooltip => "How long the server has been running since last restart",
2840 id => "party", 2855 id => "party",
2841 title => "Party", 2856 title => "Party",
2842 reply => "gsay ", 2857 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party", 2858 tooltip => "Messages and chat related to your party",
2844 }, 2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2866 "c/say" => $SAY_CHANNEL,
2867 "c/chat" => $CHAT_CHANNEL,
2845); 2868);
2846 2869
2847sub cf::client::send_msg { 2870sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 2871 my ($self, $channel, $msg, $color, @extra) = @_;
2849 2872
2850 $msg = $self->pl->expand_cfpod ($msg); 2873 $msg = $self->pl->expand_cfpod ($msg)
2874 unless $color & cf::NDI_VERBATIM;
2851 2875
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 2876 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 2877
2854 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 2879 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel}; 2880 $channel = $CHANNEL{$channel};
2857 2881
2858 $self->ext_msg (channel_info => $channel) 2882 $self->ext_msg (channel_info => $channel);
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id}; 2883 $channel = $channel->{id};
2862 2884
2863 } elsif (ref $channel) { 2885 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2868 if $self->can_msg;
2869 } 2890 }
2870 2891
2871 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2872 } 2893 }
2873 2894
2874 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2875 2896
2876 if ($self->can_msg) {
2877 # default colour, mask it out 2897 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2880 2900
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2901 my $pkt = "msg "
2902 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2883 } else { 2904 );
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894 2905
2895 $color &= cf::NDI_COLOR_MASK; 2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2896 2909
2897 utf8::encode $msg; 2910 # split very large packets
2898 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2899 if (0 && $msg =~ /\[/) { 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2900 # COMMAND/INFO 2913 $pkt = "frag";
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 } 2914 }
2915
2916 $self->send_packet ($pkt);
2908} 2917}
2909 2918
2910=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2911 2920
2912Sends an ext event to the client. 2921Sends an ext event to the client.
3087The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
3088 3097
3089 cf::object 3098 cf::object
3090 contr pay_amount pay_player map x y force_find force_add destroy 3099 contr pay_amount pay_player map x y force_find force_add destroy
3091 insert remove name archname title slaying race decrease split 3100 insert remove name archname title slaying race decrease split
3101 value
3092 3102
3093 cf::object::player 3103 cf::object::player
3094 player 3104 player
3095 3105
3096 cf::player 3106 cf::player
3101 3111
3102=cut 3112=cut
3103 3113
3104for ( 3114for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3116 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3117 decrease split destroy change_exp value msg lore send_msg)],
3108 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
3110 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
3111) { 3121) {
3112 no strict 'refs'; 3122 no strict 'refs';
3113 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
3114 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
3132 3142
3133 my $qcode = $code; 3143 my $qcode = $code;
3134 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3135 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
3136 3148
3137 local $_; 3149 local $_;
3138 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
3139 3151
3140 my $eval = 3152 my $eval =
3370 reload_treasures; 3382 reload_treasures;
3371 3383
3372 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
3373} 3385}
3374 3386
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379}
3380
3381sub reload_config { 3387sub reload_config {
3388 warn "reloading config file...\n";
3389
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3390 open my $fh, "<:utf8", "$CONFDIR/config"
3383 or return; 3391 or return;
3384 3392
3385 local $/; 3393 local $/;
3386 *CFG = YAML::Load <$fh>; 3394 *CFG = YAML::XS::Load scalar <$fh>;
3387 3395
3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3396 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3389 3397
3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3398 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3399 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3395 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3403 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3396 and die "WARNING: m(un)lockall failed: $!\n"; 3404 and die "WARNING: m(un)lockall failed: $!\n";
3397 }; 3405 };
3398 warn $@ if $@; 3406 warn $@ if $@;
3399 } 3407 }
3408
3409 warn "finished reloading resource files\n";
3410}
3411
3412sub pidfile() {
3413 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3414 or die "$PIDFILE: $!";
3415 flock $fh, &Fcntl::LOCK_EX
3416 or die "$PIDFILE: flock: $!";
3417 $fh
3418}
3419
3420# make sure only one server instance is running at any one time
3421sub atomic {
3422 my $fh = pidfile;
3423
3424 my $pid = <$fh>;
3425 kill 9, $pid if $pid > 0;
3426
3427 seek $fh, 0, 0;
3428 print $fh $$;
3429}
3430
3431sub main_loop {
3432 warn "EV::loop starting\n";
3433 if (1) {
3434 EV::loop;
3435 }
3436 warn "EV::loop returned\n";
3437 goto &main_loop unless $REALLY_UNLOOP;
3400} 3438}
3401 3439
3402sub main { 3440sub main {
3441 cf::init_globals; # initialise logging
3442
3443 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3444 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3445 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3446 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3447
3448 cf::init_experience;
3449 cf::init_anim;
3450 cf::init_attackmess;
3451 cf::init_dynamic;
3452
3453 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3454
3403 # we must not ever block the main coroutine 3455 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3456 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3457 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3458 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3459 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3460 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3461 })->prio (Coro::PRIO_MAX);
3410 }; 3462 };
3411 3463
3412 { 3464 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3465
3466 cf::sync_job {
3467 reload_resources;
3414 reload_config; 3468 reload_config;
3415 db_init; 3469 db_init;
3470
3471 cf::load_settings;
3472 cf::load_materials;
3473 cf::init_uuid;
3474 cf::init_signals;
3475 cf::init_commands;
3476 cf::init_skills;
3477
3478 cf::init_beforeplay;
3479
3480 atomic;
3481
3416 load_extensions; 3482 load_extensions;
3417 3483
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3484 utime time, time, $RUNTIMEFILE;
3419 evthread_start IO::AIO::poll_fileno; 3485
3486 # no (long-running) fork's whatsoever before this point(!)
3487 use POSIX ();
3488 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3489
3490 (pop @POST_INIT)->(0) while @POST_INIT;
3420 } 3491 };
3421 3492
3422 EV::loop; 3493 main_loop;
3423} 3494}
3424 3495
3425############################################################################# 3496#############################################################################
3426# initialisation and cleanup 3497# initialisation and cleanup
3427 3498
3434 }; 3505 };
3435 } 3506 }
3436} 3507}
3437 3508
3438sub write_runtime_sync { 3509sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime";
3440
3441 # first touch the runtime file to show we are still running: 3510 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3511 # the fsync below can take a very very long time.
3443 3512
3444 IO::AIO::aio_utime $runtime, undef, undef; 3513 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3514
3446 my $guard = cf::lock_acquire "write_runtime"; 3515 my $guard = cf::lock_acquire "write_runtime";
3447 3516
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3517 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3449 or return; 3518 or return;
3450 3519
3451 my $value = $cf::RUNTIME + 90 + 10; 3520 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3521 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3522 # 60 allows for the watchdog to kill the server.
3463 aio_utime $fh, undef, undef; 3532 aio_utime $fh, undef, undef;
3464 3533
3465 close $fh 3534 close $fh
3466 or return; 3535 or return;
3467 3536
3468 aio_rename "$runtime~", $runtime 3537 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3538 and return;
3470 3539
3471 warn "runtime file written.\n"; 3540 warn "runtime file written.\n";
3472 3541
3473 1 3542 1
3485 my $uuid = "$LOCALDIR/uuid"; 3554 my $uuid = "$LOCALDIR/uuid";
3486 3555
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3556 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3557 or return;
3489 3558
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3559 my $value = uuid_seq uuid_cur;
3560
3561 unless ($value) {
3562 warn "cowardly refusing to write zero uuid value!\n";
3563 return;
3564 }
3565
3566 my $value = uuid_str $value + $uuid_skip;
3491 $uuid_skip = 0; 3567 $uuid_skip = 0;
3492 3568
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3569 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3570 and return;
3495 3571
3517} 3593}
3518 3594
3519sub emergency_save() { 3595sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3596 my $freeze_guard = cf::freeze_mainloop;
3521 3597
3522 warn "enter emergency perl save\n"; 3598 warn "emergency_perl_save: enter\n";
3523 3599
3524 cf::sync_job { 3600 cf::sync_job {
3601 # this is a trade-off: we want to be very quick here, so
3602 # save all maps without fsync, and later call a global sync
3603 # (which in turn might be very very slow)
3604 local $USE_FSYNC = 0;
3605
3525 # use a peculiar iteration method to avoid tripping on perl 3606 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3607 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3608 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3609 warn "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3610 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3611 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3612 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3613 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3614 $pl->save;
3534 } 3615 }
3535 warn "end emergency player save\n"; 3616 warn "emergency_perl_save: end player save\n";
3536 3617
3537 warn "begin emergency map save\n"; 3618 warn "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3619 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3620 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3621 $map->valid or next;
3541 $map->save; 3622 $map->save;
3542 } 3623 }
3543 warn "end emergency map save\n"; 3624 warn "emergency_perl_save: end map save\n";
3544 3625
3545 warn "begin emergency database checkpoint\n"; 3626 warn "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3627 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3628 warn "emergency_perl_save: end database checkpoint\n";
3548 3629
3549 warn "begin write uuid\n"; 3630 warn "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3631 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3632 warn "emergency_perl_save: end write uuid\n";
3552 }; 3633 };
3553 3634
3635 warn "emergency_perl_save: starting sync()\n";
3636 IO::AIO::aio_sync sub {
3637 warn "emergency_perl_save: finished sync()\n";
3638 };
3639
3554 warn "leave emergency perl save\n"; 3640 warn "emergency_perl_save: leave\n";
3555} 3641}
3556 3642
3557sub post_cleanup { 3643sub post_cleanup {
3558 my ($make_core) = @_; 3644 my ($make_core) = @_;
3559 3645
3560 warn Carp::longmess "post_cleanup backtrace" 3646 warn Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3647 if $make_core;
3648
3649 my $fh = pidfile;
3650 unlink $PIDFILE if <$fh> == $$;
3651}
3652
3653# a safer delete_package, copied from Symbol
3654sub clear_package($) {
3655 my $pkg = shift;
3656
3657 # expand to full symbol table name if needed
3658 unless ($pkg =~ /^main::.*::$/) {
3659 $pkg = "main$pkg" if $pkg =~ /^::/;
3660 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3661 $pkg .= '::' unless $pkg =~ /::$/;
3662 }
3663
3664 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3665 my $stem_symtab = *{$stem}{HASH};
3666
3667 defined $stem_symtab and exists $stem_symtab->{$leaf}
3668 or return;
3669
3670 # clear all symbols
3671 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3672 for my $name (keys %$leaf_symtab) {
3673 _gv_clear *{"$pkg$name"};
3674# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3675 }
3676 warn "cleared package $pkg\n";#d#
3562} 3677}
3563 3678
3564sub do_reload_perl() { 3679sub do_reload_perl() {
3565 # can/must only be called in main 3680 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 3681 if ($Coro::current != $Coro::main) {
3567 warn "can only reload from main coroutine"; 3682 warn "can only reload from main coroutine";
3568 return; 3683 return;
3569 } 3684 }
3570 3685
3686 return if $RELOAD++;
3687
3688 my $t1 = EV::time;
3689
3690 while ($RELOAD) {
3571 warn "reloading..."; 3691 warn "reloading...";
3572 3692
3573 warn "entering sync_job"; 3693 warn "entering sync_job";
3574 3694
3575 cf::sync_job { 3695 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark 3696 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 3697 cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark 3698 cf::write_runtime_sync; # external watchdog should not bark
3579 3699
3580 warn "syncing database to disk"; 3700 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3701 BDB::db_env_txn_checkpoint $DB_ENV;
3582 3702
3583 # if anything goes wrong in here, we should simply crash as we already saved 3703 # if anything goes wrong in here, we should simply crash as we already saved
3584 3704
3585 warn "flushing outstanding aio requests"; 3705 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs; 3706 while (IO::AIO::nreqs || BDB::nreqs) {
3591 warn "iterate..."; 3707 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = ();
3599
3600 warn "removing commands";
3601 %COMMAND = ();
3602
3603 warn "removing ext/exti commands";
3604 %EXTCMD = ();
3605 %EXTICMD = ();
3606
3607 warn "unloading/nuking all extensions";
3608 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg";
3610
3611 if (my $cb = $pkg->can ("unload")) {
3612 eval {
3613 $cb->($pkg);
3614 1
3615 } or warn "$pkg unloaded, but with errors: $@";
3616 } 3708 }
3617 3709
3618 warn "... nuking $pkg"; 3710 warn "cancelling all extension coros";
3619 Symbol::delete_package $pkg; 3711 $_->cancel for values %EXT_CORO;
3620 } 3712 %EXT_CORO = ();
3621 3713
3622 warn "unloading all perl modules loaded from $LIBDIR"; 3714 warn "removing commands";
3623 while (my ($k, $v) = each %INC) { 3715 %COMMAND = ();
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 3716
3717 warn "removing ext/exti commands";
3718 %EXTCMD = ();
3719 %EXTICMD = ();
3720
3721 warn "unloading/nuking all extensions";
3722 for my $pkg (@EXTS) {
3626 warn "... unloading $k"; 3723 warn "... unloading $pkg";
3627 delete $INC{$k};
3628 3724
3629 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g;
3631
3632 if (my $cb = $k->can ("unload_module")) { 3725 if (my $cb = $pkg->can ("unload")) {
3726 eval {
3633 $cb->(); 3727 $cb->($pkg);
3728 1
3729 } or warn "$pkg unloaded, but with errors: $@";
3730 }
3731
3732 warn "... clearing $pkg";
3733 clear_package $pkg;
3634 } 3734 }
3635 3735
3636 Symbol::delete_package $k; 3736 warn "unloading all perl modules loaded from $LIBDIR";
3737 while (my ($k, $v) = each %INC) {
3738 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3739
3740 warn "... unloading $k";
3741 delete $INC{$k};
3742
3743 $k =~ s/\.pm$//;
3744 $k =~ s/\//::/g;
3745
3746 if (my $cb = $k->can ("unload_module")) {
3747 $cb->();
3748 }
3749
3750 clear_package $k;
3637 } 3751 }
3638 3752
3639 warn "getting rid of safe::, as good as possible"; 3753 warn "getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 3754 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 3756
3643 warn "unloading cf.pm \"a bit\""; 3757 warn "unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 3758 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 3759 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3646 3760
3647 # don't, removes xs symbols, too, 3761 # don't, removes xs symbols, too,
3648 # and global variables created in xs 3762 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 3763 #clear_package __PACKAGE__;
3650 3764
3651 warn "unload completed, starting to reload now"; 3765 warn "unload completed, starting to reload now";
3652 3766
3653 warn "reloading cf.pm"; 3767 warn "reloading cf.pm";
3654 require cf; 3768 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3769 cf::_connect_to_perl_1;
3656 3770
3657 warn "loading config and database again"; 3771 warn "loading config and database again";
3658 cf::reload_config; 3772 cf::reload_config;
3659 3773
3660 warn "loading extensions"; 3774 warn "loading extensions";
3661 cf::load_extensions; 3775 cf::load_extensions;
3662 3776
3777 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 3778 warn "reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 3779 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 3780 warn "reattaching attachments to maps";
3666 reattach $_ for values %MAP; 3781 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 3782 warn "reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 3783 reattach $_ for values %PLAYER;
3784 }
3669 3785
3786 warn "running post_init jobs";
3787 (pop @POST_INIT)->(1) while @POST_INIT;
3788
3670 warn "leaving sync_job"; 3789 warn "leaving sync_job";
3671 3790
3672 1 3791 1
3673 } or do { 3792 } or do {
3674 warn $@; 3793 warn $@;
3675 cf::cleanup "error while reloading, exiting."; 3794 cf::cleanup "error while reloading, exiting.";
3676 }; 3795 };
3677 3796
3678 warn "reloaded"; 3797 warn "reloaded";
3798 --$RELOAD;
3799 }
3800
3801 $t1 = EV::time - $t1;
3802 warn "reload completed in ${t1}s\n";
3679}; 3803};
3680 3804
3681our $RELOAD_WATCHER; # used only during reload 3805our $RELOAD_WATCHER; # used only during reload
3682 3806
3683sub reload_perl() { 3807sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 3808 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 3809 # coro crashes during coro_state_free->destroy here.
3686 3810
3811 $RELOAD_WATCHER ||= cf::async {
3812 Coro::AIO::aio_wait cache_extensions;
3813
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3814 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 3815 do_reload_perl;
3689 undef $RELOAD_WATCHER; 3816 undef $RELOAD_WATCHER;
3817 };
3690 }; 3818 };
3691} 3819}
3692 3820
3693register_command "reload" => sub { 3821register_command "reload" => sub {
3694 my ($who, $arg) = @_; 3822 my ($who, $arg) = @_;
3765{ 3893{
3766 # configure BDB 3894 # configure BDB
3767 3895
3768 BDB::min_parallel 8; 3896 BDB::min_parallel 8;
3769 BDB::max_poll_reqs $TICK * 0.1; 3897 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 3898 $AnyEvent::BDB::WATCHER->priority (1);
3771 3899
3772 unless ($DB_ENV) { 3900 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 3901 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3902 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 3903 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3904 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3905 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3906 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 3907
3779 cf::sync_job { 3908 cf::sync_job {
3780 eval { 3909 eval {
3806{ 3935{
3807 # configure IO::AIO 3936 # configure IO::AIO
3808 3937
3809 IO::AIO::min_parallel 8; 3938 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 3939 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 3940 undef $AnyEvent::AIO::WATCHER;
3812} 3941}
3813 3942
3814my $_log_backtrace; 3943my $_log_backtrace;
3815 3944
3816sub _log_backtrace { 3945sub _log_backtrace {
3819 $msg =~ s/\n//; 3948 $msg =~ s/\n//;
3820 3949
3821 # limit the # of concurrent backtraces 3950 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 3951 if ($_log_backtrace < 2) {
3823 ++$_log_backtrace; 3952 ++$_log_backtrace;
3953 my $perl_bt = Carp::longmess $msg;
3824 async { 3954 async {
3825 $Coro::current->{desc} = "abt $msg"; 3955 $Coro::current->{desc} = "abt $msg";
3826 3956
3827 my @bt = fork_call { 3957 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 3958 @addr = map { sprintf "%x", $_ } @addr;
3839 } 3969 }
3840 3970
3841 @funcs 3971 @funcs
3842 }; 3972 };
3843 3973
3844 LOG llevInfo, "[ABT] $msg\n"; 3974 LOG llevInfo, "[ABT] $perl_bt\n";
3975 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 3976 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 3977 --$_log_backtrace;
3847 }; 3978 };
3848 } else { 3979 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 3980 LOG llevInfo, "[ABT] $msg\n";
3850 LOG llevInfo, "[ABT] [suppressed]\n"; 3981 LOG llevInfo, "[ABT] [suppressed]\n";
3851 } 3982 }
3852} 3983}
3853 3984
3854# load additional modules 3985# load additional modules
3855use cf::pod; 3986require "cf/$_.pm" for @EXTRA_MODULES;
3987cf::_connect_to_perl_2;
3856 3988
3857END { cf::emergency_save } 3989END { cf::emergency_save }
3858 3990
38591 39911
3860 3992

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines