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.441 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 UTC

… …
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
97our %RESOURCE; 105our %RESOURCE;
98 106
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 109our $NEXT_TICK;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 132our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
126 134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
138
127binmode STDOUT; 139binmode STDOUT;
128binmode STDERR; 140binmode STDERR;
129 141
130# read virtual server time, if available 142# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
135} 147}
136 148
137mkdir $_ 149mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 312
301sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
303 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
304=item cf::lock_wait $string 330=item cf::lock_wait $string
305 331
306Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
307 333
308=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
309 335
310Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
311a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
313returned. 339returned.
314 340
315Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 342deadlocked coro.
… …
322 348
323Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
324 350
325=cut 351=cut
326 352
327our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 354
330sub lock_wait($) { 355sub lock_wait($) {
331 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 357}
344 358
345sub lock_acquire($) { 359sub lock_acquire($) {
346 my ($key) = @_; 360 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 361}
360 362
361sub lock_active($) { 363sub lock_active($) {
362 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 365}
366 366
367sub freeze_mainloop { 367sub freeze_mainloop {
368 tick_inhibit_inc; 368 tick_inhibit_inc;
369 369
370 Coro::guard \&tick_inhibit_dec; 370 &Guard::guard (\&tick_inhibit_dec);
371} 371}
372 372
373=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
374 374
375Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 727
728############################################################################# 728#############################################################################
729 729
730=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
731 731
732Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
735 735
736In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
737C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
788 788
789Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
791 791
792Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
794 794
795These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
796 796
797=over 4 797=over 4
… …
1164 } else { 1164 } else {
1165 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1166 } 1166 }
1167 1167
1168 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1172 } else {
1170 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1171 } 1174 }
1172 } else { 1175 } else {
1173 aio_unlink $filename; 1176 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1175 } 1178 }
… …
1266 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1267 1270
1268 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1269} 1272}
1270 1273
1274use File::Glob ();
1275
1271cf::player->attach ( 1276cf::player->attach (
1272 on_command => sub { 1277 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1274 1279
1275 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1306 } 1311 }
1307 1312
1308 cf::override; 1313 cf::override;
1309 }, 1314 },
1310); 1315);
1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1311 1329
1312sub load_extensions { 1330sub load_extensions {
1313 cf::sync_job { 1331 cf::sync_job {
1314 my %todo; 1332 my %todo;
1315 1333
… …
1385 1403
1386=back 1404=back
1387 1405
1388=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1389 1407
1390Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1391 1409
1392=cut 1410=cut
1393 1411
1394package cf::player; 1412package cf::player;
1395 1413
… …
1438 1456
1439sub exists($) { 1457sub exists($) {
1440 my ($login) = @_; 1458 my ($login) = @_;
1441 1459
1442 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1444} 1462}
1445 1463
1446sub find($) { 1464sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1466 my $login = $_[0];
… …
1523 my ($pl) = @_; 1541 my ($pl) = @_;
1524 1542
1525 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1526 1544
1527 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1528 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1529 1547
1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1531 $pl->deactivate; 1549 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score; 1551 $pl->ob->check_score;
… …
1619 } 1637 }
1620 1638
1621 \@paths 1639 \@paths
1622} 1640}
1623 1641
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1643
1626Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716 1645
1717=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1718 1647
1719Sends an ext reply to the player. 1648Sends an ext reply to the player.
1720 1649
… …
1933 1862
1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1935 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1936} 1865}
1937 1866
1938# and all this just because we cannot iterate over
1939# all maps in C++...
1940sub change_all_map_light {
1941 my ($change) = @_;
1942
1943 $_->change_map_light ($change)
1944 for grep $_->outdoor, values %cf::MAP;
1945}
1946
1947sub decay_objects { 1867sub decay_objects {
1948 my ($self) = @_; 1868 my ($self) = @_;
1949 1869
1950 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1951 1871
… …
2033sub find { 1953sub find {
2034 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2035 1955
2036 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2037 1957
2038 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2040 1960
2041 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
2045 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2046 or return; 1963 or return;
2047 1964
2048 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2049 1966
… …
2116 2033
2117 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2118 $self->decay_objects; 2035 $self->decay_objects;
2119 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2120 $self->update_buttons; 2037 $self->update_buttons;
2121 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick; 2038 cf::cede_to_tick;
2124 $self->activate; 2039 $self->activate;
2125 } 2040 }
2126 2041
2127 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2534 2449
2535=item $player_object->enter_link 2450=item $player_object->enter_link
2536 2451
2537Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2538 2453
2539The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2540I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2541 2458
2542Will never block. 2459Will never block.
2543 2460
2544=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2545 2462
… …
2603 2520
2604 $map->load; 2521 $map->load;
2605 $map->load_neighbours; 2522 $map->load_neighbours;
2606 2523
2607 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2608 $self->activate_recursive; 2526 $self->activate_recursive;
2609 2527
2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2611 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2612} 2530}
… …
2775 $self->contr->savebed ($map, $x, $y) 2693 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED); 2694 if $exit->flag (cf::FLAG_DAMNED);
2777 2695
2778 1 2696 1
2779 }) { 2697 }) {
2780 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2781 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2782 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2783 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2784 2702
2785 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2851 id => "infobox", 2769 id => "infobox",
2852 title => "Body Parts", 2770 title => "Body Parts",
2853 reply => undef, 2771 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2855 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2856 "c/uptime" => { 2798 "c/uptime" => {
2857 id => "infobox", 2799 id => "infobox",
2858 title => "Uptime", 2800 title => "Uptime",
2859 reply => undef, 2801 reply => undef,
2860 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
… …
2869 id => "party", 2811 id => "party",
2870 title => "Party", 2812 title => "Party",
2871 reply => "gsay ", 2813 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party", 2814 tooltip => "Messages and chat related to your party",
2873 }, 2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2874); 2824);
2875 2825
2876sub cf::client::send_msg { 2826sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2878 2828
2879 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2880 2831
2881 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882 2833
2883 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2886 2837
2887 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2891 2840
2892 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2897 if $self->can_msg;
2898 } 2846 }
2899 2847
2900 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2901 } 2849 }
2902 2850
2903 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2904 2852
2905 if ($self->can_msg) {
2906 # default colour, mask it out 2853 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2909 2856
2910 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2912 } else { 2860 );
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923 2861
2924 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2925 2865
2926 utf8::encode $msg; 2866 # split very large packets
2927 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2928 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2929 # COMMAND/INFO 2869 $pkt = "frag";
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 } 2870 }
2871
2872 $self->send_packet ($pkt);
2937} 2873}
2938 2874
2939=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2940 2876
2941Sends an ext event to the client. 2877Sends an ext event to the client.
… …
3399 reload_treasures; 3335 reload_treasures;
3400 3336
3401 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3402} 3338}
3403 3339
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410}
3411
3412sub reload_config { 3340sub reload_config {
3413 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3414 or return; 3342 or return;
3415 3343
3416 local $/; 3344 local $/;
… …
3428 }; 3356 };
3429 warn $@ if $@; 3357 warn $@ if $@;
3430 } 3358 }
3431} 3359}
3432 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3433sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3434 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3398 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3441 }; 3402 };
3442 3403
3443 { 3404 evthread_start IO::AIO::poll_fileno;
3444 my $guard = freeze_mainloop; 3405
3406 cf::sync_job {
3407 reload_resources;
3445 reload_config; 3408 reload_config;
3446 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3447 load_extensions; 3422 load_extensions;
3448 3423
3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3450 } 3430 };
3451 3431
3452 EV::loop; 3432 EV::loop;
3453} 3433}
3454 3434
3455############################################################################# 3435#############################################################################
… …
3464 }; 3444 };
3465 } 3445 }
3466} 3446}
3467 3447
3468sub write_runtime_sync { 3448sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime";
3470
3471 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3473 3451
3474 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3475 3453
3476 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3477 3455
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3479 or return; 3457 or return;
3480 3458
3481 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
… …
3493 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3494 3472
3495 close $fh 3473 close $fh
3496 or return; 3474 or return;
3497 3475
3498 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3499 and return; 3477 and return;
3500 3478
3501 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3502 3480
3503 1 3481 1
… …
3515 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3516 3494
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return; 3496 or return;
3519 3497
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3506 $uuid_skip = 0;
3522 3507
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return; 3509 and return;
3525 3510
… …
3547} 3532}
3548 3533
3549sub emergency_save() { 3534sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3551 3536
3552 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3553 3538
3554 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3555 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3556 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3557 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3558 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3559 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3560 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3561 $pl->valid or next; 3551 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3563 $pl->save; 3553 $pl->save;
3564 } 3554 }
3565 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3566 3556
3567 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3568 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3569 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3570 $map->valid or next; 3560 $map->valid or next;
3571 $map->save; 3561 $map->save;
3572 } 3562 }
3573 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3574 3564
3575 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3576 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3577 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3578 3568
3579 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3580 write_uuid_sync 1; 3570 write_uuid_sync 1;
3581 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3582 }; 3572 };
3583 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3584 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3585} 3580}
3586 3581
3587sub post_cleanup { 3582sub post_cleanup {
3588 my ($make_core) = @_; 3583 my ($make_core) = @_;
3589 3584
3590 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3591 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3592} 3590}
3593 3591
3594# a safer delete_package, copied from Symbol 3592# a safer delete_package, copied from Symbol
3595sub clear_package($) { 3593sub clear_package($) {
3596 my $pkg = shift; 3594 my $pkg = shift;
… …
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) { 3611 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"}; 3612 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 } 3614 }
3617 warn "cleared package #$pkg\n";#d# 3615 warn "cleared package $pkg\n";#d#
3618} 3616}
3619
3620our $RELOAD; # how many times to reload
3621 3617
3622sub do_reload_perl() { 3618sub do_reload_perl() {
3623 # can/must only be called in main 3619 # can/must only be called in main
3624 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3625 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3626 return; 3622 return;
3627 } 3623 }
3628 3624
3629 return if $RELOAD++; 3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3630 3628
3631 while ($RELOAD) { 3629 while ($RELOAD) {
3632 warn "reloading..."; 3630 warn "reloading...";
3633 3631
3634 warn "entering sync_job"; 3632 warn "entering sync_job";
… …
3713 cf::reload_config; 3711 cf::reload_config;
3714 3712
3715 warn "loading extensions"; 3713 warn "loading extensions";
3716 cf::load_extensions; 3714 cf::load_extensions;
3717 3715
3716 if ($REATTACH_ON_RELOAD) {
3718 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3719 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3720 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3721 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3723 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3724 3727
3725 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3726 3729
3727 1 3730 1
3728 } or do { 3731 } or do {
… …
3731 }; 3734 };
3732 3735
3733 warn "reloaded"; 3736 warn "reloaded";
3734 --$RELOAD; 3737 --$RELOAD;
3735 } 3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3736}; 3742};
3737 3743
3738our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3739 3745
3740sub reload_perl() { 3746sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3743 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3745 do_reload_perl; 3754 do_reload_perl;
3746 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3747 }; 3757 };
3748} 3758}
3749 3759
3750register_command "reload" => sub { 3760register_command "reload" => sub {
3751 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
… …
3877 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3878 3888
3879 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3882 async { 3893 async {
3883 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3884 3895
3885 my @bt = fork_call { 3896 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
… …
3897 } 3908 }
3898 3909
3899 @funcs 3910 @funcs
3900 }; 3911 };
3901 3912
3902 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace; 3916 --$_log_backtrace;
3905 }; 3917 };
3906 } else { 3918 } else {
3907 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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