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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
… …
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 70
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{ 73# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86}
87 76
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 78
90our %COMMAND = (); 79our %COMMAND = ();
91our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
94our %EXTCMD = (); 83our %EXTCMD = ();
95our %EXTICMD = (); 84our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
98 87
99our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 89our @EVENT;
101 90
102our $CONFDIR = confdir; 91our $CONFDIR = confdir;
103our $DATADIR = datadir; 92our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
123our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 115our $DB_ENV;
127 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
128our %CFG; 119our %CFG;
129 120
130our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 122our $RUNTIME;
132our $NOW; 123our $NOW;
… …
140 131
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 134our $JITTER; # average jitter
144our $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)
145 140
146binmode STDOUT; 141binmode STDOUT;
147binmode STDERR; 142binmode STDERR;
148 143
149# read virtual server time, if available 144# read virtual server time, if available
… …
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 314
320sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
322 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
323=item cf::lock_wait $string 332=item cf::lock_wait $string
324 333
325Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
326 335
327=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
328 337
329Wait until the given lock is available and then acquires it and returns 338Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
332returned. 341returned.
333 342
334Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 344deadlocked coro.
… …
341 350
342Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
343 352
344=cut 353=cut
345 354
346our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 356
349sub lock_wait($) { 357sub lock_wait($) {
350 my ($key) = @_; 358 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 359}
363 360
364sub lock_acquire($) { 361sub lock_acquire($) {
365 my ($key) = @_; 362 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 363}
379 364
380sub lock_active($) { 365sub lock_active($) {
381 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 367}
385 368
386sub freeze_mainloop { 369sub freeze_mainloop {
387 tick_inhibit_inc; 370 tick_inhibit_inc;
388 371
389 Coro::guard \&tick_inhibit_dec; 372 &Guard::guard (\&tick_inhibit_dec);
390} 373}
391 374
392=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
393 376
394Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
… …
1183 } else { 1166 } else {
1184 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1185 } 1168 }
1186 1169
1187 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1174 } else {
1189 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1190 } 1176 }
1191 } else { 1177 } else {
1192 aio_unlink $filename; 1178 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1194 } 1180 }
… …
1285 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1286 1272
1287 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1288} 1274}
1289 1275
1276use File::Glob ();
1277
1290cf::player->attach ( 1278cf::player->attach (
1291 on_command => sub { 1279 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1293 1281
1294 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
… …
1325 } 1313 }
1326 1314
1327 cf::override; 1315 cf::override;
1328 }, 1316 },
1329); 1317);
1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1330 1331
1331sub load_extensions { 1332sub load_extensions {
1332 cf::sync_job { 1333 cf::sync_job {
1333 my %todo; 1334 my %todo;
1334 1335
… …
1457 1458
1458sub exists($) { 1459sub exists($) {
1459 my ($login) = @_; 1460 my ($login) = @_;
1460 1461
1461 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1463} 1464}
1464 1465
1465sub find($) { 1466sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1468 my $login = $_[0];
… …
1863 1864
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1866} 1867}
1867 1868
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1869sub decay_objects {
1878 my ($self) = @_; 1870 my ($self) = @_;
1879 1871
1880 return if $self->{deny_reset}; 1872 return if $self->{deny_reset};
1881 1873
… …
1963sub find { 1955sub find {
1964 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1965 1957
1966 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1967 1959
1968 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1962
1971 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
1976 or return; 1965 or return;
1977 1966
1978 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1979 1968
… …
2046 2035
2047 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2037 $self->decay_objects;
2049 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2050 $self->update_buttons; 2039 $self->update_buttons;
2051 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick; 2040 cf::cede_to_tick;
2054 $self->activate; 2041 $self->activate;
2055 } 2042 }
2056 2043
2057 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
… …
2784 id => "infobox", 2771 id => "infobox",
2785 title => "Body Parts", 2772 title => "Body Parts",
2786 reply => undef, 2773 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2788 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2789 "c/uptime" => { 2800 "c/uptime" => {
2790 id => "infobox", 2801 id => "infobox",
2791 title => "Uptime", 2802 title => "Uptime",
2792 reply => undef, 2803 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
… …
2802 id => "party", 2813 id => "party",
2803 title => "Party", 2814 title => "Party",
2804 reply => "gsay ", 2815 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2816 tooltip => "Messages and chat related to your party",
2806 }, 2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2807); 2826);
2808 2827
2809sub cf::client::send_msg { 2828sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2830
… …
2816 2835
2817 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2820 2839
2821 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2825 2842
2826 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2848 }
2833 2849
2834 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2835 } 2851 }
2836 2852
2837 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2838 2854
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2855 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2843 2858
2844 my $pkt = "msg " 2859 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2860 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2862 );
2848 2863
2849 # try lzf for large packets 2864 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt 2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf}; 2866 if 1024 <= length $pkt and $self->{can_lzf};
2852 2867
2853 # split very large packets 2868 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) { 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag"; 2871 $pkt = "frag";
2857 } 2872 }
2858 2873
2859 $self->send_packet ($pkt); 2874 $self->send_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 2875}
2886 2876
2887=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2888 2878
2889Sends an ext event to the client. 2879Sends an ext event to the client.
… …
3064The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3065 3055
3066 cf::object 3056 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3058 insert remove name archname title slaying race decrease split
3059 value
3069 3060
3070 cf::object::player 3061 cf::object::player
3071 player 3062 player
3072 3063
3073 cf::player 3064 cf::player
… …
3079=cut 3070=cut
3080 3071
3081for ( 3072for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3088) { 3079) {
3089 no strict 'refs'; 3080 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3108 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3109 3100
3110 my $qcode = $code; 3101 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3113 3106
3114 local $_; 3107 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3116 3109
3117 my $eval = 3110 my $eval =
… …
3347 reload_treasures; 3340 reload_treasures;
3348 3341
3349 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3350} 3343}
3351 3344
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3345sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3347 or return;
3363 3348
3364 local $/; 3349 local $/;
… …
3396 seek $fh, 0, 0; 3381 seek $fh, 0, 0;
3397 print $fh $$; 3382 print $fh $$;
3398} 3383}
3399 3384
3400sub main { 3385sub main {
3401 atomic; 3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3399
3403 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3403 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3410 }; 3407 };
3411 3408
3412 { 3409 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3410
3411 cf::sync_job {
3412 reload_resources;
3414 reload_config; 3413 reload_config;
3415 db_init; 3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3416 load_extensions; 3427 load_extensions;
3417 3428
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3429 utime time, time, $RUNTIMEFILE;
3422 3430
3423 # no (long-running) fork's whatsoever before this point(!) 3431 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3425 3436
3426 EV::loop; 3437 EV::loop;
3427} 3438}
3428 3439
3429############################################################################# 3440#############################################################################
… …
3487 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3488 3499
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3501 or return;
3491 3502
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3511 $uuid_skip = 0;
3494 3512
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3514 and return;
3497 3515
… …
3519} 3537}
3520 3538
3521sub emergency_save() { 3539sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3523 3541
3524 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3525 3543
3526 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3527 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3556 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3558 $pl->save;
3536 } 3559 }
3537 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3538 3561
3539 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3565 $map->valid or next;
3543 $map->save; 3566 $map->save;
3544 } 3567 }
3545 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3546 3569
3547 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3550 3573
3551 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3575 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3554 }; 3577 };
3555 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3556 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3557} 3585}
3558 3586
3559sub post_cleanup { 3587sub post_cleanup {
3560 my ($make_core) = @_; 3588 my ($make_core) = @_;
3561 3589
… …
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3616 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3617 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3619 }
3592 warn "cleared package #$pkg\n";#d# 3620 warn "cleared package $pkg\n";#d#
3593} 3621}
3594
3595our $RELOAD; # how many times to reload
3596 3622
3597sub do_reload_perl() { 3623sub do_reload_perl() {
3598 # can/must only be called in main 3624 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3601 return; 3627 return;
3602 } 3628 }
3603 3629
3604 return if $RELOAD++; 3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3605 3633
3606 while ($RELOAD) { 3634 while ($RELOAD) {
3607 warn "reloading..."; 3635 warn "reloading...";
3608 3636
3609 warn "entering sync_job"; 3637 warn "entering sync_job";
… …
3670 clear_package "safe::$_" 3698 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3700
3673 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3704
3677 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3706 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3680 3708
… …
3688 cf::reload_config; 3716 cf::reload_config;
3689 3717
3690 warn "loading extensions"; 3718 warn "loading extensions";
3691 cf::load_extensions; 3719 cf::load_extensions;
3692 3720
3721 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3732
3700 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3701 3734
3702 1 3735 1
3703 } or do { 3736 } or do {
… …
3706 }; 3739 };
3707 3740
3708 warn "reloaded"; 3741 warn "reloaded";
3709 --$RELOAD; 3742 --$RELOAD;
3710 } 3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3711}; 3747};
3712 3748
3713our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3714 3750
3715sub reload_perl() { 3751sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3718 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3759 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3722 }; 3762 };
3723} 3763}
3724 3764
3725register_command "reload" => sub { 3765register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 3926 }
3887} 3927}
3888 3928
3889# load additional modules 3929# load additional modules
3890use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3891 3931
3892END { cf::emergency_save } 3932END { cf::emergency_save }
3893 3933
38941 39341
3895 3935

Diff Legend

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