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.476 by root, Wed Sep 2 16:54:20 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;
80 93
81our $CONFDIR = confdir; 94our $CONFDIR = confdir;
82our $DATADIR = datadir; 95our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
92our %RESOURCE; 108our %RESOURCE;
93 109
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 112our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
99 114
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 118our $DB_ENV;
105 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
106our %CFG; 122our %CFG;
107 123
108our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 125our $RUNTIME;
110our $NOW; 126our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 137our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
123 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
124binmode STDOUT; 145binmode STDOUT;
125binmode STDERR; 146binmode STDERR;
126 147
127# read virtual server time, if available 148# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
132} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
133 156
134mkdir $_ 157mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 159
137our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
242for my $pkg (qw( 265for my $pkg (qw(
243 cf::global cf::attachable 266 cf::global cf::attachable
244 cf::object cf::object::player 267 cf::object cf::object::player
245 cf::client cf::player 268 cf::client cf::player
246 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
247 cf::map cf::party cf::region 271 cf::party cf::region
248)) { 272)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 274}
252 275
253$EV::DIED = sub { 276$EV::DIED = sub {
254 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 320
298sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
300 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
301=item cf::lock_wait $string 338=item cf::lock_wait $string
302 339
303Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
304 341
305=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
306 343
307Wait until the given lock is available and then acquires it and returns 344Wait 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, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
310returned. 347returned.
311 348
312Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 350deadlocked coro.
319 356
320Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
321 358
322=cut 359=cut
323 360
324our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 362
327sub lock_wait($) { 363sub lock_wait($) {
328 my ($key) = @_; 364 $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} 365}
341 366
342sub lock_acquire($) { 367sub lock_acquire($) {
343 my ($key) = @_; 368 $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} 369}
357 370
358sub lock_active($) { 371sub lock_active($) {
359 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 373}
363 374
364sub freeze_mainloop { 375sub freeze_mainloop {
365 tick_inhibit_inc; 376 tick_inhibit_inc;
366 377
367 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
368} 379}
369 380
370=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
371 382
372Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
427 } 438 }
428 } 439 }
429}; 440};
430 441
431sub get_slot($;$$) { 442sub get_slot($;$$) {
432 return if tick_inhibit; 443 return if tick_inhibit || $Coro::current == $Coro::main;
433 444
434 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
435 446
436 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
724 735
725############################################################################# 736#############################################################################
726 737
727=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
728 739
729Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
732 743
733In the following description, CLASS can be any of C<global>, C<object> 744In 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 745C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
785 796
786Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
788 799
789Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
791 802
792These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
793 804
794=over 4 805=over 4
1085 1096
1086sub reattach { 1097sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1099 my ($obj) = @_;
1089 1100
1101 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1103
1092 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1093 1105
1094 @$registry = (); 1106 @$registry = ();
1095 1107
1141 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1144 1156
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 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;
1162 aio_fsync $fh;
1163 }
1149 close $fh; 1164 aio_close $fh;
1150 1165
1151 if (@$objs) { 1166 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 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;
1173 aio_fsync $fh;
1174 }
1157 close $fh; 1175 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1177 }
1160 } else { 1178 } else {
1161 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1162 } 1180 }
1163 1181
1164 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1186 } else {
1166 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1167 } 1188 }
1168 } else { 1189 } else {
1169 aio_unlink $filename; 1190 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1171 } 1192 }
1262 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1263 1284
1264 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1265} 1286}
1266 1287
1288use File::Glob ();
1289
1267cf::player->attach ( 1290cf::player->attach (
1268 on_command => sub { 1291 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1270 1293
1271 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1303 1326
1304 cf::override; 1327 cf::override;
1305 }, 1328 },
1306); 1329);
1307 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1308sub load_extensions { 1344sub load_extensions {
1309 cf::sync_job { 1345 cf::sync_job {
1310 my %todo; 1346 my %todo;
1311 1347
1312 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1331 1367
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1370
1335 $ext{source} = 1371 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1338 . $source 1374 . $source
1339 . "\n};\n1"; 1375 . "\n};\n1";
1340 1376
1341 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1381 1417
1382=back 1418=back
1383 1419
1384=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1385 1421
1386Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1387 1423
1388=cut 1424=cut
1389 1425
1390package cf::player; 1426package cf::player;
1391 1427
1434 1470
1435sub exists($) { 1471sub exists($) {
1436 my ($login) = @_; 1472 my ($login) = @_;
1437 1473
1438 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1440} 1476}
1441 1477
1442sub find($) { 1478sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1480 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1493 or return;
1458 1494
1459 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1460 or return; 1496 or return;
1497
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1464 } 1501 }
1465 } 1502 }
1518 my ($pl) = @_; 1555 my ($pl) = @_;
1519 1556
1520 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1521 1558
1522 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1561
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1529 1568
1530 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1609
1571 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1572 my $path = path $login; 1611 my $path = path $login;
1573 1612
1574 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1619 }
1580 1620
1611 } 1651 }
1612 1652
1613 \@paths 1653 \@paths
1614} 1654}
1615 1655
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1657
1618Expand crossfire pod fragments into protocol xml. 1658Expand 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 1659
1709=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1710 1661
1711Sends an ext reply to the player. 1662Sends an ext reply to the player.
1712 1663
1925 1876
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1928} 1879}
1929 1880
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 { 1881sub decay_objects {
1940 my ($self) = @_; 1882 my ($self) = @_;
1941 1883
1942 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1943 1885
2025sub find { 1967sub find {
2026 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2027 1969
2028 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2029 1971
2030 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1974
2033 $cf::MAP{$path} || do { 1975 $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 1976 my $map = new_from_path cf::map $path
2038 or return; 1977 or return;
2039 1978
2040 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2041 1980
2043 or return; 1982 or return;
2044 1983
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
2048 undef $guard1; 1988 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1989 $map->reset;
2051 return find $path; 1990 return find $path;
2052 } 1991 }
2053 1992
2054 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2021 $f->skip_block;
2083 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2084 or return; 2023 or return;
2085 2024
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2087 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2088 2027
2089 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2029 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
2108 2047
2109 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2049 $self->decay_objects;
2111 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2112 $self->update_buttons; 2051 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2052 cf::cede_to_tick;
2116 $self->activate; 2053 $self->activate;
2117 } 2054 }
2118 2055
2119 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2457can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2395dialogue with the given NPC character.
2459 2396
2460=cut 2397=cut
2461 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2462# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2414# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2430
2480 } else { 2431 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2434 }
2484 } 2435 }
2485} 2436}
2486 2437
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2463
2513=item $player_object->enter_link 2464=item $player_object->enter_link
2514 2465
2515Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2516 2467
2517The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2519 2472
2520Will never block. 2473Will never block.
2521 2474
2522=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2523 2476
2581 2534
2582 $map->load; 2535 $map->load;
2583 $map->load_neighbours; 2536 $map->load_neighbours;
2584 2537
2585 return unless $self->contr->active; 2538 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2539
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2542
2543 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive;
2590} 2545}
2591 2546
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2548
2594Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2551that 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 2552the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2599 2557
2600=cut 2558=cut
2601 2559
2602our $GOTOGEN; 2560our $GOTOGEN;
2603 2561
2682} 2640}
2683 2641
2684sub prepare_random_map { 2642sub prepare_random_map {
2685 my ($exit) = @_; 2643 my ($exit) = @_;
2686 2644
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2647 # that depends on the exit object
2692 2648
2693 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2651 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2700 } 2658 }
2701 2659
2702 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2703 2661
2704 my $data = cf::encode_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2707 2665
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2668 undef $fh;
2711 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2712 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2715 } 2677 }
2716} 2678}
2717 2679
2718sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2720 2682
2721 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2722 2684
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; 2685 $self->enter_link;
2735 2686
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 { 2687 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2742 2689
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2745 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2746 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2747 1; 2711 1
2748 }) { 2712 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2717
2754 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2784 id => "infobox",
2821 title => "Body Parts", 2785 title => "Body Parts",
2822 reply => undef, 2786 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2787 tooltip => "Shows which body parts you posess and are available",
2824 }, 2788 },
2789 "c/statistics" => {
2790 id => "infobox",
2791 title => "Statistics",
2792 reply => undef,
2793 tooltip => "Shows your primary statistics",
2794 },
2795 "c/skills" => {
2796 id => "infobox",
2797 title => "Skills",
2798 reply => undef,
2799 tooltip => "Shows your experience per skill and item power",
2800 },
2801 "c/shopitems" => {
2802 id => "infobox",
2803 title => "Shop Items",
2804 reply => undef,
2805 tooltip => "Shows the items currently for sale in this shop",
2806 },
2807 "c/resistances" => {
2808 id => "infobox",
2809 title => "Resistances",
2810 reply => undef,
2811 tooltip => "Shows your resistances",
2812 },
2813 "c/pets" => {
2814 id => "infobox",
2815 title => "Pets",
2816 reply => undef,
2817 tooltip => "Shows information abotu your pets/a specific pet",
2818 },
2819 "c/perceiveself" => {
2820 id => "infobox",
2821 title => "Perceive Self",
2822 reply => undef,
2823 tooltip => "You gained detailed knowledge about yourself",
2824 },
2825 "c/uptime" => { 2825 "c/uptime" => {
2826 id => "infobox", 2826 id => "infobox",
2827 title => "Uptime", 2827 title => "Uptime",
2828 reply => undef, 2828 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2829 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2832 id => "infobox",
2833 title => "Map Info", 2833 title => "Map Info",
2834 reply => undef, 2834 reply => undef,
2835 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2836 }, 2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2843 "c/death" => {
2844 id => "death",
2845 title => "Death",
2846 reply => undef,
2847 tooltip => "Reason for and more info about your most recent death",
2848 },
2849 "c/say" => $SAY_CHANNEL,
2850 "c/chat" => $CHAT_CHANNEL,
2837); 2851);
2838 2852
2839sub cf::client::send_msg { 2853sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2854 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2855
2842 $msg = $self->pl->expand_cfpod ($msg); 2856 $msg = $self->pl->expand_cfpod ($msg)
2857 unless $color & cf::NDI_VERBATIM;
2843 2858
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2859 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2860
2846 # check predefined channels, for the benefit of C 2861 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2862 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2863 $channel = $CHANNEL{$channel};
2849 2864
2850 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2866 $channel = $channel->{id};
2854 2867
2855 } elsif (ref $channel) { 2868 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2869 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2870 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2871 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2872 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2873 }
2862 2874
2863 $channel = $channel->{id}; 2875 $channel = $channel->{id};
2864 } 2876 }
2865 2877
2866 return unless @extra || length $msg; 2878 return unless @extra || length $msg;
2867 2879
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2880 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2881 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2882 if $color & cf::NDI_DEF;
2872 2883
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2884 my $pkt = "msg "
2885 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2887 );
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 2888
2887 $color &= cf::NDI_COLOR_MASK; 2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2888 2892
2889 utf8::encode $msg; 2893 # split very large packets
2890 2894 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2896 $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 } 2897 }
2898
2899 $self->send_packet ($pkt);
2900} 2900}
2901 2901
2902=item $client->ext_msg ($type, @msg) 2902=item $client->ext_msg ($type, @msg)
2903 2903
2904Sends an ext event to the client. 2904Sends an ext event to the client.
3078 3078
3079The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3080 3080
3081 cf::object 3081 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3084 value
3084 3085
3085 cf::object::player 3086 cf::object::player
3086 player 3087 player
3087 3088
3088 cf::player 3089 cf::player
3093 3094
3094=cut 3095=cut
3095 3096
3096for ( 3097for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3098 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3099 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3100 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3101 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3102 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3103 ["cf::map" => qw(trigger)],
3103) { 3104) {
3104 no strict 'refs'; 3105 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3106 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3124 my ($code, %vars) = @_;
3124 3125
3125 my $qcode = $code; 3126 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3128 $qcode =~ s/\n/\\n/g;
3129
3130 %vars = (_dummy => 0) unless %vars;
3128 3131
3129 local $_; 3132 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3133 local @safe::cf::_safe_eval_args = values %vars;
3131 3134
3132 my $eval = 3135 my $eval =
3312 while (my ($k, $v) = each %$want) { 3315 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3316 $ns->fx_want ($k, $v);
3314 } 3317 }
3315}; 3318};
3316 3319
3320sub load_resource_file($) {
3321 my $guard = lock_acquire "load_resource_file";
3322
3323 my $status = load_resource_file_ $_[0];
3324 get_slot 0.1, 100;
3325 cf::arch::commit_load;
3326
3327 $status
3328}
3329
3317sub reload_regions { 3330sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3331 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3332 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3333 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3334
3334} 3347}
3335 3348
3336sub reload_archetypes { 3349sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3350 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3351 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} 3352}
3345 3353
3346sub reload_treasures { 3354sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3355 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3356 or die "unable to load treasurelists\n";
3349} 3357}
3350 3358
3351sub reload_resources { 3359sub reload_resources {
3352 warn "reloading resource files...\n"; 3360 warn "reloading resource files...\n";
3353 3361
3362 reload_facedata;
3363 reload_archetypes;
3354 reload_regions; 3364 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3365 reload_treasures;
3359 3366
3360 warn "finished reloading resource files\n"; 3367 warn "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3368}
3366 3369
3367sub reload_config { 3370sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3372 or return;
3383 }; 3386 };
3384 warn $@ if $@; 3387 warn $@ if $@;
3385 } 3388 }
3386} 3389}
3387 3390
3391sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!";
3394 flock $fh, &Fcntl::LOCK_EX
3395 or die "$PIDFILE: flock: $!";
3396 $fh
3397}
3398
3399# make sure only one server instance is running at any one time
3400sub atomic {
3401 my $fh = pidfile;
3402
3403 my $pid = <$fh>;
3404 kill 9, $pid if $pid > 0;
3405
3406 seek $fh, 0, 0;
3407 print $fh $$;
3408}
3409
3410sub main_loop {
3411 warn "EV::loop starting\n";
3412 if (1) {
3413 EV::loop;
3414 }
3415 warn "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP;
3417}
3418
3388sub main { 3419sub main {
3420 cf::init_globals; # initialise logging
3421
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433
3389 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3437 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3396 }; 3441 };
3397 3442
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; 3443 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3444
3445 cf::sync_job {
3446 reload_resources;
3447 reload_config;
3448 db_init;
3449
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid;
3453 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills;
3456
3457 cf::init_beforeplay;
3458
3459 atomic;
3460
3461 load_extensions;
3462
3463 utime time, time, $RUNTIMEFILE;
3464
3465 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468
3469 (pop @POST_INIT)->(0) while @POST_INIT;
3470 };
3471
3472 main_loop;
3405} 3473}
3406 3474
3407############################################################################# 3475#############################################################################
3408# initialisation and cleanup 3476# initialisation and cleanup
3409 3477
3416 }; 3484 };
3417 } 3485 }
3418} 3486}
3419 3487
3420sub write_runtime_sync { 3488sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3489 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3490 # the fsync below can take a very very long time.
3425 3491
3426 IO::AIO::aio_utime $runtime, undef, undef; 3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3493
3428 my $guard = cf::lock_acquire "write_runtime"; 3494 my $guard = cf::lock_acquire "write_runtime";
3429 3495
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3497 or return;
3432 3498
3433 my $value = $cf::RUNTIME + 90 + 10; 3499 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3500 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3501 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3511 aio_utime $fh, undef, undef;
3446 3512
3447 close $fh 3513 close $fh
3448 or return; 3514 or return;
3449 3515
3450 aio_rename "$runtime~", $runtime 3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3517 and return;
3452 3518
3453 warn "runtime file written.\n"; 3519 warn "runtime file written.\n";
3454 3520
3455 1 3521 1
3467 my $uuid = "$LOCALDIR/uuid"; 3533 my $uuid = "$LOCALDIR/uuid";
3468 3534
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3535 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3536 or return;
3471 3537
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3538 my $value = uuid_seq uuid_cur;
3539
3540 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n";
3542 return;
3543 }
3544
3545 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3546 $uuid_skip = 0;
3474 3547
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3548 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3549 and return;
3477 3550
3499} 3572}
3500 3573
3501sub emergency_save() { 3574sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3575 my $freeze_guard = cf::freeze_mainloop;
3503 3576
3504 warn "enter emergency perl save\n"; 3577 warn "emergency_perl_save: enter\n";
3505 3578
3506 cf::sync_job { 3579 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584
3507 # use a peculiar iteration method to avoid tripping on perl 3585 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3586 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3587 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3588 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3589 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3590 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3591 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3593 $pl->save;
3516 } 3594 }
3517 warn "end emergency player save\n"; 3595 warn "emergency_perl_save: end player save\n";
3518 3596
3519 warn "begin emergency map save\n"; 3597 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3598 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3599 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3600 $map->valid or next;
3523 $map->save; 3601 $map->save;
3524 } 3602 }
3525 warn "end emergency map save\n"; 3603 warn "emergency_perl_save: end map save\n";
3526 3604
3527 warn "begin emergency database checkpoint\n"; 3605 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3606 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3607 warn "emergency_perl_save: end database checkpoint\n";
3530 3608
3531 warn "begin write uuid\n"; 3609 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3610 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3611 warn "emergency_perl_save: end write uuid\n";
3534 }; 3612 };
3535 3613
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3536 warn "leave emergency perl save\n"; 3619 warn "emergency_perl_save: leave\n";
3537} 3620}
3538 3621
3539sub post_cleanup { 3622sub post_cleanup {
3540 my ($make_core) = @_; 3623 my ($make_core) = @_;
3541 3624
3542 warn Carp::longmess "post_cleanup backtrace" 3625 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3626 if $make_core;
3627
3628 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$;
3630}
3631
3632# a safer delete_package, copied from Symbol
3633sub clear_package($) {
3634 my $pkg = shift;
3635
3636 # expand to full symbol table name if needed
3637 unless ($pkg =~ /^main::.*::$/) {
3638 $pkg = "main$pkg" if $pkg =~ /^::/;
3639 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3640 $pkg .= '::' unless $pkg =~ /::$/;
3641 }
3642
3643 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3644 my $stem_symtab = *{$stem}{HASH};
3645
3646 defined $stem_symtab and exists $stem_symtab->{$leaf}
3647 or return;
3648
3649 # clear all symbols
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 }
3655 warn "cleared package $pkg\n";#d#
3544} 3656}
3545 3657
3546sub do_reload_perl() { 3658sub do_reload_perl() {
3547 # can/must only be called in main 3659 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3660 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3661 warn "can only reload from main coroutine";
3550 return; 3662 return;
3551 } 3663 }
3552 3664
3665 return if $RELOAD++;
3666
3667 my $t1 = EV::time;
3668
3669 while ($RELOAD) {
3553 warn "reloading..."; 3670 warn "reloading...";
3554 3671
3555 warn "entering sync_job"; 3672 warn "entering sync_job";
3556 3673
3557 cf::sync_job { 3674 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3676 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3677 cf::write_runtime_sync; # external watchdog should not bark
3561 3678
3562 warn "syncing database to disk"; 3679 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3680 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3681
3565 # if anything goes wrong in here, we should simply crash as we already saved 3682 # if anything goes wrong in here, we should simply crash as we already saved
3566 3683
3567 warn "flushing outstanding aio requests"; 3684 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; 3685 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3686 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 } 3687 }
3599 3688
3600 warn "... nuking $pkg"; 3689 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3690 $_->cancel for values %EXT_CORO;
3602 } 3691 %EXT_CORO = ();
3603 3692
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3693 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3694 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3695
3696 warn "removing ext/exti commands";
3697 %EXTCMD = ();
3698 %EXTICMD = ();
3699
3700 warn "unloading/nuking all extensions";
3701 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3702 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3703
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3704 if (my $cb = $pkg->can ("unload")) {
3705 eval {
3615 $cb->(); 3706 $cb->($pkg);
3707 1
3708 } or warn "$pkg unloaded, but with errors: $@";
3709 }
3710
3711 warn "... clearing $pkg";
3712 clear_package $pkg;
3616 } 3713 }
3617 3714
3618 Symbol::delete_package $k; 3715 warn "unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718
3719 warn "... unloading $k";
3720 delete $INC{$k};
3721
3722 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g;
3724
3725 if (my $cb = $k->can ("unload_module")) {
3726 $cb->();
3727 }
3728
3729 clear_package $k;
3619 } 3730 }
3620 3731
3621 warn "getting rid of safe::, as good as possible"; 3732 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3733 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3735
3625 warn "unloading cf.pm \"a bit\""; 3736 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3737 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3739
3629 # don't, removes xs symbols, too, 3740 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3741 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3742 #clear_package __PACKAGE__;
3632 3743
3633 warn "unload completed, starting to reload now"; 3744 warn "unload completed, starting to reload now";
3634 3745
3635 warn "reloading cf.pm"; 3746 warn "reloading cf.pm";
3636 require cf; 3747 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3749
3639 warn "loading config and database again"; 3750 warn "loading config and database again";
3640 cf::reload_config; 3751 cf::reload_config;
3641 3752
3642 warn "loading extensions"; 3753 warn "loading extensions";
3643 cf::load_extensions; 3754 cf::load_extensions;
3644 3755
3756 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3757 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3758 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3759 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3760 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3761 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3762 reattach $_ for values %PLAYER;
3763 }
3651 3764
3765 warn "running post_init jobs";
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767
3652 warn "leaving sync_job"; 3768 warn "leaving sync_job";
3653 3769
3654 1 3770 1
3655 } or do { 3771 } or do {
3656 warn $@; 3772 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3773 cf::cleanup "error while reloading, exiting.";
3658 }; 3774 };
3659 3775
3660 warn "reloaded"; 3776 warn "reloaded";
3777 --$RELOAD;
3778 }
3779
3780 $t1 = EV::time - $t1;
3781 warn "reload completed in ${t1}s\n";
3661}; 3782};
3662 3783
3663our $RELOAD_WATCHER; # used only during reload 3784our $RELOAD_WATCHER; # used only during reload
3664 3785
3665sub reload_perl() { 3786sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3787 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3788 # coro crashes during coro_state_free->destroy here.
3668 3789
3790 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions;
3792
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3794 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3795 undef $RELOAD_WATCHER;
3796 };
3672 }; 3797 };
3673} 3798}
3674 3799
3675register_command "reload" => sub { 3800register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3801 my ($who, $arg) = @_;
3690 3815
3691our @WAIT_FOR_TICK; 3816our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3817our @WAIT_FOR_TICK_BEGIN;
3693 3818
3694sub wait_for_tick { 3819sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3820 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3821
3698 my $signal = new Coro::Signal; 3822 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3823 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3824 $signal->wait;
3701} 3825}
3702 3826
3703sub wait_for_tick_begin { 3827sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3828 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3829
3707 my $signal = new Coro::Signal; 3830 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3831 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3832 $signal->wait;
3710} 3833}
3749{ 3872{
3750 # configure BDB 3873 # configure BDB
3751 3874
3752 BDB::min_parallel 8; 3875 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3876 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3877 $AnyEvent::BDB::WATCHER->priority (1);
3755 3878
3756 unless ($DB_ENV) { 3879 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3880 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3883 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3884 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3885 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3886
3763 cf::sync_job { 3887 cf::sync_job {
3764 eval { 3888 eval {
3790{ 3914{
3791 # configure IO::AIO 3915 # configure IO::AIO
3792 3916
3793 IO::AIO::min_parallel 8; 3917 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3918 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3919 undef $AnyEvent::AIO::WATCHER;
3796} 3920}
3797 3921
3798my $_log_backtrace; 3922my $_log_backtrace;
3799 3923
3800sub _log_backtrace { 3924sub _log_backtrace {
3803 $msg =~ s/\n//; 3927 $msg =~ s/\n//;
3804 3928
3805 # limit the # of concurrent backtraces 3929 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3930 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3931 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg;
3808 async { 3933 async {
3809 $Coro::current->{desc} = "abt $msg"; 3934 $Coro::current->{desc} = "abt $msg";
3810 3935
3811 my @bt = fork_call { 3936 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3937 @addr = map { sprintf "%x", $_ } @addr;
3823 } 3948 }
3824 3949
3825 @funcs 3950 @funcs
3826 }; 3951 };
3827 3952
3828 LOG llevInfo, "[ABT] $msg\n"; 3953 LOG llevInfo, "[ABT] $perl_bt\n";
3954 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3955 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3956 --$_log_backtrace;
3831 }; 3957 };
3832 } else { 3958 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3959 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 3960 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 3961 }
3836} 3962}
3837 3963
3838# load additional modules 3964# load additional modules
3839use cf::pod; 3965require "cf/$_.pm" for @EXTRA_MODULES;
3840 3966
3841END { cf::emergency_save } 3967END { cf::emergency_save }
3842 3968
38431 39691
3844 3970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines