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.452 by root, Tue Sep 23 00:24:52 2008 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 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 ();
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 72
71# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 79
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 81
77our %COMMAND = (); 82our %COMMAND = ();
78our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
103our %RESOURCE; 108our %RESOURCE;
104 109
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 112our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
109 114
110our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 118our $DB_ENV;
114 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
115our %CFG; 122our %CFG;
116 123
117our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 125our $RUNTIME;
119our $NOW; 126our $NOW;
… …
127 134
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 137our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
132 144
133binmode STDOUT; 145binmode STDOUT;
134binmode STDERR; 146binmode STDERR;
135 147
136# read virtual server time, if available 148# read virtual server time, if available
137unless ($RUNTIME || !-e $RUNTIMEFILE) { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
138 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
141} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
142 156
143mkdir $_ 157mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 159
146our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 320
307sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
309 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
310=item cf::lock_wait $string 338=item cf::lock_wait $string
311 339
312Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
313 341
314=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
315 343
316Wait until the given lock is available and then acquires it and returns 344Wait 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, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
319returned. 347returned.
320 348
321Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 350deadlocked coro.
… …
328 356
329Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
330 358
331=cut 359=cut
332 360
333our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 362
336sub lock_wait($) { 363sub lock_wait($) {
337 my ($key) = @_; 364 $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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 365}
351 366
352sub lock_acquire($) { 367sub lock_acquire($) {
353 my ($key) = @_; 368 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 369}
367 370
368sub lock_active($) { 371sub lock_active($) {
369 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 373}
373 374
374sub freeze_mainloop { 375sub freeze_mainloop {
375 tick_inhibit_inc; 376 tick_inhibit_inc;
376 377
377 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
378} 379}
379 380
380=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
381 382
382Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
… …
1154 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1155 1156
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 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;
1162 aio_fsync $fh;
1163 }
1160 aio_close $fh; 1164 aio_close $fh;
1161 1165
1162 if (@$objs) { 1166 if (@$objs) {
1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1164 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1167 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 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;
1173 aio_fsync $fh;
1174 }
1168 aio_close $fh; 1175 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1177 }
1171 } else { 1178 } else {
1172 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1173 } 1180 }
1174 1181
1175 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1186 } else {
1177 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1178 } 1188 }
1179 } else { 1189 } else {
1180 aio_unlink $filename; 1190 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1182 } 1192 }
… …
1273 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1274 1284
1275 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1276} 1286}
1277 1287
1288use File::Glob ();
1289
1278cf::player->attach ( 1290cf::player->attach (
1279 on_command => sub { 1291 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1281 1293
1282 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
… …
1313 } 1325 }
1314 1326
1315 cf::override; 1327 cf::override;
1316 }, 1328 },
1317); 1329);
1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1318 1343
1319sub load_extensions { 1344sub load_extensions {
1320 cf::sync_job { 1345 cf::sync_job {
1321 my %todo; 1346 my %todo;
1322 1347
… …
1851 1876
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1854} 1879}
1855 1880
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1881sub decay_objects {
1866 my ($self) = @_; 1882 my ($self) = @_;
1867 1883
1868 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1869 1885
… …
1951sub find { 1967sub find {
1952 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1953 1969
1954 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1955 1971
1956 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1974
1959 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1964 or return; 1977 or return;
1965 1978
1966 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1967 1980
… …
2034 2047
2035 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2049 $self->decay_objects;
2037 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2038 $self->update_buttons; 2051 $self->update_buttons;
2039 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick; 2052 cf::cede_to_tick;
2042 $self->activate; 2053 $self->activate;
2043 } 2054 }
2044 2055
2045 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2387 2398
2388our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2389 id => "say", 2400 id => "say",
2390 title => "Map", 2401 title => "Map",
2391 reply => "say ", 2402 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2404};
2394 2405
2395our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2396 id => "chat", 2407 id => "chat",
2397 title => "Chat", 2408 title => "Chat",
… …
2772 id => "infobox", 2783 id => "infobox",
2773 title => "Body Parts", 2784 title => "Body Parts",
2774 reply => undef, 2785 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2776 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2777 "c/skills" => { 2794 "c/skills" => {
2778 id => "infobox", 2795 id => "infobox",
2779 title => "Skills", 2796 title => "Skills",
2780 reply => undef, 2797 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2823 },
2783 "c/uptime" => { 2824 "c/uptime" => {
2784 id => "infobox", 2825 id => "infobox",
2785 title => "Uptime", 2826 title => "Uptime",
2786 reply => undef, 2827 reply => undef,
… …
2796 id => "party", 2837 id => "party",
2797 title => "Party", 2838 title => "Party",
2798 reply => "gsay ", 2839 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2800 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2801); 2850);
2802 2851
2803sub cf::client::send_msg { 2852sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2854
… …
2810 2859
2811 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2814 2863
2815 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2819 2866
2820 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2872 }
2827 2873
2828 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2829 } 2875 }
2830 2876
2831 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2832 2878
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2879 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2837 2882
2838 my $pkt = "msg " 2883 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2884 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2886 );
2842 2887
2843 # try lzf for large packets 2888 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2890 if 1024 <= length $pkt and $self->{can_lzf};
2846 2891
2847 # split very large packets 2892 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2895 $pkt = "frag";
2851 } 2896 }
2852 2897
2853 $self->send_packet ($pkt); 2898 $self->send_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2899}
2880 2900
2881=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2882 2902
2883Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3058The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3059 3079
3060 cf::object 3080 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3063 3084
3064 cf::object::player 3085 cf::object::player
3065 player 3086 player
3066 3087
3067 cf::player 3088 cf::player
… …
3073=cut 3094=cut
3074 3095
3075for ( 3096for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3082) { 3103) {
3083 no strict 'refs'; 3104 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3102 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3103 3124
3104 my $qcode = $code; 3125 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3107 3130
3108 local $_; 3131 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3110 3133
3111 my $eval = 3134 my $eval =
… …
3341 reload_treasures; 3364 reload_treasures;
3342 3365
3343 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3344} 3367}
3345 3368
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3369sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3371 or return;
3357 3372
3358 local $/; 3373 local $/;
… …
3389 3404
3390 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3391 print $fh $$; 3406 print $fh $$;
3392} 3407}
3393 3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3394sub main { 3418sub main {
3395 atomic; 3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3432
3397 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3436 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3404 }; 3440 };
3405 3441
3406 { 3442 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3408 reload_config; 3446 reload_config;
3409 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3410 load_extensions; 3460 load_extensions;
3411 3461
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3462 utime time, time, $RUNTIMEFILE;
3416 3463
3417 # no (long-running) fork's whatsoever before this point(!) 3464 # no (long-running) fork's whatsoever before this point(!)
3465 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3467
3420 EV::loop; 3468 (pop @POST_INIT)->(0) while @POST_INIT;
3469 };
3470
3471 main_loop;
3421} 3472}
3422 3473
3423############################################################################# 3474#############################################################################
3424# initialisation and cleanup 3475# initialisation and cleanup
3425 3476
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3532 my $uuid = "$LOCALDIR/uuid";
3482 3533
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3534 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3535 or return;
3485 3536
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3537 my $value = uuid_seq uuid_cur;
3538
3539 unless ($value) {
3540 warn "cowardly refusing to write zero uuid value!\n";
3541 return;
3542 }
3543
3544 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3545 $uuid_skip = 0;
3488 3546
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3547 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3548 and return;
3491 3549
… …
3513} 3571}
3514 3572
3515sub emergency_save() { 3573sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3574 my $freeze_guard = cf::freeze_mainloop;
3517 3575
3518 warn "enter emergency perl save\n"; 3576 warn "emergency_perl_save: enter\n";
3519 3577
3520 cf::sync_job { 3578 cf::sync_job {
3579 # this is a trade-off: we want to be very quick here, so
3580 # save all maps without fsync, and later call a global sync
3581 # (which in turn might be very very slow)
3582 local $USE_FSYNC = 0;
3583
3521 # use a peculiar iteration method to avoid tripping on perl 3584 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3585 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3586 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3587 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3588 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3589 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3590 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3591 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3592 $pl->save;
3530 } 3593 }
3531 warn "end emergency player save\n"; 3594 warn "emergency_perl_save: end player save\n";
3532 3595
3533 warn "begin emergency map save\n"; 3596 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3597 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3598 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3599 $map->valid or next;
3537 $map->save; 3600 $map->save;
3538 } 3601 }
3539 warn "end emergency map save\n"; 3602 warn "emergency_perl_save: end map save\n";
3540 3603
3541 warn "begin emergency database checkpoint\n"; 3604 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3606 warn "emergency_perl_save: end database checkpoint\n";
3544 3607
3545 warn "begin write uuid\n"; 3608 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3609 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3610 warn "emergency_perl_save: end write uuid\n";
3548 }; 3611 };
3549 3612
3613 warn "emergency_perl_save: starting sync()\n";
3614 IO::AIO::aio_sync sub {
3615 warn "emergency_perl_save: finished sync()\n";
3616 };
3617
3550 warn "leave emergency perl save\n"; 3618 warn "emergency_perl_save: leave\n";
3551} 3619}
3552 3620
3553sub post_cleanup { 3621sub post_cleanup {
3554 my ($make_core) = @_; 3622 my ($make_core) = @_;
3555 3623
… …
3592 warn "can only reload from main coroutine"; 3660 warn "can only reload from main coroutine";
3593 return; 3661 return;
3594 } 3662 }
3595 3663
3596 return if $RELOAD++; 3664 return if $RELOAD++;
3665
3666 my $t1 = EV::time;
3597 3667
3598 while ($RELOAD) { 3668 while ($RELOAD) {
3599 warn "reloading..."; 3669 warn "reloading...";
3600 3670
3601 warn "entering sync_job"; 3671 warn "entering sync_job";
… …
3662 clear_package "safe::$_" 3732 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3733 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3734
3665 warn "unloading cf.pm \"a bit\""; 3735 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3736 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3737 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3738
3669 # don't, removes xs symbols, too, 3739 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3740 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3741 #clear_package __PACKAGE__;
3672 3742
… …
3680 cf::reload_config; 3750 cf::reload_config;
3681 3751
3682 warn "loading extensions"; 3752 warn "loading extensions";
3683 cf::load_extensions; 3753 cf::load_extensions;
3684 3754
3755 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3756 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3757 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3758 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3759 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3760 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3761 reattach $_ for values %PLAYER;
3762 }
3763
3764 warn "running post_init jobs";
3765 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3766
3692 warn "leaving sync_job"; 3767 warn "leaving sync_job";
3693 3768
3694 1 3769 1
3695 } or do { 3770 } or do {
… …
3698 }; 3773 };
3699 3774
3700 warn "reloaded"; 3775 warn "reloaded";
3701 --$RELOAD; 3776 --$RELOAD;
3702 } 3777 }
3778
3779 $t1 = EV::time - $t1;
3780 warn "reload completed in ${t1}s\n";
3703}; 3781};
3704 3782
3705our $RELOAD_WATCHER; # used only during reload 3783our $RELOAD_WATCHER; # used only during reload
3706 3784
3707sub reload_perl() { 3785sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3786 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3787 # coro crashes during coro_state_free->destroy here.
3710 3788
3789 $RELOAD_WATCHER ||= cf::async {
3790 Coro::AIO::aio_wait cache_extensions;
3791
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3792 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3793 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3794 undef $RELOAD_WATCHER;
3795 };
3714 }; 3796 };
3715} 3797}
3716 3798
3717register_command "reload" => sub { 3799register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3800 my ($who, $arg) = @_;
… …
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 3959 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 3960 }
3879} 3961}
3880 3962
3881# load additional modules 3963# load additional modules
3882use cf::pod; 3964require "cf/$_.pm" for @EXTRA_MODULES;
3883 3965
3884END { cf::emergency_save } 3966END { cf::emergency_save }
3885 3967
38861 39681
3887 3969

Diff Legend

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