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.443 by root, Sun Aug 31 10:05:26 2008 UTC vs.
Revision 1.498 by elmex, Tue Jan 5 16:16:37 2010 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
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
… …
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 77
70$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" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
98 112
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 115our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
103 117
104our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 121our $DB_ENV;
108 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
109our %CFG; 125our %CFG;
110 126
111our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 128our $RUNTIME;
113our $NOW; 129our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 140our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 148binmode STDOUT;
128binmode STDERR; 149binmode STDERR;
129 150
130# read virtual server time, if available 151# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
135} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
136 159
137mkdir $_ 160mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 162
140our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
141 164
142sub 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::"} };
143 177
144############################################################################# 178#############################################################################
145 179
146=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
147 181
… …
194returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
195per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
196 230
197=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
198 232
199This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call. 235that call.
202 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
203=back 243=back
204 244
205=cut 245=cut
206 246
207BEGIN { 247$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 248 my $msg = join "", @_;
210 249
211 $msg .= "\n" 250 $msg .= "\n"
212 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
213 252
214 $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;
215 254
216 LOG llevError, $msg; 255 LOG llevError, $msg;
217 }; 256};
218}
219 257
220$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
222 262
223 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 265 return;#d#
226 }#d# 266 }#d#
227 267
228 # kill coroutine otherwise 268 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 269 Coro::terminate
231}; 270};
232
233$SIG{__DIE__} = sub { }; #d#?
234 271
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
252)) { 289)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 291}
255 292
256$EV::DIED = sub { 293$EV::DIED = sub {
257 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
258}; 295};
259 296
260############################################################################# 297#############################################################################
261 298
262=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
299our $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
300 337
301sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 355=item cf::lock_wait $string
305 356
306Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
307 358
308=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
309 360
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
313returned. 364returned.
314 365
315Locks 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
316deadlocked coro. 367deadlocked coro.
… …
322 373
323Return 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.
324 375
325=cut 376=cut
326 377
327our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 379
330sub lock_wait($) { 380sub lock_wait($) {
331 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 382}
344 383
345sub lock_acquire($) { 384sub lock_acquire($) {
346 my ($key) = @_; 385 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 386}
360 387
361sub lock_active($) { 388sub lock_active($) {
362 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 390}
366 391
367sub freeze_mainloop { 392sub freeze_mainloop {
368 tick_inhibit_inc; 393 tick_inhibit_inc;
369 394
370 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
371} 396}
372 397
373=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
374 399
375Like 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
… …
727 752
728############################################################################# 753#############################################################################
729 754
730=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
731 756
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
735 760
736In 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>
737C<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
… …
787=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
788 813
789Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
791 816
792Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 819
795These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
796 821
797=over 4 822=over 4
… …
1147 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1148 1173
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1181 aio_close $fh;
1154 1182
1155 if (@$objs) { 1183 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1192 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1194 }
1164 } else { 1195 } else {
1165 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1166 } 1197 }
1167 1198
1168 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1203 } else {
1170 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1171 } 1205 }
1172 } else { 1206 } else {
1173 aio_unlink $filename; 1207 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1175 } 1209 }
… …
1266 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1267 1301
1268 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1269} 1303}
1270 1304
1305use File::Glob ();
1306
1271cf::player->attach ( 1307cf::player->attach (
1272 on_command => sub { 1308 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1274 1310
1275 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1306 } 1342 }
1307 1343
1308 cf::override; 1344 cf::override;
1309 }, 1345 },
1310); 1346);
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}
1311 1360
1312sub load_extensions { 1361sub load_extensions {
1313 cf::sync_job { 1362 cf::sync_job {
1314 my %todo; 1363 my %todo;
1315 1364
… …
1385 1434
1386=back 1435=back
1387 1436
1388=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1389 1438
1390Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1391 1440
1392=cut 1441=cut
1393 1442
1394package cf::player; 1443package cf::player;
1395 1444
… …
1438 1487
1439sub exists($) { 1488sub exists($) {
1440 my ($login) = @_; 1489 my ($login) = @_;
1441 1490
1442 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1444} 1493}
1445 1494
1446sub find($) { 1495sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1497 my $login = $_[0];
… …
1619 } 1668 }
1620 1669
1621 \@paths 1670 \@paths
1622} 1671}
1623 1672
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1674
1626Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1676
1719=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1720 1678
1721Sends an ext reply to the player. 1679Sends an ext reply to the player.
1722 1680
… …
1935 1893
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1938} 1896}
1939 1897
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 1898sub decay_objects {
1950 my ($self) = @_; 1899 my ($self) = @_;
1951 1900
1952 return if $self->{deny_reset}; 1901 return if $self->{deny_reset};
1953 1902
… …
2035sub find { 1984sub find {
2036 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
2037 1986
2038 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
2039 1988
2040 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
2042 1991
2043 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
2048 or return; 1994 or return;
2049 1995
2050 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
2051 1997
… …
2119 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2066 $self->decay_objects;
2121 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
2122 $self->update_buttons; 2068 $self->update_buttons;
2123 cf::cede_to_tick; 2069 cf::cede_to_tick;
2124 $self->set_darkness_map;
2125 cf::cede_to_tick;
2126 $self->activate; 2070 $self->activate;
2127 } 2071 }
2128 2072
2129 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
… …
2296 2240
2297 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298 2242
2299 return if $self->players; 2243 return if $self->players;
2300 2244
2301 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2302 2246
2303 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2304 2248
2305 # need to save uniques path 2249 # need to save uniques path
2306 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2397 : normalise $_ 2341 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2343 ]
2400} 2344}
2401 2345
2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2377
2402=back 2378=back
2403 2379
2404=head3 cf::object 2380=head3 cf::object
2405 2381
2406=cut 2382=cut
… …
2471 2447
2472our $SAY_CHANNEL = { 2448our $SAY_CHANNEL = {
2473 id => "say", 2449 id => "say",
2474 title => "Map", 2450 title => "Map",
2475 reply => "say ", 2451 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2477}; 2453};
2478 2454
2479our $CHAT_CHANNEL = { 2455our $CHAT_CHANNEL = {
2480 id => "chat", 2456 id => "chat",
2481 title => "Chat", 2457 title => "Chat",
… …
2536 2512
2537=item $player_object->enter_link 2513=item $player_object->enter_link
2538 2514
2539Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2540 2516
2541The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2542I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2543 2521
2544Will never block. 2522Will never block.
2545 2523
2546=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2547 2525
… …
2599 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2601 2579
2602 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2605 2583
2606 $map->load; 2584 $map->load;
2607 $map->load_neighbours; 2585 $map->load_neighbours;
2608 2586
2609 return unless $self->contr->active; 2587 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2588
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2614} 2594}
2615 2595
2616=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2617 2597
2618Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
… …
2777 $self->contr->savebed ($map, $x, $y) 2757 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 2758 if $exit->flag (cf::FLAG_DAMNED);
2779 2759
2780 1 2760 1
2781 }) { 2761 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2784 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2786 2766
2787 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2804sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2806 2786
2807 utf8::encode $text; 2787 utf8::encode $text;
2808 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2809} 2814}
2810 2815
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 2817
2813Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2817 2822
2818=cut 2823=cut
2819 2824
2820# non-persistent channels (usually the info channel) 2825# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2822 "c/identify" => { 2833 "c/identify" => {
2823 id => "infobox", 2834 id => "infobox",
2824 title => "Identify", 2835 title => "Identify",
2825 reply => undef, 2836 reply => undef,
2826 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2828 "c/examine" => { 2839 "c/examine" => {
2829 id => "infobox", 2840 id => "infobox",
2830 title => "Examine", 2841 title => "Examine",
2831 reply => undef, 2842 reply => undef,
2832 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2833 }, 2850 },
2834 "c/book" => { 2851 "c/book" => {
2835 id => "infobox", 2852 id => "infobox",
2836 title => "Book", 2853 title => "Book",
2837 reply => undef, 2854 reply => undef,
… …
2853 id => "infobox", 2870 id => "infobox",
2854 title => "Body Parts", 2871 title => "Body Parts",
2855 reply => undef, 2872 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2857 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2858 "c/uptime" => { 2911 "c/uptime" => {
2859 id => "infobox", 2912 id => "infobox",
2860 title => "Uptime", 2913 title => "Uptime",
2861 reply => undef, 2914 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 2915 tooltip => "How long the server has been running since last restart",
… …
2871 id => "party", 2924 id => "party",
2872 title => "Party", 2925 title => "Party",
2873 reply => "gsay ", 2926 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 2927 tooltip => "Messages and chat related to your party",
2875 }, 2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2876); 2937);
2877 2938
2878sub cf::client::send_msg { 2939sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2880 2941
2881 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2882 2944
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 2946
2885 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2888 2950
2889 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2893 2953
2894 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 2959 }
2901 2960
2902 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2903 } 2962 }
2904 2963
2905 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2906 2965
2907 if ($self->can_msg) {
2908 # default colour, mask it out 2966 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2911 2969
2912 my $pkt = "msg " 2970 my $pkt = "msg "
2913 . $self->{json_coder}->encode ( 2971 . $self->{json_coder}->encode (
2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 ); 2973 );
2916 2974
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt); 2975 $self->send_big_packet ($pkt);
2928 } else {
2929 if ($color >= 0) {
2930 # replace some tags by gcfclient-compatible ones
2931 for ($msg) {
2932 1 while
2933 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2934 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2935 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2936 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2937 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2938 }
2939
2940 $color &= cf::NDI_COLOR_MASK;
2941
2942 utf8::encode $msg;
2943
2944 if (0 && $msg =~ /\[/) {
2945 # COMMAND/INFO
2946 $self->send_packet ("drawextinfo $color 10 8 $msg")
2947 } else {
2948 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2949 $self->send_packet ("drawinfo $color $msg")
2950 }
2951 }
2952 }
2953} 2976}
2954 2977
2955=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2956 2979
2957Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2960 2983
2961sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2962 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2963 2986
2964 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2966 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2967 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 2992 }
2970} 2993}
2971 2994
2972=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2973 2996
… …
2977 3000
2978sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2980 3003
2981 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove 3007 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2987 } 3010 }
2988} 3011}
2989 3012
2990=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2991 3014
… …
3118our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
3119 3142
3120$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
3121 3144
3122$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
3123 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
3124 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
3125 sort time 3148 sort time
3126)); 3149));
3127 3150
3128# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
3132The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
3133 3156
3134 cf::object 3157 cf::object
3135 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
3136 insert remove name archname title slaying race decrease split 3159 insert remove name archname title slaying race decrease split
3160 value
3137 3161
3138 cf::object::player 3162 cf::object::player
3139 player 3163 player
3140 3164
3141 cf::player 3165 cf::player
… …
3147=cut 3171=cut
3148 3172
3149for ( 3173for (
3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3151 insert remove inv nrof name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)], 3176 decrease split destroy change_exp value msg lore send_msg)],
3153 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
3154 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
3155 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
3156) { 3180) {
3157 no strict 'refs'; 3181 no strict 'refs';
3158 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
3159 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3176 my ($code, %vars) = @_; 3200 my ($code, %vars) = @_;
3177 3201
3178 my $qcode = $code; 3202 my $qcode = $code;
3179 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3180 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3205
3206 %vars = (_dummy => 0) unless %vars;
3181 3207
3182 local $_; 3208 local $_;
3183 local @safe::cf::_safe_eval_args = values %vars; 3209 local @safe::cf::_safe_eval_args = values %vars;
3184 3210
3185 my $eval = 3211 my $eval =
… …
3265 while (my ($face, $info) = each %$faces) { 3291 while (my ($face, $info) = each %$faces) {
3266 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3292 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267 3293
3268 cf::face::set_visibility $idx, $info->{visibility}; 3294 cf::face::set_visibility $idx, $info->{visibility};
3269 cf::face::set_magicmap $idx, $info->{magicmap}; 3295 cf::face::set_magicmap $idx, $info->{magicmap};
3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3296 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3297 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3272 3298
3273 cf::cede_to_tick; 3299 cf::cede_to_tick;
3274 } 3300 }
3275 3301
3276 while (my ($face, $info) = each %$faces) { 3302 while (my ($face, $info) = each %$faces) {
… …
3300 3326
3301 cf::anim::invalidate_all; # d'oh 3327 cf::anim::invalidate_all; # d'oh
3302 } 3328 }
3303 3329
3304 { 3330 {
3305 # TODO: for gcfclient pleasure, we should give resources
3306 # that gcfclient doesn't grok a >10000 face index.
3307 my $res = $facedata->{resource}; 3331 my $res = $facedata->{resource};
3308 3332
3309 while (my ($name, $info) = each %$res) { 3333 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) { 3334 if (defined $info->{type}) {
3311 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3335 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
3313 3336
3314 if ($info->{type} & 1) { 3337 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3315 # prepend meta info
3316
3317 my $meta = $enc->encode ({
3318 name => $name,
3319 %{ $info->{meta} || {} },
3320 });
3321
3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type}; 3338 cf::face::set_type $idx, $info->{type};
3329 } else { 3339 } else {
3330 $RESOURCE{$name} = $info; 3340 $RESOURCE{$name} = $info;
3331 } 3341 }
3332 3342
… …
3415 reload_treasures; 3425 reload_treasures;
3416 3426
3417 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
3418} 3428}
3419 3429
3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 reload_resources;
3426}
3427
3428sub reload_config { 3430sub reload_config {
3431 warn "reloading config file...\n";
3432
3429 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
3430 or return; 3434 or return;
3431 3435
3432 local $/; 3436 local $/;
3433 *CFG = YAML::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
3434 3438
3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3436 3440
3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3442 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3443 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
3444 }; 3448 };
3445 warn $@ if $@; 3449 warn $@ if $@;
3446 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
3447} 3481}
3448 3482
3449sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
3450 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3453 (async { 3501 (async {
3454 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT; 3503 EV::loop EV::LOOP_ONESHOT;
3456 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
3457 }; 3505 };
3458 3506
3459 { 3507 evthread_start IO::AIO::poll_fileno;
3460 my $guard = freeze_mainloop; 3508
3509 cf::sync_job {
3510 cf::load_settings;
3511 cf::load_materials;
3512
3513 reload_resources;
3461 reload_config; 3514 reload_config;
3462 db_init; 3515 db_init;
3516
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
3463 load_extensions; 3526 load_extensions;
3464 3527
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3528 utime time, time, $RUNTIMEFILE;
3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3466 } 3535 };
3467 3536
3468 EV::loop; 3537 main_loop;
3469} 3538}
3470 3539
3471############################################################################# 3540#############################################################################
3472# initialisation and cleanup 3541# initialisation and cleanup
3473 3542
… …
3480 }; 3549 };
3481 } 3550 }
3482} 3551}
3483 3552
3484sub write_runtime_sync { 3553sub write_runtime_sync {
3485 my $runtime = "$LOCALDIR/runtime";
3486
3487 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
3489 3556
3490 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3558
3492 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
3493 3560
3494 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3495 or return; 3562 or return;
3496 3563
3497 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
… …
3509 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
3510 3577
3511 close $fh 3578 close $fh
3512 or return; 3579 or return;
3513 3580
3514 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3582 and return;
3516 3583
3517 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
3518 3585
3519 1 3586 1
… …
3531 my $uuid = "$LOCALDIR/uuid"; 3598 my $uuid = "$LOCALDIR/uuid";
3532 3599
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return; 3601 or return;
3535 3602
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3537 $uuid_skip = 0; 3611 $uuid_skip = 0;
3538 3612
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return; 3614 and return;
3541 3615
… …
3563} 3637}
3564 3638
3565sub emergency_save() { 3639sub emergency_save() {
3566 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
3567 3641
3568 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
3569 3643
3570 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
3571 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
3572 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
3573 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
3574 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
3575 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
3576 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
3577 $pl->valid or next; 3656 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3579 $pl->save; 3658 $pl->save;
3580 } 3659 }
3581 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
3582 3661
3583 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
3584 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
3585 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
3586 $map->valid or next; 3665 $map->valid or next;
3587 $map->save; 3666 $map->save;
3588 } 3667 }
3589 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
3590 3669
3591 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
3592 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
3593 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3594 3673
3595 warn "begin write uuid\n"; 3674 warn "emergency_perl_save: begin write uuid\n";
3596 write_uuid_sync 1; 3675 write_uuid_sync 1;
3597 warn "end write uuid\n"; 3676 warn "emergency_perl_save: end write uuid\n";
3598 }; 3677 };
3599 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
3600 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
3601} 3685}
3602 3686
3603sub post_cleanup { 3687sub post_cleanup {
3604 my ($make_core) = @_; 3688 my ($make_core) = @_;
3605 3689
3606 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
3607 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3608} 3695}
3609 3696
3610# a safer delete_package, copied from Symbol 3697# a safer delete_package, copied from Symbol
3611sub clear_package($) { 3698sub clear_package($) {
3612 my $pkg = shift; 3699 my $pkg = shift;
… …
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) { 3716 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"}; 3717 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 } 3719 }
3633 warn "cleared package #$pkg\n";#d# 3720 warn "cleared package $pkg\n";#d#
3634} 3721}
3635
3636our $RELOAD; # how many times to reload
3637 3722
3638sub do_reload_perl() { 3723sub do_reload_perl() {
3639 # can/must only be called in main 3724 # can/must only be called in main
3640 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
3641 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
3642 return; 3727 return;
3643 } 3728 }
3644 3729
3645 return if $RELOAD++; 3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3646 3733
3647 while ($RELOAD) { 3734 while ($RELOAD) {
3648 warn "reloading..."; 3735 warn "reloading...";
3649 3736
3650 warn "entering sync_job"; 3737 warn "entering sync_job";
… …
3711 clear_package "safe::$_" 3798 clear_package "safe::$_"
3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3713 3800
3714 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
3715 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
3716 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3717 3804
3718 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
3719 # and global variables created in xs 3806 # and global variables created in xs
3720 #clear_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
3721 3808
3722 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
3723 3810
3724 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
3725 require cf; 3812 require cf;
3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
3727 3814
3728 warn "loading config and database again"; 3815 warn "loading config and database again";
3729 cf::reload_config; 3816 cf::reload_config;
3730 3817
3731 warn "loading extensions"; 3818 warn "loading extensions";
3732 cf::load_extensions; 3819 cf::load_extensions;
3733 3820
3821 if ($REATTACH_ON_RELOAD) {
3734 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3735 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3736 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3737 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3738 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3739 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3740 3832
3741 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3742 3834
3743 1 3835 1
3744 } or do { 3836 } or do {
… …
3747 }; 3839 };
3748 3840
3749 warn "reloaded"; 3841 warn "reloaded";
3750 --$RELOAD; 3842 --$RELOAD;
3751 } 3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3752}; 3847};
3753 3848
3754our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3755 3850
3756sub reload_perl() { 3851sub reload_perl() {
3757 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3758 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3759 3854
3855 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions;
3857
3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3859 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3861 };
3763 }; 3862 };
3764} 3863}
3765 3864
3766register_command "reload" => sub { 3865register_command "reload" => sub {
3767 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
… …
3781 3880
3782our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3783our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3784 3883
3785sub wait_for_tick { 3884sub wait_for_tick {
3786 return if tick_inhibit || $Coro::current == $Coro::main; 3885 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3787 3886
3788 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3789 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3790 $signal->wait; 3889 $signal->wait;
3791} 3890}
3792 3891
3793sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3794 return if tick_inhibit || $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3795 3894
3796 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3797 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3798 $signal->wait; 3897 $signal->wait;
3799} 3898}
… …
3893 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3894 3993
3895 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3896 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3897 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3898 async { 3998 async {
3899 $Coro::current->{desc} = "abt $msg"; 3999 $Coro::current->{desc} = "abt $msg";
3900 4000
3901 my @bt = fork_call { 4001 my @bt = fork_call {
3902 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
… …
3913 } 4013 }
3914 4014
3915 @funcs 4015 @funcs
3916 }; 4016 };
3917 4017
3918 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3919 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3920 --$_log_backtrace; 4021 --$_log_backtrace;
3921 }; 4022 };
3922 } else { 4023 } else {
3923 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3924 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3925 } 4026 }
3926} 4027}
3927 4028
3928# load additional modules 4029# load additional modules
3929use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3930 4032
3931END { cf::emergency_save } 4033END { cf::emergency_save }
3932 4034
39331 40351
3934 4036

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines