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.428 by root, Thu May 1 06:33:19 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines