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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35: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 "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 off
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
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 132our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
123 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
124binmode STDOUT; 139binmode STDOUT;
125binmode STDERR; 140binmode STDERR;
126 141
127# read virtual server time, if available 142# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
132} 147}
133 148
134mkdir $_ 149mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
242for my $pkg (qw( 257for my $pkg (qw(
243 cf::global cf::attachable 258 cf::global cf::attachable
244 cf::object cf::object::player 259 cf::object cf::object::player
245 cf::client cf::player 260 cf::client cf::player
246 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
247 cf::map cf::party cf::region 263 cf::party cf::region
248)) { 264)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 266}
252 267
253$EV::DIED = sub { 268$EV::DIED = sub {
254 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 312
298sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
300 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
301=item cf::lock_wait $string 330=item cf::lock_wait $string
302 331
303Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
304 333
305=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
306 335
307Wait until the given lock is available and then acquires it and returns 336Wait 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, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
310returned. 339returned.
311 340
312Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 342deadlocked coro.
319 348
320Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
321 350
322=cut 351=cut
323 352
324our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 354
327sub lock_wait($) { 355sub lock_wait($) {
328 my ($key) = @_; 356 $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} 357}
341 358
342sub lock_acquire($) { 359sub lock_acquire($) {
343 my ($key) = @_; 360 $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} 361}
357 362
358sub lock_active($) { 363sub lock_active($) {
359 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 365}
363 366
364sub freeze_mainloop { 367sub freeze_mainloop {
365 tick_inhibit_inc; 368 tick_inhibit_inc;
366 369
367 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
368} 371}
369 372
370=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
371 374
372Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
427 } 430 }
428 } 431 }
429}; 432};
430 433
431sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
432 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
433 438
434 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
436 441
722 727
723############################################################################# 728#############################################################################
724 729
725=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
726 731
727Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
730 735
731In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
783 788
784Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
786 791
787Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
789 794
790These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
791 796
792=over 4 797=over 4
1083 1088
1084sub reattach { 1089sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1091 my ($obj) = @_;
1087 1092
1093 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1095
1090 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1091 1097
1092 @$registry = (); 1098 @$registry = ();
1093 1099
1139 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1142 1148
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1153 aio_close $fh;
1148 1154
1149 if (@$objs) { 1155 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1161 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1163 }
1158 } else { 1164 } else {
1159 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1160 } 1166 }
1161 1167
1162 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1172 } else {
1164 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1165 } 1174 }
1166 } else { 1175 } else {
1167 aio_unlink $filename; 1176 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1169 } 1178 }
1260 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1261 1270
1262 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1263} 1272}
1264 1273
1274use File::Glob ();
1275
1265cf::player->attach ( 1276cf::player->attach (
1266 on_command => sub { 1277 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1268 1279
1269 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1301 1312
1302 cf::override; 1313 cf::override;
1303 }, 1314 },
1304); 1315);
1305 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1306sub load_extensions { 1330sub load_extensions {
1307 cf::sync_job { 1331 cf::sync_job {
1308 my %todo; 1332 my %todo;
1309 1333
1310 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1329 1353
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1356
1333 $ext{source} = 1357 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1336 . $source 1360 . $source
1337 . "\n};\n1"; 1361 . "\n};\n1";
1338 1362
1339 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1379 1403
1380=back 1404=back
1381 1405
1382=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1383 1407
1384Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1385 1409
1386=cut 1410=cut
1387 1411
1388package cf::player; 1412package cf::player;
1389 1413
1432 1456
1433sub exists($) { 1457sub exists($) {
1434 my ($login) = @_; 1458 my ($login) = @_;
1435 1459
1436 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1438} 1462}
1439 1463
1440sub find($) { 1464sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1466 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1479 or return;
1456 1480
1457 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1458 or return; 1482 or return;
1483
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1462 } 1487 }
1463 } 1488 }
1473 1498
1474 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1475 1500
1476 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1478 1505
1479 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1507 cf::cede_to_tick;
1481} 1508}
1482 1509
1514 my ($pl) = @_; 1541 my ($pl) = @_;
1515 1542
1516 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1517 1544
1518 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1547
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1525 1554
1526 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1595
1567 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1568 my $path = path $login; 1597 my $path = path $login;
1569 1598
1570 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1605 }
1576 1606
1607 } 1637 }
1608 1638
1609 \@paths 1639 \@paths
1610} 1640}
1611 1641
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1643
1614Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1645
1705=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1706 1647
1707Sends an ext reply to the player. 1648Sends an ext reply to the player.
1708 1649
1921 1862
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1924} 1865}
1925 1866
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933}
1934
1935sub decay_objects { 1867sub decay_objects {
1936 my ($self) = @_; 1868 my ($self) = @_;
1937 1869
1938 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1939 1871
2021sub find { 1953sub find {
2022 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2023 1955
2024 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2025 1957
2026 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1960
2029 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2034 or return; 1963 or return;
2035 1964
2036 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2037 1966
2039 or return; 1968 or return;
2040 1969
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2044 undef $guard1; 1974 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1975 $map->reset;
2047 return find $path; 1976 return find $path;
2048 } 1977 }
2049 1978
2050 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2007 $f->skip_block;
2079 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2080 or return; 2009 or return;
2081 2010
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2083 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2084 2013
2085 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2015 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2035 $self->decay_objects;
2107 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2108 $self->update_buttons; 2037 $self->update_buttons;
2109 cf::cede_to_tick; 2038 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2039 $self->activate;
2113 } 2040 }
2114 2041
2115 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
2117 2044
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2046 }
2120 2047
2121 $self->post_load; 2048 $self->post_load;
2122} 2049}
2123 2050
2181 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2182 2109
2183 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2184 2111
2185 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2114 }
2188 2115
2189 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2190 2117
2191 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2155 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2156 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2231 }; 2158 };
2232 2159
2160 cf::get_slot 0.02;
2161
2233 if ($uniq) { 2162 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2165 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2174 $self->save;
2246 2175
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2177
2249 return if $self->players; 2178 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2252 2181
2253 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2254 2183
2255 $self->deactivate; 2184 $self->deactivate;
2451can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2381dialogue with the given NPC character.
2453 2382
2454=cut 2383=cut
2455 2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2398
2456# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2400# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2471 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2416
2474 } else { 2417 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2420 }
2478 } 2421 }
2479} 2422}
2480 2423
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2506 2449
2507=item $player_object->enter_link 2450=item $player_object->enter_link
2508 2451
2509Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2510 2453
2511The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2512I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2513 2458
2514Will never block. 2459Will never block.
2515 2460
2516=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2517 2462
2575 2520
2576 $map->load; 2521 $map->load;
2577 $map->load_neighbours; 2522 $map->load_neighbours;
2578 2523
2579 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2580 $self->activate_recursive; 2526 $self->activate_recursive;
2581 2527
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2584} 2530}
2588Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2591the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2593 2542
2594=cut 2543=cut
2595 2544
2596our $GOTOGEN; 2545our $GOTOGEN;
2597 2546
2676} 2625}
2677 2626
2678sub prepare_random_map { 2627sub prepare_random_map {
2679 my ($exit) = @_; 2628 my ($exit) = @_;
2680 2629
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2632 # that depends on the exit object
2686 2633
2687 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2689 if ($exit->map) { 2636 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2694 } 2643 }
2695 2644
2696 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2697 2646
2698 my $data = cf::encode_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2701 2650
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2653 undef $fh;
2705 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2706 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2709 } 2662 }
2710} 2663}
2711 2664
2712sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2714 2667
2715 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2716 2669
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2670 $self->enter_link;
2729 2671
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2672 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2736 2674
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2739 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2740 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2741 1; 2696 1
2742 }) { 2697 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2702
2748 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2814 id => "infobox", 2769 id => "infobox",
2815 title => "Body Parts", 2770 title => "Body Parts",
2816 reply => undef, 2771 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2818 }, 2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2819 "c/uptime" => { 2780 "c/uptime" => {
2820 id => "infobox", 2781 id => "infobox",
2821 title => "Uptime", 2782 title => "Uptime",
2822 reply => undef, 2783 reply => undef,
2823 tooltip => "How long the server has been running since last restart", 2784 tooltip => "How long the server has been running since last restart",
2826 id => "infobox", 2787 id => "infobox",
2827 title => "Map Info", 2788 title => "Map Info",
2828 reply => undef, 2789 reply => undef,
2829 tooltip => "Information related to the maps", 2790 tooltip => "Information related to the maps",
2830 }, 2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2831); 2806);
2832 2807
2833sub cf::client::send_msg { 2808sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2810
2836 $msg = $self->pl->expand_cfpod ($msg); 2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2837 2813
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 2815
2840 # check predefined channels, for the benefit of C 2816 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 2817 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel}; 2818 $channel = $CHANNEL{$channel};
2843 2819
2844 $self->ext_msg (channel_info => $channel) 2820 $self->ext_msg (channel_info => $channel);
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id}; 2821 $channel = $channel->{id};
2848 2822
2849 } elsif (ref $channel) { 2823 } elsif (ref $channel) {
2850 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2851 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2852 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2853 $self->ext_msg (channel_info => $channel) 2827 $self->ext_msg (channel_info => $channel);
2854 if $self->can_msg;
2855 } 2828 }
2856 2829
2857 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2858 } 2831 }
2859 2832
2860 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2861 2834
2862 if ($self->can_msg) {
2863 # default colour, mask it out 2835 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2837 if $color & cf::NDI_DEF;
2866 2838
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2869 } else { 2842 );
2870 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones
2872 for ($msg) {
2873 1 while
2874 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2875 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2876 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2877 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2878 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2879 }
2880 2843
2881 $color &= cf::NDI_COLOR_MASK; 2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2882 2847
2883 utf8::encode $msg; 2848 # split very large packets
2884 2849 if (8192 < length $pkt and $self->{can_lzf}) {
2885 if (0 && $msg =~ /\[/) { 2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 # COMMAND/INFO 2851 $pkt = "frag";
2887 $self->send_packet ("drawextinfo $color 10 8 $msg")
2888 } else {
2889 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2890 $self->send_packet ("drawinfo $color $msg")
2891 }
2892 }
2893 } 2852 }
2853
2854 $self->send_packet ($pkt);
2894} 2855}
2895 2856
2896=item $client->ext_msg ($type, @msg) 2857=item $client->ext_msg ($type, @msg)
2897 2858
2898Sends an ext event to the client. 2859Sends an ext event to the client.
3072 3033
3073The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
3074 3035
3075 cf::object 3036 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3037 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3038 insert remove name archname title slaying race decrease split
3078 3039
3079 cf::object::player 3040 cf::object::player
3080 player 3041 player
3081 3042
3082 cf::player 3043 cf::player
3087 3048
3088=cut 3049=cut
3089 3050
3090for ( 3051for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3053 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3054 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
3097) { 3058) {
3098 no strict 'refs'; 3059 no strict 'refs';
3306 while (my ($k, $v) = each %$want) { 3267 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3268 $ns->fx_want ($k, $v);
3308 } 3269 }
3309}; 3270};
3310 3271
3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3275 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100;
3277 cf::arch::commit_load;
3278
3279 $status
3280}
3281
3311sub reload_regions { 3282sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3283 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3284 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3285 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3286
3328} 3299}
3329 3300
3330sub reload_archetypes { 3301sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3302 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3303 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3304}
3339 3305
3340sub reload_treasures { 3306sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3307 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3308 or die "unable to load treasurelists\n";
3343} 3309}
3344 3310
3345sub reload_resources { 3311sub reload_resources {
3346 warn "reloading resource files...\n"; 3312 warn "reloading resource files...\n";
3347 3313
3314 reload_facedata;
3315 reload_archetypes;
3348 reload_regions; 3316 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3317 reload_treasures;
3353 3318
3354 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
3355}
3356
3357sub init {
3358 reload_resources;
3359} 3320}
3360 3321
3361sub reload_config { 3322sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
3363 or return; 3324 or return;
3377 }; 3338 };
3378 warn $@ if $@; 3339 warn $@ if $@;
3379 } 3340 }
3380} 3341}
3381 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
3382sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
3383 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3380 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3382 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
3390 }; 3384 };
3391 3385
3392 reload_config;
3393 db_init;
3394 load_extensions;
3395
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3386 evthread_start IO::AIO::poll_fileno;
3387
3388 cf::sync_job {
3389 reload_resources;
3390 reload_config;
3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
3404 load_extensions;
3405
3406 utime time, time, $RUNTIMEFILE;
3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3412 };
3413
3398 EV::loop; 3414 EV::loop;
3399} 3415}
3400 3416
3401############################################################################# 3417#############################################################################
3402# initialisation and cleanup 3418# initialisation and cleanup
3410 }; 3426 };
3411 } 3427 }
3412} 3428}
3413 3429
3414sub write_runtime_sync { 3430sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
3419 3433
3420 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3435
3422 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
3423 3437
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3439 or return;
3426 3440
3427 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
3439 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
3440 3454
3441 close $fh 3455 close $fh
3442 or return; 3456 or return;
3443 3457
3444 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3459 and return;
3446 3460
3447 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
3448 3462
3449 1 3463 1
3461 my $uuid = "$LOCALDIR/uuid"; 3475 my $uuid = "$LOCALDIR/uuid";
3462 3476
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return; 3478 or return;
3465 3479
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3467 $uuid_skip = 0; 3488 $uuid_skip = 0;
3468 3489
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return; 3491 and return;
3471 3492
3493} 3514}
3494 3515
3495sub emergency_save() { 3516sub emergency_save() {
3496 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
3497 3518
3498 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
3499 3520
3500 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
3501 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
3502 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
3503 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3504 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
3505 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3506 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3507 $pl->valid or next; 3533 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3509 $pl->save; 3535 $pl->save;
3510 } 3536 }
3511 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
3512 3538
3513 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
3514 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
3515 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
3516 $map->valid or next; 3542 $map->valid or next;
3517 $map->save; 3543 $map->save;
3518 } 3544 }
3519 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
3520 3546
3521 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
3522 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3523 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3524 3550
3525 warn "begin write uuid\n"; 3551 warn "emergency_perl_save: begin write uuid\n";
3526 write_uuid_sync 1; 3552 write_uuid_sync 1;
3527 warn "end write uuid\n"; 3553 warn "emergency_perl_save: end write uuid\n";
3528 }; 3554 };
3529 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3530 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
3531} 3562}
3532 3563
3533sub post_cleanup { 3564sub post_cleanup {
3534 my ($make_core) = @_; 3565 my ($make_core) = @_;
3535 3566
3536 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
3538} 3598}
3539 3599
3540sub do_reload_perl() { 3600sub do_reload_perl() {
3541 # can/must only be called in main 3601 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3544 return; 3604 return;
3545 } 3605 }
3546 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
3547 warn "reloading..."; 3612 warn "reloading...";
3548 3613
3549 warn "entering sync_job"; 3614 warn "entering sync_job";
3550 3615
3551 cf::sync_job { 3616 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3618 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
3555 3620
3556 warn "syncing database to disk"; 3621 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3623
3559 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
3560 3625
3561 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = ();
3575
3576 warn "removing commands";
3577 %COMMAND = ();
3578
3579 warn "removing ext/exti commands";
3580 %EXTCMD = ();
3581 %EXTICMD = ();
3582
3583 warn "unloading/nuking all extensions";
3584 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg";
3586
3587 if (my $cb = $pkg->can ("unload")) {
3588 eval {
3589 $cb->($pkg);
3590 1
3591 } or warn "$pkg unloaded, but with errors: $@";
3592 } 3629 }
3593 3630
3594 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
3596 } 3633 %EXT_CORO = ();
3597 3634
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3644 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3645
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
3609 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
3610 } 3655 }
3611 3656
3612 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
3613 } 3672 }
3614 3673
3615 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3677
3619 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
3622 3681
3623 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3683 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
3626 3685
3627 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
3628 3687
3629 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
3630 require cf; 3689 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3691
3633 warn "loading config and database again"; 3692 warn "loading config and database again";
3634 cf::reload_config; 3693 cf::reload_config;
3635 3694
3636 warn "loading extensions"; 3695 warn "loading extensions";
3637 cf::load_extensions; 3696 cf::load_extensions;
3638 3697
3698 if ($REATTACH_ON_RELOAD) {
3639 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3645 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
3646 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3647 3711
3648 1 3712 1
3649 } or do { 3713 } or do {
3650 warn $@; 3714 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
3652 }; 3716 };
3653 3717
3654 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3655}; 3724};
3656 3725
3657our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3658 3727
3659sub reload_perl() { 3728sub reload_perl() {
3660 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3661 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3662 3731
3732 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions;
3734
3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3664 do_reload_perl; 3736 do_reload_perl;
3665 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3738 };
3666 }; 3739 };
3667} 3740}
3668 3741
3669register_command "reload" => sub { 3742register_command "reload" => sub {
3670 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
3684 3757
3685our @WAIT_FOR_TICK; 3758our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3759our @WAIT_FOR_TICK_BEGIN;
3687 3760
3688sub wait_for_tick { 3761sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3762 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3763
3692 my $signal = new Coro::Signal; 3764 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3765 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3766 $signal->wait;
3695} 3767}
3696 3768
3697sub wait_for_tick_begin { 3769sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3771
3701 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3773 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3774 $signal->wait;
3704} 3775}
3743{ 3814{
3744 # configure BDB 3815 # configure BDB
3745 3816
3746 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3818 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3819 $AnyEvent::BDB::WATCHER->priority (1);
3749 3820
3750 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3828
3757 cf::sync_job { 3829 cf::sync_job {
3758 eval { 3830 eval {
3784{ 3856{
3785 # configure IO::AIO 3857 # configure IO::AIO
3786 3858
3787 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3861 undef $AnyEvent::AIO::WATCHER;
3790} 3862}
3791 3863
3792my $_log_backtrace; 3864my $_log_backtrace;
3793 3865
3794sub _log_backtrace { 3866sub _log_backtrace {
3797 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3798 3870
3799 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3801 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3802 async { 3875 async {
3803 $Coro::current->{desc} = "abt $msg"; 3876 $Coro::current->{desc} = "abt $msg";
3804 3877
3805 my @bt = fork_call { 3878 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
3817 } 3890 }
3818 3891
3819 @funcs 3892 @funcs
3820 }; 3893 };
3821 3894
3822 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 3898 --$_log_backtrace;
3825 }; 3899 };
3826 } else { 3900 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines