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.468 by root, Thu Jan 8 19:23:44 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 ();
… …
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 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 361}
351 362
352sub lock_acquire($) { 363sub lock_acquire($) {
353 my ($key) = @_; 364 $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} 365}
367 366
368sub lock_active($) { 367sub lock_active($) {
369 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 369}
373 370
374sub freeze_mainloop { 371sub freeze_mainloop {
375 tick_inhibit_inc; 372 tick_inhibit_inc;
376 373
377 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
378} 375}
379 376
380=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
381 378
382Like 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
… …
1171 } else { 1168 } else {
1172 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1173 } 1170 }
1174 1171
1175 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1176 } else {
1177 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1178 } 1178 }
1179 } else { 1179 } else {
1180 aio_unlink $filename; 1180 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1182 } 1182 }
… …
1273 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1274 1274
1275 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1276} 1276}
1277 1277
1278use File::Glob ();
1279
1278cf::player->attach ( 1280cf::player->attach (
1279 on_command => sub { 1281 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1281 1283
1282 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1313 } 1315 }
1314 1316
1315 cf::override; 1317 cf::override;
1316 }, 1318 },
1317); 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}
1318 1333
1319sub load_extensions { 1334sub load_extensions {
1320 cf::sync_job { 1335 cf::sync_job {
1321 my %todo; 1336 my %todo;
1322 1337
… …
1851 1866
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1854} 1869}
1855 1870
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 { 1871sub decay_objects {
1866 my ($self) = @_; 1872 my ($self) = @_;
1867 1873
1868 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1869 1875
… …
1951sub find { 1957sub find {
1952 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1953 1959
1954 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1955 1961
1956 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1964
1959 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
1964 or return; 1967 or return;
1965 1968
1966 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1967 1970
… …
2034 2037
2035 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2039 $self->decay_objects;
2037 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2038 $self->update_buttons; 2041 $self->update_buttons;
2039 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick; 2042 cf::cede_to_tick;
2042 $self->activate; 2043 $self->activate;
2043 } 2044 }
2044 2045
2045 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2387 2388
2388our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2389 id => "say", 2390 id => "say",
2390 title => "Map", 2391 title => "Map",
2391 reply => "say ", 2392 reply => "say ",
2392 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.",
2393}; 2394};
2394 2395
2395our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2396 id => "chat", 2397 id => "chat",
2397 title => "Chat", 2398 title => "Chat",
… …
2772 id => "infobox", 2773 id => "infobox",
2773 title => "Body Parts", 2774 title => "Body Parts",
2774 reply => undef, 2775 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2776 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2777 "c/skills" => { 2784 "c/skills" => {
2778 id => "infobox", 2785 id => "infobox",
2779 title => "Skills", 2786 title => "Skills",
2780 reply => undef, 2787 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2782 }, 2801 },
2783 "c/uptime" => { 2802 "c/uptime" => {
2784 id => "infobox", 2803 id => "infobox",
2785 title => "Uptime", 2804 title => "Uptime",
2786 reply => undef, 2805 reply => undef,
… …
2796 id => "party", 2815 id => "party",
2797 title => "Party", 2816 title => "Party",
2798 reply => "gsay ", 2817 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2800 }, 2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2801); 2828);
2802 2829
2803sub cf::client::send_msg { 2830sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2832
… …
2810 2837
2811 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2814 2841
2815 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2819 2844
2820 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2850 }
2827 2851
2828 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2829 } 2853 }
2830 2854
2831 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2832 2856
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2857 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2837 2860
2838 my $pkt = "msg " 2861 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2862 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2864 );
2842 2865
2843 # try lzf for large packets 2866 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2868 if 1024 <= length $pkt and $self->{can_lzf};
2846 2869
2847 # split very large packets 2870 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2873 $pkt = "frag";
2851 } 2874 }
2852 2875
2853 $self->send_packet ($pkt); 2876 $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} 2877}
2880 2878
2881=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2882 2880
2883Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3058The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3059 3057
3060 cf::object 3058 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3063 3062
3064 cf::object::player 3063 cf::object::player
3065 player 3064 player
3066 3065
3067 cf::player 3066 cf::player
… …
3073=cut 3072=cut
3074 3073
3075for ( 3074for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["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 3076 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3082) { 3081) {
3083 no strict 'refs'; 3082 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3102 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3103 3102
3104 my $qcode = $code; 3103 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3107 3108
3108 local $_; 3109 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3110 3111
3111 my $eval = 3112 my $eval =
… …
3341 reload_treasures; 3342 reload_treasures;
3342 3343
3343 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3344} 3345}
3345 3346
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3347sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3349 or return;
3357 3350
3358 local $/; 3351 local $/;
… …
3390 seek $fh, 0, 0; 3383 seek $fh, 0, 0;
3391 print $fh $$; 3384 print $fh $$;
3392} 3385}
3393 3386
3394sub main { 3387sub main {
3395 atomic; 3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3401
3397 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3405 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3404 }; 3409 };
3405 3410
3406 { 3411 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3408 reload_config; 3415 reload_config;
3409 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3410 load_extensions; 3429 load_extensions;
3411 3430
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3431 utime time, time, $RUNTIMEFILE;
3416 3432
3417 # no (long-running) fork's whatsoever before this point(!) 3433 # no (long-running) fork's whatsoever before this point(!)
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3437 };
3419 3438
3420 EV::loop; 3439 EV::loop;
3421} 3440}
3422 3441
3423############################################################################# 3442#############################################################################
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3482 3501
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3503 or return;
3485 3504
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3513 $uuid_skip = 0;
3488 3514
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3516 and return;
3491 3517
… …
3513} 3539}
3514 3540
3515sub emergency_save() { 3541sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3517 3543
3518 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3519 3545
3520 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3521 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3558 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3560 $pl->save;
3530 } 3561 }
3531 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3532 3563
3533 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3567 $map->valid or next;
3537 $map->save; 3568 $map->save;
3538 } 3569 }
3539 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3540 3571
3541 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3544 3575
3545 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3577 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3548 }; 3579 };
3549 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3550 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3551} 3587}
3552 3588
3553sub post_cleanup { 3589sub post_cleanup {
3554 my ($make_core) = @_; 3590 my ($make_core) = @_;
3555 3591
… …
3592 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3593 return; 3629 return;
3594 } 3630 }
3595 3631
3596 return if $RELOAD++; 3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3597 3635
3598 while ($RELOAD) { 3636 while ($RELOAD) {
3599 warn "reloading..."; 3637 warn "reloading...";
3600 3638
3601 warn "entering sync_job"; 3639 warn "entering sync_job";
… …
3662 clear_package "safe::$_" 3700 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3702
3665 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3706
3669 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3708 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3672 3710
… …
3680 cf::reload_config; 3718 cf::reload_config;
3681 3719
3682 warn "loading extensions"; 3720 warn "loading extensions";
3683 cf::load_extensions; 3721 cf::load_extensions;
3684 3722
3723 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3734
3692 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3693 3736
3694 1 3737 1
3695 } or do { 3738 } or do {
… …
3698 }; 3741 };
3699 3742
3700 warn "reloaded"; 3743 warn "reloaded";
3701 --$RELOAD; 3744 --$RELOAD;
3702 } 3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3703}; 3749};
3704 3750
3705our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3706 3752
3707sub reload_perl() { 3753sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3710 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3761 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3714 }; 3764 };
3715} 3765}
3716 3766
3717register_command "reload" => sub { 3767register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
… …
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 3928 }
3879} 3929}
3880 3930
3881# load additional modules 3931# load additional modules
3882use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3883 3933
3884END { cf::emergency_save } 3934END { cf::emergency_save }
3885 3935
38861 39361
3887 3937

Diff Legend

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