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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
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;
… …
104our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 115our $DB_ENV;
108 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
109our %CFG; 119our %CFG;
110 120
111our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 122our $RUNTIME;
113our $NOW; 123our $NOW;
… …
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 134our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
126 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
127binmode STDOUT; 141binmode STDOUT;
128binmode STDERR; 142binmode STDERR;
129 143
130# read virtual server time, if available 144# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
135} 149}
136 150
137mkdir $_ 151mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
300 314
301sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
303 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
304=item cf::lock_wait $string 332=item cf::lock_wait $string
305 333
306Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
307 335
308=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
309 337
310Wait until the given lock is available and then acquires it and returns 338Wait 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, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
312for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
313returned. 341returned.
314 342
315Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro. 344deadlocked coro.
… …
322 350
323Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
324 352
325=cut 353=cut
326 354
327our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 356
330sub lock_wait($) { 357sub lock_wait($) {
331 my ($key) = @_; 358 $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} 359}
344 360
345sub lock_acquire($) { 361sub lock_acquire($) {
346 my ($key) = @_; 362 $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} 363}
360 364
361sub lock_active($) { 365sub lock_active($) {
362 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 367}
366 368
367sub freeze_mainloop { 369sub freeze_mainloop {
368 tick_inhibit_inc; 370 tick_inhibit_inc;
369 371
370 Coro::guard \&tick_inhibit_dec; 372 &Guard::guard (\&tick_inhibit_dec);
371} 373}
372 374
373=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
374 376
375Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
… …
727 729
728############################################################################# 730#############################################################################
729 731
730=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
731 733
732Many objects in crossfire are so-called attachable objects. That means you can 734Many objects in deliantra are so-called attachable objects. That means you can
733attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
735 737
736In the following description, CLASS can be any of C<global>, C<object> 738In 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 739C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
787=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
788 790
789Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
791 793
792Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
793that are attached at load/instantiate time, thus the need for a name. 795that are attached at load/instantiate time, thus the need for a name.
794 796
795These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
796 798
797=over 4 799=over 4
… …
1164 } else { 1166 } else {
1165 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1166 } 1168 }
1167 1169
1168 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1174 } else {
1170 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1171 } 1176 }
1172 } else { 1177 } else {
1173 aio_unlink $filename; 1178 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1175 } 1180 }
… …
1266 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1267 1272
1268 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1269} 1274}
1270 1275
1276use File::Glob ();
1277
1271cf::player->attach ( 1278cf::player->attach (
1272 on_command => sub { 1279 on_command => sub {
1273 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1274 1281
1275 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
… …
1306 } 1313 }
1307 1314
1308 cf::override; 1315 cf::override;
1309 }, 1316 },
1310); 1317);
1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1311 1331
1312sub load_extensions { 1332sub load_extensions {
1313 cf::sync_job { 1333 cf::sync_job {
1314 my %todo; 1334 my %todo;
1315 1335
… …
1385 1405
1386=back 1406=back
1387 1407
1388=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1389 1409
1390Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1391 1411
1392=cut 1412=cut
1393 1413
1394package cf::player; 1414package cf::player;
1395 1415
… …
1438 1458
1439sub exists($) { 1459sub exists($) {
1440 my ($login) = @_; 1460 my ($login) = @_;
1441 1461
1442 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1444} 1464}
1445 1465
1446sub find($) { 1466sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1468 my $login = $_[0];
… …
1619 } 1639 }
1620 1640
1621 \@paths 1641 \@paths
1622} 1642}
1623 1643
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1645
1626Expand crossfire pod fragments into protocol xml. 1646Expand deliantra pod fragments into protocol xml.
1627 1647
1628=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1629 1649
1630Sends an ext reply to the player. 1650Sends an ext reply to the player.
1631 1651
… …
1844 1864
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1847} 1867}
1848 1868
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856}
1857
1858sub decay_objects { 1869sub decay_objects {
1859 my ($self) = @_; 1870 my ($self) = @_;
1860 1871
1861 return if $self->{deny_reset}; 1872 return if $self->{deny_reset};
1862 1873
… …
1944sub find { 1955sub find {
1945 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1946 1957
1947 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1948 1959
1949 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1951 1962
1952 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
1957 or return; 1965 or return;
1958 1966
1959 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1960 1968
… …
2027 2035
2028 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2037 $self->decay_objects;
2030 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2031 $self->update_buttons; 2039 $self->update_buttons;
2032 cf::cede_to_tick;
2033 $self->set_darkness_map;
2034 cf::cede_to_tick; 2040 cf::cede_to_tick;
2035 $self->activate; 2041 $self->activate;
2036 } 2042 }
2037 2043
2038 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
… …
2445 2451
2446=item $player_object->enter_link 2452=item $player_object->enter_link
2447 2453
2448Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2449 2455
2450The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2451I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2452 2460
2453Will never block. 2461Will never block.
2454 2462
2455=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2456 2464
… …
2514 2522
2515 $map->load; 2523 $map->load;
2516 $map->load_neighbours; 2524 $map->load_neighbours;
2517 2525
2518 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2519 $self->activate_recursive; 2528 $self->activate_recursive;
2520 2529
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2523} 2532}
… …
2686 $self->contr->savebed ($map, $x, $y) 2695 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 2696 if $exit->flag (cf::FLAG_DAMNED);
2688 2697
2689 1 2698 1
2690 }) { 2699 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2693 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2695 2704
2696 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2762 id => "infobox", 2771 id => "infobox",
2763 title => "Body Parts", 2772 title => "Body Parts",
2764 reply => undef, 2773 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2766 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2767 "c/uptime" => { 2800 "c/uptime" => {
2768 id => "infobox", 2801 id => "infobox",
2769 title => "Uptime", 2802 title => "Uptime",
2770 reply => undef, 2803 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
… …
2780 id => "party", 2813 id => "party",
2781 title => "Party", 2814 title => "Party",
2782 reply => "gsay ", 2815 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 2816 tooltip => "Messages and chat related to your party",
2784 }, 2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2785); 2826);
2786 2827
2787sub cf::client::send_msg { 2828sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2789 2830
2790 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2791 2833
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 2835
2794 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2797 2839
2798 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2802 2842
2803 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 2848 }
2810 2849
2811 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2812 } 2851 }
2813 2852
2814 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2815 2854
2816 if ($self->can_msg) {
2817 # default colour, mask it out 2855 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2820 2858
2821 my $pkt = "msg " 2859 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 2860 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 2862 );
2825 2863
2826 # try lzf for large packets 2864 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt 2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf}; 2866 if 1024 <= length $pkt and $self->{can_lzf};
2829 2867
2830 # split very large packets 2868 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) { 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag"; 2871 $pkt = "frag";
2834 } 2872 }
2835 2873
2836 $self->send_packet ($pkt); 2874 $self->send_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 2875}
2863 2876
2864=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2865 2878
2866Sends an ext event to the client. 2879Sends an ext event to the client.
… …
3041The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3042 3055
3043 cf::object 3056 cf::object
3044 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3045 insert remove name archname title slaying race decrease split 3058 insert remove name archname title slaying race decrease split
3059 value
3046 3060
3047 cf::object::player 3061 cf::object::player
3048 player 3062 player
3049 3063
3050 cf::player 3064 cf::player
… …
3056=cut 3070=cut
3057 3071
3058for ( 3072for (
3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060 insert remove inv nrof name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3065) { 3079) {
3066 no strict 'refs'; 3080 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3085 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3086 3100
3087 my $qcode = $code; 3101 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3090 3106
3091 local $_; 3107 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3093 3109
3094 my $eval = 3110 my $eval =
… …
3324 reload_treasures; 3340 reload_treasures;
3325 3341
3326 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3327} 3343}
3328 3344
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335}
3336
3337sub reload_config { 3345sub reload_config {
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3339 or return; 3347 or return;
3340 3348
3341 local $/; 3349 local $/;
… …
3353 }; 3361 };
3354 warn $@ if $@; 3362 warn $@ if $@;
3355 } 3363 }
3356} 3364}
3357 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3358sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3359 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362 (async { 3403 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3366 }; 3407 };
3367 3408
3368 { 3409 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3370 reload_config; 3413 reload_config;
3371 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3372 load_extensions; 3427 load_extensions;
3373 3428
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 utime time, time, $RUNTIMEFILE;
3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3375 } 3435 };
3376 3436
3377 EV::loop; 3437 EV::loop;
3378} 3438}
3379 3439
3380############################################################################# 3440#############################################################################
… …
3389 }; 3449 };
3390 } 3450 }
3391} 3451}
3392 3452
3393sub write_runtime_sync { 3453sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime";
3395
3396 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3398 3456
3399 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3458
3401 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3402 3460
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3404 or return; 3462 or return;
3405 3463
3406 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
… …
3418 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3419 3477
3420 close $fh 3478 close $fh
3421 or return; 3479 or return;
3422 3480
3423 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3482 and return;
3425 3483
3426 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3427 3485
3428 1 3486 1
… …
3440 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3441 3499
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3501 or return;
3444 3502
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3446 $uuid_skip = 0; 3511 $uuid_skip = 0;
3447 3512
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3514 and return;
3450 3515
… …
3472} 3537}
3473 3538
3474sub emergency_save() { 3539sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3476 3541
3477 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3478 3543
3479 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3480 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3556 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3558 $pl->save;
3489 } 3559 }
3490 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3491 3561
3492 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3493 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3565 $map->valid or next;
3496 $map->save; 3566 $map->save;
3497 } 3567 }
3498 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3499 3569
3500 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3503 3573
3504 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3575 write_uuid_sync 1;
3506 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3507 }; 3577 };
3508 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3509 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3510} 3585}
3511 3586
3512sub post_cleanup { 3587sub post_cleanup {
3513 my ($make_core) = @_; 3588 my ($make_core) = @_;
3514 3589
3515 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3517} 3595}
3518 3596
3519# a safer delete_package, copied from Symbol 3597# a safer delete_package, copied from Symbol
3520sub clear_package($) { 3598sub clear_package($) {
3521 my $pkg = shift; 3599 my $pkg = shift;
… …
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 3616 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 3617 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 3619 }
3542 warn "cleared package #$pkg\n";#d# 3620 warn "cleared package $pkg\n";#d#
3543} 3621}
3544
3545our $RELOAD; # how many times to reload
3546 3622
3547sub do_reload_perl() { 3623sub do_reload_perl() {
3548 # can/must only be called in main 3624 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3550 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3551 return; 3627 return;
3552 } 3628 }
3553 3629
3554 return if $RELOAD++; 3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3555 3633
3556 while ($RELOAD) { 3634 while ($RELOAD) {
3557 warn "reloading..."; 3635 warn "reloading...";
3558 3636
3559 warn "entering sync_job"; 3637 warn "entering sync_job";
… …
3620 clear_package "safe::$_" 3698 clear_package "safe::$_"
3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622 3700
3623 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 3704
3627 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3628 # and global variables created in xs 3706 # and global variables created in xs
3629 #clear_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3630 3708
… …
3638 cf::reload_config; 3716 cf::reload_config;
3639 3717
3640 warn "loading extensions"; 3718 warn "loading extensions";
3641 cf::load_extensions; 3719 cf::load_extensions;
3642 3720
3721 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3646 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3649 3732
3650 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3651 3734
3652 1 3735 1
3653 } or do { 3736 } or do {
… …
3656 }; 3739 };
3657 3740
3658 warn "reloaded"; 3741 warn "reloaded";
3659 --$RELOAD; 3742 --$RELOAD;
3660 } 3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3661}; 3747};
3662 3748
3663our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3664 3750
3665sub reload_perl() { 3751sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3668 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3759 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3672 }; 3762 };
3673} 3763}
3674 3764
3675register_command "reload" => sub { 3765register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3802 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3803 3893
3804 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3806 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3807 async { 3898 async {
3808 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3809 3900
3810 my @bt = fork_call { 3901 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3822 } 3913 }
3823 3914
3824 @funcs 3915 @funcs
3825 }; 3916 };
3826 3917
3827 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 3921 --$_log_backtrace;
3830 }; 3922 };
3831 } else { 3923 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3834 } 3926 }
3835} 3927}
3836 3928
3837# load additional modules 3929# load additional modules
3838use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3839 3931
3840END { cf::emergency_save } 3932END { cf::emergency_save }
3841 3933
38421 39341
3843 3935

Diff Legend

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