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.471 by root, Mon Apr 27 01:38:48 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
… …
1170 } else { 1168 } else {
1171 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1172 } 1170 }
1173 1171
1174 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1175 } else { 1176 } else {
1176 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1177 } 1178 }
1178 } else { 1179 } else {
1179 aio_unlink $filename; 1180 aio_unlink $filename;
1180 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1181 } 1182 }
… …
1272 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1273 1274
1274 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1275} 1276}
1276 1277
1278use File::Glob ();
1279
1277cf::player->attach ( 1280cf::player->attach (
1278 on_command => sub { 1281 on_command => sub {
1279 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1280 1283
1281 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1312 } 1315 }
1313 1316
1314 cf::override; 1317 cf::override;
1315 }, 1318 },
1316); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1317 1333
1318sub load_extensions { 1334sub load_extensions {
1319 cf::sync_job { 1335 cf::sync_job {
1320 my %todo; 1336 my %todo;
1321 1337
… …
1444 1460
1445sub exists($) { 1461sub exists($) {
1446 my ($login) = @_; 1462 my ($login) = @_;
1447 1463
1448 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1449 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1450} 1466}
1451 1467
1452sub find($) { 1468sub find($) {
1453 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1454 my $login = $_[0]; 1470 my $login = $_[0];
… …
1850 1866
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1853} 1869}
1854 1870
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 { 1871sub decay_objects {
1865 my ($self) = @_; 1872 my ($self) = @_;
1866 1873
1867 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1868 1875
… …
1950sub find { 1957sub find {
1951 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1952 1959
1953 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1954 1961
1955 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1964
1958 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
1963 or return; 1967 or return;
1964 1968
1965 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1966 1970
… …
2033 2037
2034 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2039 $self->decay_objects;
2036 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2037 $self->update_buttons; 2041 $self->update_buttons;
2038 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick; 2042 cf::cede_to_tick;
2041 $self->activate; 2043 $self->activate;
2042 } 2044 }
2043 2045
2044 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2386 2388
2387our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2388 id => "say", 2390 id => "say",
2389 title => "Map", 2391 title => "Map",
2390 reply => "say ", 2392 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2394};
2393 2395
2394our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2395 id => "chat", 2397 id => "chat",
2396 title => "Chat", 2398 title => "Chat",
… …
2771 id => "infobox", 2773 id => "infobox",
2772 title => "Body Parts", 2774 title => "Body Parts",
2773 reply => undef, 2775 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2775 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2776 "c/uptime" => { 2814 "c/uptime" => {
2777 id => "infobox", 2815 id => "infobox",
2778 title => "Uptime", 2816 title => "Uptime",
2779 reply => undef, 2817 reply => undef,
2780 tooltip => "How long the server has been running since last restart", 2818 tooltip => "How long the server has been running since last restart",
… …
2789 id => "party", 2827 id => "party",
2790 title => "Party", 2828 title => "Party",
2791 reply => "gsay ", 2829 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party", 2830 tooltip => "Messages and chat related to your party",
2793 }, 2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2794); 2840);
2795 2841
2796sub cf::client::send_msg { 2842sub cf::client::send_msg {
2797 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2798 2844
… …
2803 2849
2804 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2807 2853
2808 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2812 2856
2813 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2818 if $self->can_msg;
2819 } 2862 }
2820 2863
2821 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2822 } 2865 }
2823 2866
2824 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2825 2868
2826 if ($self->can_msg) {
2827 # default colour, mask it out 2869 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2830 2872
2831 my $pkt = "msg " 2873 my $pkt = "msg "
2832 . $self->{json_coder}->encode ( 2874 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 ); 2876 );
2835 2877
2836 # try lzf for large packets 2878 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt 2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf}; 2880 if 1024 <= length $pkt and $self->{can_lzf};
2839 2881
2840 # split very large packets 2882 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) { 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag"; 2885 $pkt = "frag";
2844 } 2886 }
2845 2887
2846 $self->send_packet ($pkt); 2888 $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} 2889}
2873 2890
2874=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2875 2892
2876Sends an ext event to the client. 2893Sends an ext event to the client.
… …
3051The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3052 3069
3053 cf::object 3070 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split 3072 insert remove name archname title slaying race decrease split
3073 value
3056 3074
3057 cf::object::player 3075 cf::object::player
3058 player 3076 player
3059 3077
3060 cf::player 3078 cf::player
… …
3066=cut 3084=cut
3067 3085
3068for ( 3086for (
3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["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 3088 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3072 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3073 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3074 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3075) { 3093) {
3076 no strict 'refs'; 3094 no strict 'refs';
3077 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3078 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3095 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3096 3114
3097 my $qcode = $code; 3115 my $qcode = $code;
3098 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3099 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3100 3120
3101 local $_; 3121 local $_;
3102 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3103 3123
3104 my $eval = 3124 my $eval =
… …
3334 reload_treasures; 3354 reload_treasures;
3335 3355
3336 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3337} 3357}
3338 3358
3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
3344 reload_resources;
3345}
3346
3347sub reload_config { 3359sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3361 or return;
3350 3362
3351 local $/; 3363 local $/;
… …
3383 seek $fh, 0, 0; 3395 seek $fh, 0, 0;
3384 print $fh $$; 3396 print $fh $$;
3385} 3397}
3386 3398
3387sub main { 3399sub main {
3388 atomic; 3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3389 3413
3390 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3391 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3393 (async { 3417 (async {
3394 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT; 3419 EV::loop EV::LOOP_ONESHOT;
3396 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3397 }; 3421 };
3398 3422
3399 { 3423 evthread_start IO::AIO::poll_fileno;
3400 my $guard = freeze_mainloop; 3424
3425 cf::sync_job {
3426 reload_resources;
3401 reload_config; 3427 reload_config;
3402 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3403 load_extensions; 3441 load_extensions;
3404 3442
3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE; 3443 utime time, time, $RUNTIMEFILE;
3409 3444
3410 # no (long-running) fork's whatsoever before this point(!) 3445 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3412 3450
3413 EV::loop; 3451 EV::loop;
3414} 3452}
3415 3453
3416############################################################################# 3454#############################################################################
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3512 my $uuid = "$LOCALDIR/uuid";
3475 3513
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3515 or return;
3478 3516
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3525 $uuid_skip = 0;
3481 3526
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3528 and return;
3484 3529
… …
3506} 3551}
3507 3552
3508sub emergency_save() { 3553sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3510 3555
3511 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3512 3557
3513 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3514 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3570 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3572 $pl->save;
3523 } 3573 }
3524 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3525 3575
3526 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3579 $map->valid or next;
3530 $map->save; 3580 $map->save;
3531 } 3581 }
3532 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3533 3583
3534 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3537 3587
3538 warn "begin write uuid\n"; 3588 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3589 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3590 warn "emergency_perl_save: end write uuid\n";
3541 }; 3591 };
3542 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3543 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3544} 3599}
3545 3600
3546sub post_cleanup { 3601sub post_cleanup {
3547 my ($make_core) = @_; 3602 my ($make_core) = @_;
3548 3603
… …
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) { 3630 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"}; 3631 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 } 3633 }
3579 warn "cleared package #$pkg\n";#d# 3634 warn "cleared package $pkg\n";#d#
3580} 3635}
3581
3582our $RELOAD; # how many times to reload
3583 3636
3584sub do_reload_perl() { 3637sub do_reload_perl() {
3585 # can/must only be called in main 3638 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3587 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3588 return; 3641 return;
3589 } 3642 }
3590 3643
3591 return if $RELOAD++; 3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3592 3647
3593 while ($RELOAD) { 3648 while ($RELOAD) {
3594 warn "reloading..."; 3649 warn "reloading...";
3595 3650
3596 warn "entering sync_job"; 3651 warn "entering sync_job";
… …
3657 clear_package "safe::$_" 3712 clear_package "safe::$_"
3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3659 3714
3660 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3661 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3662 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3663 3718
3664 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3665 # and global variables created in xs 3720 # and global variables created in xs
3666 #clear_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3667 3722
… …
3675 cf::reload_config; 3730 cf::reload_config;
3676 3731
3677 warn "loading extensions"; 3732 warn "loading extensions";
3678 cf::load_extensions; 3733 cf::load_extensions;
3679 3734
3735 if ($REATTACH_ON_RELOAD) {
3680 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3681 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3682 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3683 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3684 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3685 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3686 3746
3687 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3688 3748
3689 1 3749 1
3690 } or do { 3750 } or do {
… …
3693 }; 3753 };
3694 3754
3695 warn "reloaded"; 3755 warn "reloaded";
3696 --$RELOAD; 3756 --$RELOAD;
3697 } 3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3698}; 3761};
3699 3762
3700our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3701 3764
3702sub reload_perl() { 3765sub reload_perl() {
3703 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3704 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3705 3768
3769 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions;
3771
3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3707 do_reload_perl; 3773 do_reload_perl;
3708 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3775 };
3709 }; 3776 };
3710} 3777}
3711 3778
3712register_command "reload" => sub { 3779register_command "reload" => sub {
3713 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
… …
3872 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3873 } 3940 }
3874} 3941}
3875 3942
3876# load additional modules 3943# load additional modules
3877use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3878 3945
3879END { cf::emergency_save } 3946END { cf::emergency_save }
3880 3947
38811 39481
3882 3949

Diff Legend

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