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.421 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 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
427 } 455 }
428 } 456 }
429}; 457};
430 458
431sub get_slot($;$$) { 459sub get_slot($;$$) {
432 return if tick_inhibit; 460 return if tick_inhibit || $Coro::current == $Coro::main;
433 461
434 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
435 463
436 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
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
1141 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
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 chmod SAVE_MODE, $fh; 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 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 chmod SAVE_MODE, $fh; 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 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];
1456 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1510 or return;
1458 1511
1459 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1460 or return; 1513 or return;
1514
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1464 } 1518 }
1465 } 1519 }
1518 my ($pl) = @_; 1572 my ($pl) = @_;
1519 1573
1520 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1521 1575
1522 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1523 $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
1524 1578
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1529 1585
1530 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1626
1571 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1572 my $path = path $login; 1628 my $path = path $login;
1573 1629
1574 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1636 }
1580 1637
1611 } 1668 }
1612 1669
1613 \@paths 1670 \@paths
1614} 1671}
1615 1672
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1674
1618Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1676
1709=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1710 1678
1711Sends an ext reply to the player. 1679Sends an ext reply to the player.
1712 1680
1925 1893
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1928} 1896}
1929 1897
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1898sub decay_objects {
1940 my ($self) = @_; 1899 my ($self) = @_;
1941 1900
1942 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1943 1902
2025sub find { 1984sub find {
2026 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2027 1986
2028 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2029 1988
2030 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1991
2033 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2038 or return; 1994 or return;
2039 1995
2040 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2041 1997
2043 or return; 1999 or return;
2044 2000
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2048 undef $guard1; 2005 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2006 $map->reset;
2051 return find $path; 2007 return find $path;
2052 } 2008 }
2053 2009
2054 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2038 $f->skip_block;
2083 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
2084 or return; 2040 or return;
2085 2041
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
2087 if delete $self->{load_original}; 2043 if delete $self->{load_original};
2088 2044
2089 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2046 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2066 $self->decay_objects;
2111 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2112 $self->update_buttons; 2068 $self->update_buttons;
2113 cf::cede_to_tick; 2069 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2070 $self->activate;
2117 } 2071 }
2118 2072
2119 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2286 2240
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2242
2289 return if $self->players; 2243 return if $self->players;
2290 2244
2291 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2292 2246
2293 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2294 2248
2295 # need to save uniques path 2249 # need to save uniques path
2296 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2457can 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
2458dialogue with the given NPC character. 2412dialogue with the given NPC character.
2459 2413
2460=cut 2414=cut
2461 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
2462# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2431# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2447
2480 } else { 2448 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2451 }
2484 } 2452 }
2485} 2453}
2486 2454
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2480
2513=item $player_object->enter_link 2481=item $player_object->enter_link
2514 2482
2515Freezes 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}>).
2516 2484
2517The 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.
2518I<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.
2519 2489
2520Will never block. 2490Will never block.
2521 2491
2522=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2523 2493
2581 2551
2582 $map->load; 2552 $map->load;
2583 $map->load_neighbours; 2553 $map->load_neighbours;
2584 2554
2585 return unless $self->contr->active; 2555 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2556
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $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;
2590} 2562}
2591 2563
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2565
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2574
2600=cut 2575=cut
2601 2576
2602our $GOTOGEN; 2577our $GOTOGEN;
2603 2578
2682} 2657}
2683 2658
2684sub prepare_random_map { 2659sub prepare_random_map {
2685 my ($exit) = @_; 2660 my ($exit) = @_;
2686 2661
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2664 # that depends on the exit object
2692 2665
2693 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2668 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2700 } 2675 }
2701 2676
2702 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2703 2678
2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2707 2682
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2685 undef $fh;
2711 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2712 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2715 } 2694 }
2716} 2695}
2717 2696
2718sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2720 2699
2721 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2722 2701
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2702 $self->enter_link;
2735 2703
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2704 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2705 $Coro::current->{desc} = "enter_exit";
2742 2706
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2746 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
2747 1; 2728 1
2748 }) { 2729 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2734
2754 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2784 2765
2785=cut 2766=cut
2786 2767
2787# non-persistent channels (usually the info channel) 2768# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2789 "c/identify" => { 2776 "c/identify" => {
2790 id => "infobox", 2777 id => "infobox",
2791 title => "Identify", 2778 title => "Identify",
2792 reply => undef, 2779 reply => undef,
2793 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
2795 "c/examine" => { 2782 "c/examine" => {
2796 id => "infobox", 2783 id => "infobox",
2797 title => "Examine", 2784 title => "Examine",
2798 reply => undef, 2785 reply => undef,
2799 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2793 },
2801 "c/book" => { 2794 "c/book" => {
2802 id => "infobox", 2795 id => "infobox",
2803 title => "Book", 2796 title => "Book",
2804 reply => undef, 2797 reply => undef,
2820 id => "infobox", 2813 id => "infobox",
2821 title => "Body Parts", 2814 title => "Body Parts",
2822 reply => undef, 2815 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2816 tooltip => "Shows which body parts you posess and are available",
2824 }, 2817 },
2818 "c/statistics" => {
2819 id => "infobox",
2820 title => "Statistics",
2821 reply => undef,
2822 tooltip => "Shows your primary statistics",
2823 },
2824 "c/skills" => {
2825 id => "infobox",
2826 title => "Skills",
2827 reply => undef,
2828 tooltip => "Shows your experience per skill and item power",
2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2836 "c/resistances" => {
2837 id => "infobox",
2838 title => "Resistances",
2839 reply => undef,
2840 tooltip => "Shows your resistances",
2841 },
2842 "c/pets" => {
2843 id => "infobox",
2844 title => "Pets",
2845 reply => undef,
2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2853 },
2825 "c/uptime" => { 2854 "c/uptime" => {
2826 id => "infobox", 2855 id => "infobox",
2827 title => "Uptime", 2856 title => "Uptime",
2828 reply => undef, 2857 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2858 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2861 id => "infobox",
2833 title => "Map Info", 2862 title => "Map Info",
2834 reply => undef, 2863 reply => undef,
2835 tooltip => "Information related to the maps", 2864 tooltip => "Information related to the maps",
2836 }, 2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872 "c/death" => {
2873 id => "death",
2874 title => "Death",
2875 reply => undef,
2876 tooltip => "Reason for and more info about your most recent death",
2877 },
2878 "c/say" => $SAY_CHANNEL,
2879 "c/chat" => $CHAT_CHANNEL,
2837); 2880);
2838 2881
2839sub cf::client::send_msg { 2882sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2883 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2884
2842 $msg = $self->pl->expand_cfpod ($msg); 2885 $msg = $self->pl->expand_cfpod ($msg)
2886 unless $color & cf::NDI_VERBATIM;
2843 2887
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2888 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2889
2846 # check predefined channels, for the benefit of C 2890 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2891 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2892 $channel = $CHANNEL{$channel};
2849 2893
2850 $self->ext_msg (channel_info => $channel) 2894 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2895 $channel = $channel->{id};
2854 2896
2855 } elsif (ref $channel) { 2897 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2898 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2899 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2900 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2901 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2902 }
2862 2903
2863 $channel = $channel->{id}; 2904 $channel = $channel->{id};
2864 } 2905 }
2865 2906
2866 return unless @extra || length $msg; 2907 return unless @extra || length $msg;
2867 2908
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2909 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2910 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2911 if $color & cf::NDI_DEF;
2872 2912
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2913 my $pkt = "msg "
2914 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2916 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2917
2887 $color &= cf::NDI_COLOR_MASK; 2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2888 2921
2889 utf8::encode $msg; 2922 # split very large packets
2890 2923 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2925 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2926 }
2927
2928 $self->send_packet ($pkt);
2900} 2929}
2901 2930
2902=item $client->ext_msg ($type, @msg) 2931=item $client->ext_msg ($type, @msg)
2903 2932
2904Sends an ext event to the client. 2933Sends an ext event to the client.
3078 3107
3079The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
3080 3109
3081 cf::object 3110 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3111 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3112 insert remove name archname title slaying race decrease split
3113 value
3084 3114
3085 cf::object::player 3115 cf::object::player
3086 player 3116 player
3087 3117
3088 cf::player 3118 cf::player
3093 3123
3094=cut 3124=cut
3095 3125
3096for ( 3126for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3129 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
3103) { 3133) {
3104 no strict 'refs'; 3134 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
3124 3154
3125 my $qcode = $code; 3155 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
3128 3160
3129 local $_; 3161 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
3131 3163
3132 my $eval = 3164 my $eval =
3312 while (my ($k, $v) = each %$want) { 3344 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3345 $ns->fx_want ($k, $v);
3314 } 3346 }
3315}; 3347};
3316 3348
3349sub load_resource_file($) {
3350 my $guard = lock_acquire "load_resource_file";
3351
3352 my $status = load_resource_file_ $_[0];
3353 get_slot 0.1, 100;
3354 cf::arch::commit_load;
3355
3356 $status
3357}
3358
3317sub reload_regions { 3359sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3360 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3361 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3362 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3363
3334} 3376}
3335 3377
3336sub reload_archetypes { 3378sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3379 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3380 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3381}
3345 3382
3346sub reload_treasures { 3383sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3384 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3385 or die "unable to load treasurelists\n";
3349} 3386}
3350 3387
3351sub reload_resources { 3388sub reload_resources {
3352 warn "reloading resource files...\n"; 3389 warn "reloading resource files...\n";
3353 3390
3391 reload_facedata;
3392 reload_archetypes;
3354 reload_regions; 3393 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3394 reload_treasures;
3359 3395
3360 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3361} 3397}
3362 3398
3363sub init {
3364 reload_resources;
3365}
3366
3367sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3403 or return;
3370 3404
3371 local $/; 3405 local $/;
3372 *CFG = YAML::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3373 3407
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3375 3409
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3417 };
3384 warn $@ if $@; 3418 warn $@ if $@;
3385 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3422}
3423
3424sub pidfile() {
3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426 or die "$PIDFILE: $!";
3427 flock $fh, &Fcntl::LOCK_EX
3428 or die "$PIDFILE: flock: $!";
3429 $fh
3430}
3431
3432# make sure only one server instance is running at any one time
3433sub atomic {
3434 my $fh = pidfile;
3435
3436 my $pid = <$fh>;
3437 kill 9, $pid if $pid > 0;
3438
3439 seek $fh, 0, 0;
3440 print $fh $$;
3441}
3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3386} 3450}
3387 3451
3388sub main { 3452sub main {
3453 cf::init_globals; # initialise logging
3454
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466
3389 # we must not ever block the main coroutine 3467 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3468 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3469 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3470 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3471 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3472 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3473 })->prio (Coro::PRIO_MAX);
3396 }; 3474 };
3397 3475
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3476 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3477
3478 cf::sync_job {
3479 reload_resources;
3480 reload_config;
3481 db_init;
3482
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid;
3486 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills;
3489
3490 cf::init_beforeplay;
3491
3492 atomic;
3493
3494 load_extensions;
3495
3496 utime time, time, $RUNTIMEFILE;
3497
3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501
3502 (pop @POST_INIT)->(0) while @POST_INIT;
3503 };
3504
3505 main_loop;
3405} 3506}
3406 3507
3407############################################################################# 3508#############################################################################
3408# initialisation and cleanup 3509# initialisation and cleanup
3409 3510
3416 }; 3517 };
3417 } 3518 }
3418} 3519}
3419 3520
3420sub write_runtime_sync { 3521sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3522 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3523 # the fsync below can take a very very long time.
3425 3524
3426 IO::AIO::aio_utime $runtime, undef, undef; 3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3526
3428 my $guard = cf::lock_acquire "write_runtime"; 3527 my $guard = cf::lock_acquire "write_runtime";
3429 3528
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3530 or return;
3432 3531
3433 my $value = $cf::RUNTIME + 90 + 10; 3532 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3533 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3534 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3544 aio_utime $fh, undef, undef;
3446 3545
3447 close $fh 3546 close $fh
3448 or return; 3547 or return;
3449 3548
3450 aio_rename "$runtime~", $runtime 3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3550 and return;
3452 3551
3453 warn "runtime file written.\n"; 3552 warn "runtime file written.\n";
3454 3553
3455 1 3554 1
3467 my $uuid = "$LOCALDIR/uuid"; 3566 my $uuid = "$LOCALDIR/uuid";
3468 3567
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3568 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3569 or return;
3471 3570
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3571 my $value = uuid_seq uuid_cur;
3572
3573 unless ($value) {
3574 warn "cowardly refusing to write zero uuid value!\n";
3575 return;
3576 }
3577
3578 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3579 $uuid_skip = 0;
3474 3580
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3581 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3582 and return;
3477 3583
3499} 3605}
3500 3606
3501sub emergency_save() { 3607sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3608 my $freeze_guard = cf::freeze_mainloop;
3503 3609
3504 warn "enter emergency perl save\n"; 3610 warn "emergency_perl_save: enter\n";
3505 3611
3506 cf::sync_job { 3612 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617
3507 # use a peculiar iteration method to avoid tripping on perl 3618 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3619 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3620 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3621 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3622 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3623 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3624 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3626 $pl->save;
3516 } 3627 }
3517 warn "end emergency player save\n"; 3628 warn "emergency_perl_save: end player save\n";
3518 3629
3519 warn "begin emergency map save\n"; 3630 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3631 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3632 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3633 $map->valid or next;
3523 $map->save; 3634 $map->save;
3524 } 3635 }
3525 warn "end emergency map save\n"; 3636 warn "emergency_perl_save: end map save\n";
3526 3637
3527 warn "begin emergency database checkpoint\n"; 3638 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3639 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3640 warn "emergency_perl_save: end database checkpoint\n";
3530 3641
3531 warn "begin write uuid\n"; 3642 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3643 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3644 warn "emergency_perl_save: end write uuid\n";
3534 }; 3645 };
3535 3646
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3536 warn "leave emergency perl save\n"; 3652 warn "emergency_perl_save: leave\n";
3537} 3653}
3538 3654
3539sub post_cleanup { 3655sub post_cleanup {
3540 my ($make_core) = @_; 3656 my ($make_core) = @_;
3541 3657
3542 warn Carp::longmess "post_cleanup backtrace" 3658 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3659 if $make_core;
3660
3661 my $fh = pidfile;
3662 unlink $PIDFILE if <$fh> == $$;
3663}
3664
3665# a safer delete_package, copied from Symbol
3666sub clear_package($) {
3667 my $pkg = shift;
3668
3669 # expand to full symbol table name if needed
3670 unless ($pkg =~ /^main::.*::$/) {
3671 $pkg = "main$pkg" if $pkg =~ /^::/;
3672 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3673 $pkg .= '::' unless $pkg =~ /::$/;
3674 }
3675
3676 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3677 my $stem_symtab = *{$stem}{HASH};
3678
3679 defined $stem_symtab and exists $stem_symtab->{$leaf}
3680 or return;
3681
3682 # clear all symbols
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 }
3688 warn "cleared package $pkg\n";#d#
3544} 3689}
3545 3690
3546sub do_reload_perl() { 3691sub do_reload_perl() {
3547 # can/must only be called in main 3692 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3693 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3694 warn "can only reload from main coroutine";
3550 return; 3695 return;
3551 } 3696 }
3552 3697
3698 return if $RELOAD++;
3699
3700 my $t1 = EV::time;
3701
3702 while ($RELOAD) {
3553 warn "reloading..."; 3703 warn "reloading...";
3554 3704
3555 warn "entering sync_job"; 3705 warn "entering sync_job";
3556 3706
3557 cf::sync_job { 3707 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3708 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3709 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3710 cf::write_runtime_sync; # external watchdog should not bark
3561 3711
3562 warn "syncing database to disk"; 3712 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3713 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3714
3565 # if anything goes wrong in here, we should simply crash as we already saved 3715 # if anything goes wrong in here, we should simply crash as we already saved
3566 3716
3567 warn "flushing outstanding aio requests"; 3717 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3718 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3719 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3720 }
3599 3721
3600 warn "... nuking $pkg"; 3722 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3723 $_->cancel for values %EXT_CORO;
3602 } 3724 %EXT_CORO = ();
3603 3725
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3726 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3727 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3728
3729 warn "removing ext/exti commands";
3730 %EXTCMD = ();
3731 %EXTICMD = ();
3732
3733 warn "unloading/nuking all extensions";
3734 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3735 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3736
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3737 if (my $cb = $pkg->can ("unload")) {
3738 eval {
3615 $cb->(); 3739 $cb->($pkg);
3740 1
3741 } or warn "$pkg unloaded, but with errors: $@";
3742 }
3743
3744 warn "... clearing $pkg";
3745 clear_package $pkg;
3616 } 3746 }
3617 3747
3618 Symbol::delete_package $k; 3748 warn "unloading all perl modules loaded from $LIBDIR";
3749 while (my ($k, $v) = each %INC) {
3750 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751
3752 warn "... unloading $k";
3753 delete $INC{$k};
3754
3755 $k =~ s/\.pm$//;
3756 $k =~ s/\//::/g;
3757
3758 if (my $cb = $k->can ("unload_module")) {
3759 $cb->();
3760 }
3761
3762 clear_package $k;
3619 } 3763 }
3620 3764
3621 warn "getting rid of safe::, as good as possible"; 3765 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3766 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3768
3625 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3772
3629 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3774 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3632 3776
3633 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3634 3778
3635 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3636 require cf; 3780 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3638 3782
3639 warn "loading config and database again"; 3783 warn "loading config and database again";
3640 cf::reload_config; 3784 cf::reload_config;
3641 3785
3642 warn "loading extensions"; 3786 warn "loading extensions";
3643 cf::load_extensions; 3787 cf::load_extensions;
3644 3788
3789 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3790 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3791 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3792 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3793 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3794 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3795 reattach $_ for values %PLAYER;
3796 }
3651 3797
3798 warn "running post_init jobs";
3799 (pop @POST_INIT)->(1) while @POST_INIT;
3800
3652 warn "leaving sync_job"; 3801 warn "leaving sync_job";
3653 3802
3654 1 3803 1
3655 } or do { 3804 } or do {
3656 warn $@; 3805 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3806 cf::cleanup "error while reloading, exiting.";
3658 }; 3807 };
3659 3808
3660 warn "reloaded"; 3809 warn "reloaded";
3810 --$RELOAD;
3811 }
3812
3813 $t1 = EV::time - $t1;
3814 warn "reload completed in ${t1}s\n";
3661}; 3815};
3662 3816
3663our $RELOAD_WATCHER; # used only during reload 3817our $RELOAD_WATCHER; # used only during reload
3664 3818
3665sub reload_perl() { 3819sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3820 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3821 # coro crashes during coro_state_free->destroy here.
3668 3822
3823 $RELOAD_WATCHER ||= cf::async {
3824 Coro::AIO::aio_wait cache_extensions;
3825
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3827 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3828 undef $RELOAD_WATCHER;
3829 };
3672 }; 3830 };
3673} 3831}
3674 3832
3675register_command "reload" => sub { 3833register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3834 my ($who, $arg) = @_;
3690 3848
3691our @WAIT_FOR_TICK; 3849our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3850our @WAIT_FOR_TICK_BEGIN;
3693 3851
3694sub wait_for_tick { 3852sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3853 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3854
3698 my $signal = new Coro::Signal; 3855 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3856 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3857 $signal->wait;
3701} 3858}
3702 3859
3703sub wait_for_tick_begin { 3860sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3861 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3862
3707 my $signal = new Coro::Signal; 3863 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3864 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3865 $signal->wait;
3710} 3866}
3749{ 3905{
3750 # configure BDB 3906 # configure BDB
3751 3907
3752 BDB::min_parallel 8; 3908 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3909 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3910 $AnyEvent::BDB::WATCHER->priority (1);
3755 3911
3756 unless ($DB_ENV) { 3912 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3913 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3914 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3915 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3916 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3917 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3918 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3919
3763 cf::sync_job { 3920 cf::sync_job {
3764 eval { 3921 eval {
3790{ 3947{
3791 # configure IO::AIO 3948 # configure IO::AIO
3792 3949
3793 IO::AIO::min_parallel 8; 3950 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3951 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3952 undef $AnyEvent::AIO::WATCHER;
3796} 3953}
3797 3954
3798my $_log_backtrace; 3955my $_log_backtrace;
3799 3956
3800sub _log_backtrace { 3957sub _log_backtrace {
3803 $msg =~ s/\n//; 3960 $msg =~ s/\n//;
3804 3961
3805 # limit the # of concurrent backtraces 3962 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3963 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3964 ++$_log_backtrace;
3965 my $perl_bt = Carp::longmess $msg;
3808 async { 3966 async {
3809 $Coro::current->{desc} = "abt $msg"; 3967 $Coro::current->{desc} = "abt $msg";
3810 3968
3811 my @bt = fork_call { 3969 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3970 @addr = map { sprintf "%x", $_ } @addr;
3823 } 3981 }
3824 3982
3825 @funcs 3983 @funcs
3826 }; 3984 };
3827 3985
3828 LOG llevInfo, "[ABT] $msg\n"; 3986 LOG llevInfo, "[ABT] $perl_bt\n";
3987 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3988 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3989 --$_log_backtrace;
3831 }; 3990 };
3832 } else { 3991 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3992 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 3994 }
3836} 3995}
3837 3996
3838# load additional modules 3997# load additional modules
3839use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3840 4000
3841END { cf::emergency_save } 4001END { cf::emergency_save }
3842 4002
38431 40031
3844 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines