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.449 by root, Sat Sep 20 00:09:27 2008 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 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 ();
… …
81our %EXTCMD = (); 83our %EXTCMD = ();
82our %EXTICMD = (); 84our %EXTICMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
85 87
86our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 89our @EVENT;
88 90
89our $CONFDIR = confdir; 91our $CONFDIR = confdir;
90our $DATADIR = datadir; 92our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
103our %RESOURCE; 105our %RESOURCE;
104 106
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 109our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
109 111
110our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 115our $DB_ENV;
114 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
115our %CFG; 119our %CFG;
116 120
117our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 122our $RUNTIME;
119our $NOW; 123our $NOW;
… …
127 131
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 134our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
132 140
133binmode STDOUT; 141binmode STDOUT;
134binmode STDERR; 142binmode STDERR;
135 143
136# read virtual server time, if available 144# read virtual server time, if available
137unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
138 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
141} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
142 152
143mkdir $_ 153mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 155
146our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 316
307sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
309 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
310=item cf::lock_wait $string 334=item cf::lock_wait $string
311 335
312Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
313 337
314=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
315 339
316Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
319returned. 343returned.
320 344
321Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 346deadlocked coro.
… …
328 352
329Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
330 354
331=cut 355=cut
332 356
333our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 358
336sub lock_wait($) { 359sub lock_wait($) {
337 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 push @{ $LOCK{$key} }, $Coro::current;
347 Coro::schedule;
348 }
349} 361}
350 362
351sub lock_acquire($) { 363sub lock_acquire($) {
352 my ($key) = @_; 364 $LOCKS->guard ($_[0])
353
354 # wait, to be sure we are not locked
355 lock_wait $key;
356
357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
359
360 Coro::guard {
361 delete $LOCKER{$key};#d#
362 # wake up all waiters, to be on the safe side
363 $_->ready for @{ delete $LOCK{$key} };
364 }
365} 365}
366 366
367sub lock_active($) { 367sub lock_active($) {
368 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
369
370 ! ! $LOCK{$key}
371} 369}
372 370
373sub freeze_mainloop { 371sub freeze_mainloop {
374 tick_inhibit_inc; 372 tick_inhibit_inc;
375 373
376 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
377} 375}
378 376
379=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
380 378
381Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
1153 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1154 1152
1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1156 aio_chmod $fh, SAVE_MODE; 1154 aio_chmod $fh, SAVE_MODE;
1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1159 aio_close $fh; 1160 aio_close $fh;
1160 1161
1161 if (@$objs) { 1162 if (@$objs) {
1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1163 aio_chmod $fh, SAVE_MODE; 1164 aio_chmod $fh, SAVE_MODE;
1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1165 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1166 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1167 aio_close $fh; 1171 aio_close $fh;
1168 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1169 } 1173 }
1170 } else { 1174 } else {
1171 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1172 } 1176 }
1173 1177
1174 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1182 } else {
1176 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1177 } 1184 }
1178 } else { 1185 } else {
1179 aio_unlink $filename; 1186 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1181 } 1188 }
… …
1272 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1273 1280
1274 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1275} 1282}
1276 1283
1284use File::Glob ();
1285
1277cf::player->attach ( 1286cf::player->attach (
1278 on_command => sub { 1287 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1280 1289
1281 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
… …
1312 } 1321 }
1313 1322
1314 cf::override; 1323 cf::override;
1315 }, 1324 },
1316); 1325);
1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1317 1339
1318sub load_extensions { 1340sub load_extensions {
1319 cf::sync_job { 1341 cf::sync_job {
1320 my %todo; 1342 my %todo;
1321 1343
… …
1444 1466
1445sub exists($) { 1467sub exists($) {
1446 my ($login) = @_; 1468 my ($login) = @_;
1447 1469
1448 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1450} 1472}
1451 1473
1452sub find($) { 1474sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1476 my $login = $_[0];
… …
1850 1872
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1853} 1875}
1854 1876
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862}
1863
1864sub decay_objects { 1877sub decay_objects {
1865 my ($self) = @_; 1878 my ($self) = @_;
1866 1879
1867 return if $self->{deny_reset}; 1880 return if $self->{deny_reset};
1868 1881
… …
1950sub find { 1963sub find {
1951 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1952 1965
1953 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1954 1967
1955 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1970
1958 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1962 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1963 or return; 1973 or return;
1964 1974
1965 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1966 1976
… …
2033 2043
2034 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2045 $self->decay_objects;
2036 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2037 $self->update_buttons; 2047 $self->update_buttons;
2038 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick; 2048 cf::cede_to_tick;
2041 $self->activate; 2049 $self->activate;
2042 } 2050 }
2043 2051
2044 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
… …
2386 2394
2387our $SAY_CHANNEL = { 2395our $SAY_CHANNEL = {
2388 id => "say", 2396 id => "say",
2389 title => "Map", 2397 title => "Map",
2390 reply => "say ", 2398 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2400};
2393 2401
2394our $CHAT_CHANNEL = { 2402our $CHAT_CHANNEL = {
2395 id => "chat", 2403 id => "chat",
2396 title => "Chat", 2404 title => "Chat",
… …
2771 id => "infobox", 2779 id => "infobox",
2772 title => "Body Parts", 2780 title => "Body Parts",
2773 reply => undef, 2781 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2775 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2776 "c/uptime" => { 2820 "c/uptime" => {
2777 id => "infobox", 2821 id => "infobox",
2778 title => "Uptime", 2822 title => "Uptime",
2779 reply => undef, 2823 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
… …
2789 id => "party", 2833 id => "party",
2790 title => "Party", 2834 title => "Party",
2791 reply => "gsay ", 2835 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 2836 tooltip => "Messages and chat related to your party",
2793 }, 2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2794); 2846);
2795 2847
2796sub cf::client::send_msg { 2848sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2798 2850
… …
2803 2855
2804 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2807 2859
2808 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2812 2862
2813 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 2868 }
2820 2869
2821 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2822 } 2871 }
2823 2872
2824 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2825 2874
2826 if ($self->can_msg) {
2827 # default colour, mask it out 2875 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2830 2878
2831 my $pkt = "msg " 2879 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 2880 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 2882 );
2835 2883
2836 # try lzf for large packets 2884 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt 2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf}; 2886 if 1024 <= length $pkt and $self->{can_lzf};
2839 2887
2840 # split very large packets 2888 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) { 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag"; 2891 $pkt = "frag";
2844 } 2892 }
2845 2893
2846 $self->send_packet ($pkt); 2894 $self->send_packet ($pkt);
2847 } else {
2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2866 } else {
2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2868 $self->send_packet ("drawinfo $color $msg")
2869 }
2870 }
2871 }
2872} 2895}
2873 2896
2874=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2875 2898
2876Sends an ext event to the client. 2899Sends an ext event to the client.
… …
3051The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3052 3075
3053 cf::object 3076 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split 3078 insert remove name archname title slaying race decrease split
3079 value
3056 3080
3057 cf::object::player 3081 cf::object::player
3058 player 3082 player
3059 3083
3060 cf::player 3084 cf::player
… …
3066=cut 3090=cut
3067 3091
3068for ( 3092for (
3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3075) { 3099) {
3076 no strict 'refs'; 3100 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3095 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3096 3120
3097 my $qcode = $code; 3121 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3100 3126
3101 local $_; 3127 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3103 3129
3104 my $eval = 3130 my $eval =
… …
3334 reload_treasures; 3360 reload_treasures;
3335 3361
3336 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3337} 3363}
3338 3364
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3365sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3367 or return;
3350 3368
3351 local $/; 3369 local $/;
… …
3383 seek $fh, 0, 0; 3401 seek $fh, 0, 0;
3384 print $fh $$; 3402 print $fh $$;
3385} 3403}
3386 3404
3387sub main { 3405sub main {
3388 atomic; 3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3419
3390 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3423 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3425 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3397 }; 3427 };
3398 3428
3399 { 3429 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3430
3431 cf::sync_job {
3432 reload_resources;
3401 reload_config; 3433 reload_config;
3402 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
3403 load_extensions; 3447 load_extensions;
3404 3448
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3449 utime time, time, $RUNTIMEFILE;
3409 3450
3410 # no (long-running) fork's whatsoever before this point(!) 3451 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3412 3456
3413 EV::loop; 3457 EV::loop;
3414} 3458}
3415 3459
3416############################################################################# 3460#############################################################################
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3518 my $uuid = "$LOCALDIR/uuid";
3475 3519
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3521 or return;
3478 3522
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3531 $uuid_skip = 0;
3481 3532
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3534 and return;
3484 3535
… …
3506} 3557}
3507 3558
3508sub emergency_save() { 3559sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3510 3561
3511 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3512 3563
3513 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3514 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3576 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3578 $pl->save;
3523 } 3579 }
3524 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3525 3581
3526 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3585 $map->valid or next;
3530 $map->save; 3586 $map->save;
3531 } 3587 }
3532 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3533 3589
3534 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3537 3593
3538 warn "begin write uuid\n"; 3594 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3595 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3596 warn "emergency_perl_save: end write uuid\n";
3541 }; 3597 };
3542 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3543 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3544} 3605}
3545 3606
3546sub post_cleanup { 3607sub post_cleanup {
3547 my ($make_core) = @_; 3608 my ($make_core) = @_;
3548 3609
… …
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3636 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3637 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3639 }
3579 warn "cleared package #$pkg\n";#d# 3640 warn "cleared package $pkg\n";#d#
3580} 3641}
3581
3582our $RELOAD; # how many times to reload
3583 3642
3584sub do_reload_perl() { 3643sub do_reload_perl() {
3585 # can/must only be called in main 3644 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3588 return; 3647 return;
3589 } 3648 }
3590 3649
3591 return if $RELOAD++; 3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3592 3653
3593 while ($RELOAD) { 3654 while ($RELOAD) {
3594 warn "reloading..."; 3655 warn "reloading...";
3595 3656
3596 warn "entering sync_job"; 3657 warn "entering sync_job";
… …
3657 clear_package "safe::$_" 3718 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3720
3660 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3724
3664 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3726 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3667 3728
… …
3675 cf::reload_config; 3736 cf::reload_config;
3676 3737
3677 warn "loading extensions"; 3738 warn "loading extensions";
3678 cf::load_extensions; 3739 cf::load_extensions;
3679 3740
3741 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3686 3752
3687 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3688 3754
3689 1 3755 1
3690 } or do { 3756 } or do {
… …
3693 }; 3759 };
3694 3760
3695 warn "reloaded"; 3761 warn "reloaded";
3696 --$RELOAD; 3762 --$RELOAD;
3697 } 3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3698}; 3767};
3699 3768
3700our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3701 3770
3702sub reload_perl() { 3771sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3705 3774
3775 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions;
3777
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3779 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3781 };
3709 }; 3782 };
3710} 3783}
3711 3784
3712register_command "reload" => sub { 3785register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
… …
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 3946 }
3874} 3947}
3875 3948
3876# load additional modules 3949# load additional modules
3877use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3878 3951
3879END { cf::emergency_save } 3952END { cf::emergency_save }
3880 3953
38811 39541
3882 3955

Diff Legend

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