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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 2008 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
36use Coro 4.50 (); 37use Coro ();
37use Coro::State; 38use Coro::State;
38use Coro::Handle; 39use Coro::Handle;
39use Coro::EV; 40use Coro::EV;
41use Coro::AnyEvent;
40use Coro::Timer; 42use Coro::Timer;
41use Coro::Signal; 43use Coro::Signal;
42use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
43use Coro::AIO; 46use Coro::AIO;
44use Coro::BDB; 47use Coro::BDB 1.6;
45use Coro::Storable; 48use Coro::Storable;
46use Coro::Util (); 49use Coro::Util ();
47 50
48use JSON::XS 2.01 (); 51use JSON::XS 2.01 ();
49use BDB (); 52use BDB ();
50use Data::Dumper; 53use Data::Dumper;
51use Digest::MD5; 54use Digest::MD5;
52use Fcntl; 55use Fcntl;
53use YAML (); 56use YAML ();
54use IO::AIO 2.51 (); 57use IO::AIO ();
55use Time::HiRes; 58use Time::HiRes;
56use Compress::LZF; 59use Compress::LZF;
57use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
58 63
59# configure various modules to our taste 64# configure various modules to our taste
60# 65#
61$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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 74
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 76
69our %COMMAND = (); 77our %COMMAND = ();
70our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 81our %EXTCMD = ();
74our %EXTICMD = (); 82our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
77 85
78our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 87our @EVENT;
80 88
81our $CONFDIR = confdir; 89our $CONFDIR = confdir;
82our $DATADIR = datadir; 90our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
92our %RESOURCE; 103our %RESOURCE;
93 104
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 107our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
99 109
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 113our $DB_ENV;
105 114
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 130our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
123 132
133our @POST_INIT;
134
124binmode STDOUT; 135binmode STDOUT;
125binmode STDERR; 136binmode STDERR;
126 137
127# read virtual server time, if available 138# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
132} 143}
133 144
134mkdir $_ 145mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 253for my $pkg (qw(
243 cf::global cf::attachable 254 cf::global cf::attachable
244 cf::object cf::object::player 255 cf::object cf::object::player
245 cf::client cf::player 256 cf::client cf::player
246 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
247 cf::map cf::party cf::region 259 cf::party cf::region
248)) { 260)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 262}
252 263
253$EV::DIED = sub { 264$EV::DIED = sub {
254 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 308
298sub encode_json($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
300 311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
325
301=item cf::lock_wait $string 326=item cf::lock_wait $string
302 327
303Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
304 329
305=item my $lock = cf::lock_acquire $string 330=item my $lock = cf::lock_acquire $string
… …
332 return;#d# 357 return;#d#
333 }#d# 358 }#d#
334 359
335 # wait for lock, if any 360 # wait for lock, if any
336 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 364 Coro::schedule;
339 } 365 }
340} 366}
341 367
… …
427 } 453 }
428 } 454 }
429}; 455};
430 456
431sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
432 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
433 461
434 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
436 464
… …
722 750
723############################################################################# 751#############################################################################
724 752
725=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
726 754
727Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
730 758
731In the following description, CLASS can be any of C<global>, C<object> 759In 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 760C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
783 811
784Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
786 814
787Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
789 817
790These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
791 819
792=over 4 820=over 4
… …
1083 1111
1084sub reattach { 1112sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1114 my ($obj) = @_;
1087 1115
1116 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1118
1090 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1091 1120
1092 @$registry = (); 1121 @$registry = ();
1093 1122
… …
1139 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1142 1171
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1176 aio_close $fh;
1148 1177
1149 if (@$objs) { 1178 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1184 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1186 }
1158 } else { 1187 } else {
1159 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1160 } 1189 }
… …
1329 1358
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1361
1333 $ext{source} = 1362 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1336 . $source 1365 . $source
1337 . "\n};\n1"; 1366 . "\n};\n1";
1338 1367
1339 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1379 1408
1380=back 1409=back
1381 1410
1382=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1383 1412
1384Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1385 1414
1386=cut 1415=cut
1387 1416
1388package cf::player; 1417package cf::player;
1389 1418
… …
1432 1461
1433sub exists($) { 1462sub exists($) {
1434 my ($login) = @_; 1463 my ($login) = @_;
1435 1464
1436 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1438} 1467}
1439 1468
1440sub find($) { 1469sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1471 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1484 or return;
1456 1485
1457 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1458 or return; 1487 or return;
1488
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1462 } 1492 }
1463 } 1493 }
… …
1473 1503
1474 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1475 1505
1476 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1478 1510
1479 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1512 cf::cede_to_tick;
1481} 1513}
1482 1514
… …
1514 my ($pl) = @_; 1546 my ($pl) = @_;
1515 1547
1516 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1517 1549
1518 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1552
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1525 1559
1526 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1600
1567 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1568 my $path = path $login; 1602 my $path = path $login;
1569 1603
1570 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1610 }
1576 1611
… …
1607 } 1642 }
1608 1643
1609 \@paths 1644 \@paths
1610} 1645}
1611 1646
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1648
1614Expand crossfire pod fragments into protocol xml. 1649Expand 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 1650
1705=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1706 1652
1707Sends an ext reply to the player. 1653Sends an ext reply to the player.
1708 1654
… …
1775our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1777 1723
1778sub generate_random_map { 1724sub generate_random_map {
1779 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1780 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1730 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1855
1907# the temporary/swap location 1856# the temporary/swap location
1908sub save_path { 1857sub save_path {
1909 my ($self) = @_; 1858 my ($self) = @_;
1910 1859
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1913} 1862}
1914 1863
1915# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1916sub uniq_path { 1865sub uniq_path {
1917 my ($self) = @_; 1866 my ($self) = @_;
1918 1867
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1921} 1870}
1922 1871
1923# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1924# all maps in C++... 1873# all maps in C++...
… …
2022 1971
2023 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
2025 1974
2026 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
2029 1978
2030 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
2031 or return; 1980 or return;
2032 1981
2033 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
… …
2036 or return; 1985 or return;
2037 1986
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
2041 undef $guard1; 1991 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1992 $map->reset;
2044 return find $path; 1993 return find $path;
2045 } 1994 }
2046 1995
2047 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2024 $f->skip_block;
2076 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2077 or return; 2026 or return;
2078 2027
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2080 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2081 2030
2082 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2032 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
… …
2110 } 2059 }
2111 2060
2112 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2114 2063
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2065 }
2117 2066
2118 $self->post_load; 2067 $self->post_load;
2119} 2068}
2120 2069
… …
2178 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2179 2128
2180 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2181 2130
2182 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2133 }
2185 2134
2186 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2187 2136
2188 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
… …
2225 cf::async { 2174 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2228 }; 2177 };
2229 2178
2179 cf::get_slot 0.02;
2180
2230 if ($uniq) { 2181 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2184 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2242 $self->save; 2193 $self->save;
2243 2194
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2196
2246 return if $self->players; 2197 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2249 2200
2250 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2251 2202
2252 $self->deactivate; 2203 $self->deactivate;
… …
2370 2321
2371sub unique_maps() { 2322sub unique_maps() {
2372 [ 2323 [
2373 map { 2324 map {
2374 utf8::decode $_; 2325 utf8::decode $_;
2375 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2376 ? normalise $_ 2329 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2331 ]
2380} 2332}
2381 2333
2382=back 2334=back
… …
2389 2341
2390=over 4 2342=over 4
2391 2343
2392=item $ob->inv_recursive 2344=item $ob->inv_recursive
2393 2345
2394Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2395 2348
2396=cut 2349=cut
2397 2350
2398sub inv_recursive_; 2351sub inv_recursive_;
2399sub inv_recursive_ { 2352sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2405} 2358}
2406 2359
2407=item $ref = $ob->ref 2360=item $ref = $ob->ref
2408 2361
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2410 2363
2411=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2412 2365
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2367even if the object actually exists. May block.
… …
2446can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2400dialogue with the given NPC character.
2448 2401
2449=cut 2402=cut
2450 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2451# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2419# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2435
2469 } else { 2436 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2439 }
2473 } 2440 }
2474} 2441}
2475 2442
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2468
2502=item $player_object->enter_link 2469=item $player_object->enter_link
2503 2470
2504Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2505 2472
2506The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2508 2477
2509Will never block. 2478Will never block.
2510 2479
2511=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2512 2481
… …
2570 2539
2571 $map->load; 2540 $map->load;
2572 $map->load_neighbours; 2541 $map->load_neighbours;
2573 2542
2574 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2545 $self->activate_recursive;
2576 2546
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2579} 2549}
… …
2583Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2557be called at the end of this process.
2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2588 2561
2589=cut 2562=cut
2590 2563
2591our $GOTOGEN; 2564our $GOTOGEN;
2592 2565
… …
2671} 2644}
2672 2645
2673sub prepare_random_map { 2646sub prepare_random_map {
2674 my ($exit) = @_; 2647 my ($exit) = @_;
2675 2648
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2651 # that depends on the exit object
2681 2652
2682 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2655 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2689 } 2662 }
2690 2663
2691 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2692 2665
2693 my $data = cf::encode_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2696 2669
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2672 undef $fh;
2700 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2701 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2704 } 2681 }
2705} 2682}
2706 2683
2707sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2709 2686
2710 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2711 2688
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2689 $self->enter_link;
2724 2690
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2691 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2731 2693
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2734 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2735 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2736 1; 2715 1
2737 }) { 2716 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2721
2743 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2809 id => "infobox", 2788 id => "infobox",
2810 title => "Body Parts", 2789 title => "Body Parts",
2811 reply => undef, 2790 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2813 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2814 "c/uptime" => { 2799 "c/uptime" => {
2815 id => "infobox", 2800 id => "infobox",
2816 title => "Uptime", 2801 title => "Uptime",
2817 reply => undef, 2802 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 2806 id => "infobox",
2822 title => "Map Info", 2807 title => "Map Info",
2823 reply => undef, 2808 reply => undef,
2824 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2825 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2826); 2817);
2827 2818
2828sub cf::client::send_msg { 2819sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2821
2831 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2832 2824
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2826
2835 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
… …
2857 if ($self->can_msg) { 2849 if ($self->can_msg) {
2858 # default colour, mask it out 2850 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2861 2853
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2864 } else { 2870 } else {
2865 if ($color >= 0) { 2871 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2867 for ($msg) { 2873 for ($msg) {
2868 1 while 2874 1 while
… …
3067 3073
3068The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3069 3075
3070 cf::object 3076 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3073 3079
3074 cf::object::player 3080 cf::object::player
3075 player 3081 player
3076 3082
3077 cf::player 3083 cf::player
… …
3082 3088
3083=cut 3089=cut
3084 3090
3085for ( 3091for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3092) { 3098) {
3093 no strict 'refs'; 3099 no strict 'refs';
… …
3301 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3303 } 3309 }
3304}; 3310};
3305 3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
3306sub reload_regions { 3322sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3324 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3326
… …
3323} 3339}
3324 3340
3325sub reload_archetypes { 3341sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3344}
3334 3345
3335sub reload_treasures { 3346sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3338} 3349}
3339 3350
3340sub reload_resources { 3351sub reload_resources {
3341 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3342 3353
3354 reload_facedata;
3355 reload_archetypes;
3343 reload_regions; 3356 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3357 reload_treasures;
3348 3358
3349 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3360}
3355 3361
3356sub reload_config { 3362sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3364 or return;
… …
3372 }; 3378 };
3373 warn $@ if $@; 3379 warn $@ if $@;
3374 } 3380 }
3375} 3381}
3376 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3377sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3378 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3421 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3423 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3385 }; 3425 };
3386 3426
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3445 load_extensions;
3446
3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3393 EV::loop; 3455 EV::loop;
3394} 3456}
3395 3457
3396############################################################################# 3458#############################################################################
3397# initialisation and cleanup 3459# initialisation and cleanup
… …
3405 }; 3467 };
3406 } 3468 }
3407} 3469}
3408 3470
3409sub write_runtime_sync { 3471sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3414 3474
3415 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3476
3417 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3418 3478
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3480 or return;
3421 3481
3422 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3435 3495
3436 close $fh 3496 close $fh
3437 or return; 3497 or return;
3438 3498
3439 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3500 and return;
3441 3501
3442 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3443 3503
3444 1 3504 1
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3516 my $uuid = "$LOCALDIR/uuid";
3457 3517
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3519 or return;
3460 3520
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3521 my $value = uuid_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3529 $uuid_skip = 0;
3463 3530
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3532 and return;
3466 3533
… …
3528sub post_cleanup { 3595sub post_cleanup {
3529 my ($make_core) = @_; 3596 my ($make_core) = @_;
3530 3597
3531 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3533} 3629}
3534 3630
3535sub do_reload_perl() { 3631sub do_reload_perl() {
3536 # can/must only be called in main 3632 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3539 return; 3635 return;
3540 } 3636 }
3541 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3542 warn "reloading..."; 3641 warn "reloading...";
3543 3642
3544 warn "entering sync_job"; 3643 warn "entering sync_job";
3545 3644
3546 cf::sync_job { 3645 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3647 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3550 3649
3551 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3652
3554 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3555 3654
3556 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3658 }
3588 3659
3589 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3591 } 3662 %EXT_CORO = ();
3592 3663
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3674
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3604 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3605 } 3684 }
3606 3685
3607 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3608 } 3701 }
3609 3702
3610 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3706
3614 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3617 3710
3618 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3712 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3621 3714
3622 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3623 3716
3624 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3625 require cf; 3718 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3720
3628 warn "loading config and database again"; 3721 warn "loading config and database again";
3629 cf::reload_config; 3722 cf::reload_config;
3630 3723
3631 warn "loading extensions"; 3724 warn "loading extensions";
3632 cf::load_extensions; 3725 cf::load_extensions;
3633 3726
3634 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3640 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3641 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3642 3738
3643 1 3739 1
3644 } or do { 3740 } or do {
3645 warn $@; 3741 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3647 }; 3743 };
3648 3744
3649 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3650}; 3748};
3651 3749
3652our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3653 3751
3654sub reload_perl() { 3752sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3657 3755
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3757 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3661 }; 3759 };
3662} 3760}
3663 3761
… …
3679 3777
3680our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3682 3780
3683sub wait_for_tick { 3781sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3783
3687 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3786 $signal->wait;
3690} 3787}
3691 3788
3692sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3791
3696 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3794 $signal->wait;
3699} 3795}
… …
3738{ 3834{
3739 # configure BDB 3835 # configure BDB
3740 3836
3741 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3839 $AnyEvent::BDB::WATCHER->priority (1);
3744 3840
3745 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3848
3752 cf::sync_job { 3849 cf::sync_job {
3753 eval { 3850 eval {
… …
3779{ 3876{
3780 # configure IO::AIO 3877 # configure IO::AIO
3781 3878
3782 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3881 undef $AnyEvent::AIO::WATCHER;
3785} 3882}
3786 3883
3787my $_log_backtrace; 3884my $_log_backtrace;
3788 3885
3789sub _log_backtrace { 3886sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3793 3890
3794 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3797 async { 3895 async {
3798 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3799 3897
3800 my @bt = fork_call { 3898 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 3910 }
3813 3911
3814 @funcs 3912 @funcs
3815 }; 3913 };
3816 3914
3817 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3918 --$_log_backtrace;
3820 }; 3919 };
3821 } else { 3920 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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