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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 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
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
106our %CFG; 119our %CFG;
107 120
108our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 122our $RUNTIME;
110our $NOW; 123our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 134our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
123 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
124binmode STDOUT; 141binmode STDOUT;
125binmode STDERR; 142binmode STDERR;
126 143
127# read virtual server time, if available 144# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
132} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
133 152
134mkdir $_ 153mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 155
137our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
242for my $pkg (qw( 261for my $pkg (qw(
243 cf::global cf::attachable 262 cf::global cf::attachable
244 cf::object cf::object::player 263 cf::object cf::object::player
245 cf::client cf::player 264 cf::client cf::player
246 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
247 cf::map cf::party cf::region 267 cf::party cf::region
248)) { 268)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 270}
252 271
253$EV::DIED = sub { 272$EV::DIED = sub {
254 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 316
298sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
300 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
301=item cf::lock_wait $string 334=item cf::lock_wait $string
302 335
303Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
304 337
305=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
306 339
307Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
310returned. 343returned.
311 344
312Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 346deadlocked coro.
319 352
320Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
321 354
322=cut 355=cut
323 356
324our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 358
327sub lock_wait($) { 359sub lock_wait($) {
328 my ($key) = @_; 360 $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} 361}
341 362
342sub lock_acquire($) { 363sub lock_acquire($) {
343 my ($key) = @_; 364 $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} 365}
357 366
358sub lock_active($) { 367sub lock_active($) {
359 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 369}
363 370
364sub freeze_mainloop { 371sub freeze_mainloop {
365 tick_inhibit_inc; 372 tick_inhibit_inc;
366 373
367 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
368} 375}
369 376
370=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
371 378
372Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
427 } 434 }
428 } 435 }
429}; 436};
430 437
431sub get_slot($;$$) { 438sub get_slot($;$$) {
432 return if tick_inhibit; 439 return if tick_inhibit || $Coro::current == $Coro::main;
433 440
434 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
435 442
436 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
724 731
725############################################################################# 732#############################################################################
726 733
727=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
728 735
729Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
732 739
733In the following description, CLASS can be any of C<global>, C<object> 740In 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 741C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
785 792
786Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
788 795
789Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
791 798
792These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
793 800
794=over 4 801=over 4
1085 1092
1086sub reattach { 1093sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1095 my ($obj) = @_;
1089 1096
1097 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1099
1092 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1093 1101
1094 @$registry = (); 1102 @$registry = ();
1095 1103
1141 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1144 1152
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1157 aio_close $fh;
1150 1158
1151 if (@$objs) { 1159 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1165 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1167 }
1160 } else { 1168 } else {
1161 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1162 } 1170 }
1163 1171
1164 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1176 } else {
1166 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1167 } 1178 }
1168 } else { 1179 } else {
1169 aio_unlink $filename; 1180 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1171 } 1182 }
1262 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1263 1274
1264 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1265} 1276}
1266 1277
1278use File::Glob ();
1279
1267cf::player->attach ( 1280cf::player->attach (
1268 on_command => sub { 1281 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1270 1283
1271 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1303 1316
1304 cf::override; 1317 cf::override;
1305 }, 1318 },
1306); 1319);
1307 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1308sub load_extensions { 1334sub load_extensions {
1309 cf::sync_job { 1335 cf::sync_job {
1310 my %todo; 1336 my %todo;
1311 1337
1312 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1331 1357
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1360
1335 $ext{source} = 1361 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1338 . $source 1364 . $source
1339 . "\n};\n1"; 1365 . "\n};\n1";
1340 1366
1341 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1381 1407
1382=back 1408=back
1383 1409
1384=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1385 1411
1386Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1387 1413
1388=cut 1414=cut
1389 1415
1390package cf::player; 1416package cf::player;
1391 1417
1434 1460
1435sub exists($) { 1461sub exists($) {
1436 my ($login) = @_; 1462 my ($login) = @_;
1437 1463
1438 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1440} 1466}
1441 1467
1442sub find($) { 1468sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1470 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1483 or return;
1458 1484
1459 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1460 or return; 1486 or return;
1487
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1464 } 1491 }
1465 } 1492 }
1518 my ($pl) = @_; 1545 my ($pl) = @_;
1519 1546
1520 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1521 1548
1522 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1551
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1529 1558
1530 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1599
1571 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1572 my $path = path $login; 1601 my $path = path $login;
1573 1602
1574 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1609 }
1580 1610
1611 } 1641 }
1612 1642
1613 \@paths 1643 \@paths
1614} 1644}
1615 1645
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1647
1618Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1649
1709=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1710 1651
1711Sends an ext reply to the player. 1652Sends an ext reply to the player.
1712 1653
1925 1866
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1928} 1869}
1929 1870
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1871sub decay_objects {
1940 my ($self) = @_; 1872 my ($self) = @_;
1941 1873
1942 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1943 1875
2025sub find { 1957sub find {
2026 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2027 1959
2028 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2029 1961
2030 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1964
2033 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2038 or return; 1967 or return;
2039 1968
2040 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2041 1970
2043 or return; 1972 or return;
2044 1973
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
2048 undef $guard1; 1978 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1979 $map->reset;
2051 return find $path; 1980 return find $path;
2052 } 1981 }
2053 1982
2054 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2011 $f->skip_block;
2083 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2084 or return; 2013 or return;
2085 2014
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2087 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2088 2017
2089 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2019 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2108 2037
2109 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2039 $self->decay_objects;
2111 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2112 $self->update_buttons; 2041 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2042 cf::cede_to_tick;
2116 $self->activate; 2043 $self->activate;
2117 } 2044 }
2118 2045
2119 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2457can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2385dialogue with the given NPC character.
2459 2386
2460=cut 2387=cut
2461 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2462# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2404# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2420
2480 } else { 2421 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2424 }
2484 } 2425 }
2485} 2426}
2486 2427
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2453
2513=item $player_object->enter_link 2454=item $player_object->enter_link
2514 2455
2515Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2516 2457
2517The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2519 2462
2520Will never block. 2463Will never block.
2521 2464
2522=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2523 2466
2581 2524
2582 $map->load; 2525 $map->load;
2583 $map->load_neighbours; 2526 $map->load_neighbours;
2584 2527
2585 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2530 $self->activate_recursive;
2587 2531
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2590} 2534}
2594Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2541the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2599 2546
2600=cut 2547=cut
2601 2548
2602our $GOTOGEN; 2549our $GOTOGEN;
2603 2550
2682} 2629}
2683 2630
2684sub prepare_random_map { 2631sub prepare_random_map {
2685 my ($exit) = @_; 2632 my ($exit) = @_;
2686 2633
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2636 # that depends on the exit object
2692 2637
2693 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2640 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2700 } 2647 }
2701 2648
2702 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2703 2650
2704 my $data = cf::encode_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2707 2654
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2657 undef $fh;
2711 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2712 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2715 } 2666 }
2716} 2667}
2717 2668
2718sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2720 2671
2721 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2722 2673
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2674 $self->enter_link;
2735 2675
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2676 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2742 2678
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2745 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2746 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2747 1; 2700 1
2748 }) { 2701 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2706
2754 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2773 id => "infobox",
2821 title => "Body Parts", 2774 title => "Body Parts",
2822 reply => undef, 2775 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2824 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2825 "c/uptime" => { 2814 "c/uptime" => {
2826 id => "infobox", 2815 id => "infobox",
2827 title => "Uptime", 2816 title => "Uptime",
2828 reply => undef, 2817 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2818 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2821 id => "infobox",
2833 title => "Map Info", 2822 title => "Map Info",
2834 reply => undef, 2823 reply => undef,
2835 tooltip => "Information related to the maps", 2824 tooltip => "Information related to the maps",
2836 }, 2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2837); 2840);
2838 2841
2839sub cf::client::send_msg { 2842sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2844
2842 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2843 2847
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2849
2846 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2849 2853
2850 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2854 2856
2855 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2862 }
2862 2863
2863 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2864 } 2865 }
2865 2866
2866 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2867 2868
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2872 2872
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2876 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2877
2887 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2888 2881
2889 utf8::encode $msg; 2882 # split very large packets
2890 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2885 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2886 }
2887
2888 $self->send_packet ($pkt);
2900} 2889}
2901 2890
2902=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2903 2892
2904Sends an ext event to the client. 2893Sends an ext event to the client.
3078 3067
3079The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3080 3069
3081 cf::object 3070 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
3084 3074
3085 cf::object::player 3075 cf::object::player
3086 player 3076 player
3087 3077
3088 cf::player 3078 cf::player
3093 3083
3094=cut 3084=cut
3095 3085
3096for ( 3086for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3103) { 3093) {
3104 no strict 'refs'; 3094 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3124 3114
3125 my $qcode = $code; 3115 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3128 3120
3129 local $_; 3121 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3131 3123
3132 my $eval = 3124 my $eval =
3312 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3314 } 3306 }
3315}; 3307};
3316 3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3318
3317sub reload_regions { 3319sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3321 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3323
3334} 3336}
3335 3337
3336sub reload_archetypes { 3338sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3341}
3345 3342
3346sub reload_treasures { 3343sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3349} 3346}
3350 3347
3351sub reload_resources { 3348sub reload_resources {
3352 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3353 3350
3351 reload_facedata;
3352 reload_archetypes;
3354 reload_regions; 3353 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3354 reload_treasures;
3359 3355
3360 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3357}
3366 3358
3367sub reload_config { 3359sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3361 or return;
3383 }; 3375 };
3384 warn $@ if $@; 3376 warn $@ if $@;
3385 } 3377 }
3386} 3378}
3387 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3388sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3389 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3417 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3419 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3396 }; 3421 };
3397 3422
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3427 reload_config;
3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3441 load_extensions;
3442
3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3404 EV::loop; 3451 EV::loop;
3405} 3452}
3406 3453
3407############################################################################# 3454#############################################################################
3408# initialisation and cleanup 3455# initialisation and cleanup
3416 }; 3463 };
3417 } 3464 }
3418} 3465}
3419 3466
3420sub write_runtime_sync { 3467sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3425 3470
3426 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3472
3428 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3429 3474
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3476 or return;
3432 3477
3433 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3446 3491
3447 close $fh 3492 close $fh
3448 or return; 3493 or return;
3449 3494
3450 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3496 and return;
3452 3497
3453 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3454 3499
3455 1 3500 1
3467 my $uuid = "$LOCALDIR/uuid"; 3512 my $uuid = "$LOCALDIR/uuid";
3468 3513
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3515 or return;
3471 3516
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3525 $uuid_skip = 0;
3474 3526
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3528 and return;
3477 3529
3499} 3551}
3500 3552
3501sub emergency_save() { 3553sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3503 3555
3504 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3505 3557
3506 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3507 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3570 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3572 $pl->save;
3516 } 3573 }
3517 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3518 3575
3519 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3579 $map->valid or next;
3523 $map->save; 3580 $map->save;
3524 } 3581 }
3525 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3526 3583
3527 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3530 3587
3531 warn "begin write uuid\n"; 3588 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3589 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3590 warn "emergency_perl_save: end write uuid\n";
3534 }; 3591 };
3535 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3536 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3537} 3599}
3538 3600
3539sub post_cleanup { 3601sub post_cleanup {
3540 my ($make_core) = @_; 3602 my ($make_core) = @_;
3541 3603
3542 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3544} 3635}
3545 3636
3546sub do_reload_perl() { 3637sub do_reload_perl() {
3547 # can/must only be called in main 3638 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3550 return; 3641 return;
3551 } 3642 }
3552 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3553 warn "reloading..."; 3649 warn "reloading...";
3554 3650
3555 warn "entering sync_job"; 3651 warn "entering sync_job";
3556 3652
3557 cf::sync_job { 3653 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3655 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3561 3657
3562 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3660
3565 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3566 3662
3567 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3666 }
3599 3667
3600 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3602 } 3670 %EXT_CORO = ();
3603 3671
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3682
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3615 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3616 } 3692 }
3617 3693
3618 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3619 } 3709 }
3620 3710
3621 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3714
3625 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3718
3629 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3720 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3632 3722
3633 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3634 3724
3635 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3636 require cf; 3726 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3728
3639 warn "loading config and database again"; 3729 warn "loading config and database again";
3640 cf::reload_config; 3730 cf::reload_config;
3641 3731
3642 warn "loading extensions"; 3732 warn "loading extensions";
3643 cf::load_extensions; 3733 cf::load_extensions;
3644 3734
3735 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3651 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3652 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3653 3748
3654 1 3749 1
3655 } or do { 3750 } or do {
3656 warn $@; 3751 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3658 }; 3753 };
3659 3754
3660 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3661}; 3761};
3662 3762
3663our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3664 3764
3665sub reload_perl() { 3765sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3668 3768
3769 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions;
3771
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3773 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3775 };
3672 }; 3776 };
3673} 3777}
3674 3778
3675register_command "reload" => sub { 3779register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3690 3794
3691our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3693 3797
3694sub wait_for_tick { 3798sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3800
3698 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3803 $signal->wait;
3701} 3804}
3702 3805
3703sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3808
3707 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3811 $signal->wait;
3710} 3812}
3749{ 3851{
3750 # configure BDB 3852 # configure BDB
3751 3853
3752 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3855 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3856 $AnyEvent::BDB::WATCHER->priority (1);
3755 3857
3756 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3865
3763 cf::sync_job { 3866 cf::sync_job {
3764 eval { 3867 eval {
3790{ 3893{
3791 # configure IO::AIO 3894 # configure IO::AIO
3792 3895
3793 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3898 undef $AnyEvent::AIO::WATCHER;
3796} 3899}
3797 3900
3798my $_log_backtrace; 3901my $_log_backtrace;
3799 3902
3800sub _log_backtrace { 3903sub _log_backtrace {
3803 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3804 3907
3805 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3808 async { 3912 async {
3809 $Coro::current->{desc} = "abt $msg"; 3913 $Coro::current->{desc} = "abt $msg";
3810 3914
3811 my @bt = fork_call { 3915 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3823 } 3927 }
3824 3928
3825 @funcs 3929 @funcs
3826 }; 3930 };
3827 3931
3828 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3935 --$_log_backtrace;
3831 }; 3936 };
3832 } else { 3937 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 3940 }
3836} 3941}
3837 3942
3838# load additional modules 3943# load additional modules
3839use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3840 3945
3841END { cf::emergency_save } 3946END { cf::emergency_save }
3842 3947
38431 39481
3844 3949

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines