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.457 by root, Wed Oct 1 05:50:19 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
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
136
124binmode STDOUT; 137binmode STDOUT;
125binmode STDERR; 138binmode STDERR;
126 139
127# read virtual server time, if available 140# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
132} 145}
133 146
134mkdir $_ 147mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
242for my $pkg (qw( 255for my $pkg (qw(
243 cf::global cf::attachable 256 cf::global cf::attachable
244 cf::object cf::object::player 257 cf::object cf::object::player
245 cf::client cf::player 258 cf::client cf::player
246 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
247 cf::map cf::party cf::region 261 cf::party cf::region
248)) { 262)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 264}
252 265
253$EV::DIED = sub { 266$EV::DIED = sub {
254 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 310
298sub encode_json($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
300 313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
327
301=item cf::lock_wait $string 328=item cf::lock_wait $string
302 329
303Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
304 331
305=item my $lock = cf::lock_acquire $string 332=item my $lock = cf::lock_acquire $string
… …
332 return;#d# 359 return;#d#
333 }#d# 360 }#d#
334 361
335 # wait for lock, if any 362 # wait for lock, if any
336 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 366 Coro::schedule;
339 } 367 }
340} 368}
341 369
… …
427 } 455 }
428 } 456 }
429}; 457};
430 458
431sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
432 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
433 463
434 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
436 466
… …
722 752
723############################################################################# 753#############################################################################
724 754
725=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
726 756
727Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
730 760
731In the following description, CLASS can be any of C<global>, C<object> 761In 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 762C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
783 813
784Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
786 816
787Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
789 819
790These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
791 821
792=over 4 822=over 4
… …
1083 1113
1084sub reattach { 1114sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1116 my ($obj) = @_;
1087 1117
1118 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1120
1090 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1091 1122
1092 @$registry = (); 1123 @$registry = ();
1093 1124
… …
1139 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1142 1173
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1178 aio_close $fh;
1148 1179
1149 if (@$objs) { 1180 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1186 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1188 }
1158 } else { 1189 } else {
1159 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1160 } 1191 }
1161 1192
1162 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1197 } else {
1164 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1165 } 1199 }
1166 } else { 1200 } else {
1167 aio_unlink $filename; 1201 aio_unlink $filename;
… …
1260 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1261 1295
1262 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1263} 1297}
1264 1298
1299use File::Glob ();
1300
1265cf::player->attach ( 1301cf::player->attach (
1266 on_command => sub { 1302 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1268 1304
1269 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
… …
1301 1337
1302 cf::override; 1338 cf::override;
1303 }, 1339 },
1304); 1340);
1305 1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1354
1306sub load_extensions { 1355sub load_extensions {
1307 cf::sync_job { 1356 cf::sync_job {
1308 my %todo; 1357 my %todo;
1309 1358
1310 for my $path (<$LIBDIR/*.ext>) { 1359 for my $path (<$LIBDIR/*.ext>) {
… …
1329 1378
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1381
1333 $ext{source} = 1382 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1336 . $source 1385 . $source
1337 . "\n};\n1"; 1386 . "\n};\n1";
1338 1387
1339 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
… …
1379 1428
1380=back 1429=back
1381 1430
1382=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1383 1432
1384Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1385 1434
1386=cut 1435=cut
1387 1436
1388package cf::player; 1437package cf::player;
1389 1438
… …
1432 1481
1433sub exists($) { 1482sub exists($) {
1434 my ($login) = @_; 1483 my ($login) = @_;
1435 1484
1436 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1438} 1487}
1439 1488
1440sub find($) { 1489sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1491 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1503 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1504 or return;
1456 1505
1457 my $pl = cf::player::load_pl $f 1506 my $pl = cf::player::load_pl $f
1458 or return; 1507 or return;
1508
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1509 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1510 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1462 } 1512 }
1463 } 1513 }
… …
1473 1523
1474 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1475 1525
1476 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1528
1529 cf::get_slot 0.01;
1478 1530
1479 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1532 cf::cede_to_tick;
1481} 1533}
1482 1534
… …
1514 my ($pl) = @_; 1566 my ($pl) = @_;
1515 1567
1516 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1517 1569
1518 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1572
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1525 1579
1526 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1620
1567 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1568 my $path = path $login; 1622 my $path = path $login;
1569 1623
1570 # a .pst is a dead give-away for a valid player 1624 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1630 }
1576 1631
… …
1607 } 1662 }
1608 1663
1609 \@paths 1664 \@paths
1610} 1665}
1611 1666
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1668
1614Expand crossfire pod fragments into protocol xml. 1669Expand 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 1670
1705=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1706 1672
1707Sends an ext reply to the player. 1673Sends an ext reply to the player.
1708 1674
… …
2025 1991
2026 cf::lock_wait "map_data:$path";#d#remove 1992 cf::lock_wait "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
2028 1994
2029 $cf::MAP{$path} || do { 1995 $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 1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1998
2033 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
2034 or return; 2000 or return;
2035 2001
2036 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
… …
2039 or return; 2005 or return;
2040 2006
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
2044 undef $guard1; 2011 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2012 $map->reset;
2047 return find $path; 2013 return find $path;
2048 } 2014 }
2049 2015
2050 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2043 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2044 $f->skip_block;
2079 $self->_load_objects ($f) 2045 $self->_load_objects ($f)
2080 or return; 2046 or return;
2081 2047
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
2083 if delete $self->{load_original}; 2049 if delete $self->{load_original};
2084 2050
2085 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2052 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2053 unless (aio_stat $uniq) {
… …
2113 } 2079 }
2114 2080
2115 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
2117 2083
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2085 }
2120 2086
2121 $self->post_load; 2087 $self->post_load;
2122} 2088}
2123 2089
… …
2181 my ($path, $origin, $load) = @_; 2147 my ($path, $origin, $load) = @_;
2182 2148
2183 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2184 2150
2185 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2153 }
2188 2154
2189 $MAP_PREFETCH{$path} |= $load; 2155 $MAP_PREFETCH{$path} |= $load;
2190 2156
2191 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2194 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2195 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2231 }; 2197 };
2232 2198
2199 cf::get_slot 0.02;
2200
2233 if ($uniq) { 2201 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2204 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2213 $self->save;
2246 2214
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2216
2249 return if $self->players; 2217 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2252 2220
2253 $self->in_memory (cf::MAP_SWAPPED); 2221 $self->in_memory (cf::MAP_SWAPPED);
2254 2222
2255 $self->deactivate; 2223 $self->deactivate;
… …
2451can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2420dialogue with the given NPC character.
2453 2421
2454=cut 2422=cut
2455 2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2437
2456# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2439# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2442 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2455
2474 } else { 2456 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2459 }
2478 } 2460 }
2479} 2461}
2480 2462
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2506 2488
2507=item $player_object->enter_link 2489=item $player_object->enter_link
2508 2490
2509Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2510 2492
2511The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2512I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2513 2497
2514Will never block. 2498Will never block.
2515 2499
2516=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2517 2501
… …
2575 2559
2576 $map->load; 2560 $map->load;
2577 $map->load_neighbours; 2561 $map->load_neighbours;
2578 2562
2579 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2580 $self->activate_recursive; 2565 $self->activate_recursive;
2581 2566
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2584} 2569}
… …
2588Moves the player to the given map-path and coordinates by first freezing 2573Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2575that 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 2576the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2577be called at the end of this process.
2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2593 2581
2594=cut 2582=cut
2595 2583
2596our $GOTOGEN; 2584our $GOTOGEN;
2597 2585
… …
2676} 2664}
2677 2665
2678sub prepare_random_map { 2666sub prepare_random_map {
2679 my ($exit) = @_; 2667 my ($exit) = @_;
2680 2668
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2671 # that depends on the exit object
2686 2672
2687 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2675 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2694 } 2682 }
2695 2683
2696 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2697 2685
2698 my $data = cf::encode_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2701 2689
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2692 undef $fh;
2705 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2706 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2709 } 2701 }
2710} 2702}
2711 2703
2712sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2714 2706
2715 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2716 2708
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; 2709 $self->enter_link;
2729 2710
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 { 2711 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2712 $Coro::current->{desc} = "enter_exit";
2736 2713
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2739 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2740 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2741 1; 2735 1
2742 }) { 2736 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2741
2748 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
… …
2814 id => "infobox", 2808 id => "infobox",
2815 title => "Body Parts", 2809 title => "Body Parts",
2816 reply => undef, 2810 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available", 2811 tooltip => "Shows which body parts you posess and are available",
2818 }, 2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2819 "c/uptime" => { 2819 "c/uptime" => {
2820 id => "infobox", 2820 id => "infobox",
2821 title => "Uptime", 2821 title => "Uptime",
2822 reply => undef, 2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart", 2823 tooltip => "How long the server has been running since last restart",
… …
2826 id => "infobox", 2826 id => "infobox",
2827 title => "Map Info", 2827 title => "Map Info",
2828 reply => undef, 2828 reply => undef,
2829 tooltip => "Information related to the maps", 2829 tooltip => "Information related to the maps",
2830 }, 2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2831); 2837);
2832 2838
2833sub cf::client::send_msg { 2839sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2841
2836 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2837 2844
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 2846
2840 # check predefined channels, for the benefit of C 2847 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 2848 if ($CHANNEL{$channel}) {
… …
2862 if ($self->can_msg) { 2869 if ($self->can_msg) {
2863 # default colour, mask it out 2870 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2866 2873
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2869 } else { 2890 } else {
2870 if ($color >= 0) { 2891 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2872 for ($msg) { 2893 for ($msg) {
2873 1 while 2894 1 while
… …
3072 3093
3073The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
3074 3095
3075 cf::object 3096 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3097 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3098 insert remove name archname title slaying race decrease split
3078 3099
3079 cf::object::player 3100 cf::object::player
3080 player 3101 player
3081 3102
3082 cf::player 3103 cf::player
… …
3087 3108
3088=cut 3109=cut
3089 3110
3090for ( 3111for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3113 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3114 decrease split destroy change_exp)],
3094 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
3096 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
3097) { 3118) {
3098 no strict 'refs'; 3119 no strict 'refs';
… …
3306 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
3308 } 3329 }
3309}; 3330};
3310 3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3341
3311sub reload_regions { 3342sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3343 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3344 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3346
… …
3328} 3359}
3329 3360
3330sub reload_archetypes { 3361sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3363 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} 3364}
3339 3365
3340sub reload_treasures { 3366sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
3343} 3369}
3344 3370
3345sub reload_resources { 3371sub reload_resources {
3346 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
3347 3373
3374 reload_facedata;
3375 reload_archetypes;
3348 reload_regions; 3376 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3377 reload_treasures;
3353 3378
3354 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3355}
3356
3357sub init {
3358 reload_resources;
3359} 3380}
3360 3381
3361sub reload_config { 3382sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3363 or return; 3384 or return;
… …
3377 }; 3398 };
3378 warn $@ if $@; 3399 warn $@ if $@;
3379 } 3400 }
3380} 3401}
3381 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3382sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3383 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3441 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3443 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3390 }; 3445 };
3391 3446
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; 3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3451 reload_config;
3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3465 load_extensions;
3466
3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
3398 EV::loop; 3475 EV::loop;
3399} 3476}
3400 3477
3401############################################################################# 3478#############################################################################
3402# initialisation and cleanup 3479# initialisation and cleanup
… …
3410 }; 3487 };
3411 } 3488 }
3412} 3489}
3413 3490
3414sub write_runtime_sync { 3491sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3419 3494
3420 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3496
3422 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3423 3498
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3500 or return;
3426 3501
3427 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
… …
3439 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3440 3515
3441 close $fh 3516 close $fh
3442 or return; 3517 or return;
3443 3518
3444 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3520 and return;
3446 3521
3447 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3448 3523
3449 1 3524 1
… …
3461 my $uuid = "$LOCALDIR/uuid"; 3536 my $uuid = "$LOCALDIR/uuid";
3462 3537
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return; 3539 or return;
3465 3540
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3467 $uuid_skip = 0; 3549 $uuid_skip = 0;
3468 3550
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return; 3552 and return;
3471 3553
… …
3493} 3575}
3494 3576
3495sub emergency_save() { 3577sub emergency_save() {
3496 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3497 3579
3498 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3499 3581
3500 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3501 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3502 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3503 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3504 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3505 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3506 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3507 $pl->valid or next; 3594 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3509 $pl->save; 3596 $pl->save;
3510 } 3597 }
3511 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3512 3599
3513 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3514 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3515 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3516 $map->valid or next; 3603 $map->valid or next;
3517 $map->save; 3604 $map->save;
3518 } 3605 }
3519 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3520 3607
3521 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3522 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3523 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3524 3611
3525 warn "begin write uuid\n"; 3612 warn "emergency_perl_save: begin write uuid\n";
3526 write_uuid_sync 1; 3613 write_uuid_sync 1;
3527 warn "end write uuid\n"; 3614 warn "emergency_perl_save: end write uuid\n";
3528 }; 3615 };
3529 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3530 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3531} 3623}
3532 3624
3533sub post_cleanup { 3625sub post_cleanup {
3534 my ($make_core) = @_; 3626 my ($make_core) = @_;
3535 3627
3536 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3538} 3659}
3539 3660
3540sub do_reload_perl() { 3661sub do_reload_perl() {
3541 # can/must only be called in main 3662 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3544 return; 3665 return;
3545 } 3666 }
3546 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3547 warn "reloading..."; 3673 warn "reloading...";
3548 3674
3549 warn "entering sync_job"; 3675 warn "entering sync_job";
3550 3676
3551 cf::sync_job { 3677 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3679 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3555 3681
3556 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3684
3559 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3560 3686
3561 warn "flushing outstanding aio requests"; 3687 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; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3689 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 } 3690 }
3593 3691
3594 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3596 } 3694 %EXT_CORO = ();
3597 3695
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3706
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3609 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3610 } 3716 }
3611 3717
3612 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3613 } 3733 }
3614 3734
3615 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3738
3619 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3622 3742
3623 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3744 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3626 3746
3627 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3628 3748
3629 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3630 require cf; 3750 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3752
3633 warn "loading config and database again"; 3753 warn "loading config and database again";
3634 cf::reload_config; 3754 cf::reload_config;
3635 3755
3636 warn "loading extensions"; 3756 warn "loading extensions";
3637 cf::load_extensions; 3757 cf::load_extensions;
3638 3758
3759 if ($REATTACH_ON_RELOAD) {
3639 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3645 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3646 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3647 3772
3648 1 3773 1
3649 } or do { 3774 } or do {
3650 warn $@; 3775 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3652 }; 3777 };
3653 3778
3654 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3655}; 3785};
3656 3786
3657our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3658 3788
3659sub reload_perl() { 3789sub reload_perl() {
3660 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3661 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3662 3792
3793 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions;
3795
3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3664 do_reload_perl; 3797 do_reload_perl;
3665 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3799 };
3666 }; 3800 };
3667} 3801}
3668 3802
3669register_command "reload" => sub { 3803register_command "reload" => sub {
3670 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
… …
3684 3818
3685our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3687 3821
3688sub wait_for_tick { 3822sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3824
3692 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3827 $signal->wait;
3695} 3828}
3696 3829
3697sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3832
3701 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3835 $signal->wait;
3704} 3836}
… …
3743{ 3875{
3744 # configure BDB 3876 # configure BDB
3745 3877
3746 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3879 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3880 $AnyEvent::BDB::WATCHER->priority (1);
3749 3881
3750 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3889
3757 cf::sync_job { 3890 cf::sync_job {
3758 eval { 3891 eval {
… …
3784{ 3917{
3785 # configure IO::AIO 3918 # configure IO::AIO
3786 3919
3787 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3922 undef $AnyEvent::AIO::WATCHER;
3790} 3923}
3791 3924
3792my $_log_backtrace; 3925my $_log_backtrace;
3793 3926
3794sub _log_backtrace { 3927sub _log_backtrace {
… …
3797 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3798 3931
3799 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3801 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3802 async { 3936 async {
3803 $Coro::current->{desc} = "abt $msg"; 3937 $Coro::current->{desc} = "abt $msg";
3804 3938
3805 my @bt = fork_call { 3939 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
… …
3817 } 3951 }
3818 3952
3819 @funcs 3953 @funcs
3820 }; 3954 };
3821 3955
3822 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 3959 --$_log_backtrace;
3825 }; 3960 };
3826 } else { 3961 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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