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.453 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 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;
… …
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
132 139
133our @POST_INIT; 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 :)
134 144
135binmode STDOUT; 145binmode STDOUT;
136binmode STDERR; 146binmode STDERR;
137 147
138# read virtual server time, if available 148# read virtual server time, if available
139unless ($RUNTIME || !-e $RUNTIMEFILE) { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
140 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
143} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
144 156
145mkdir $_ 157mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 159
148our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
328Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
329 341
330=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
331 343
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
335returned. 347returned.
336 348
337Locks 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
338deadlocked coro. 350deadlocked coro.
… …
344 356
345Return 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.
346 358
347=cut 359=cut
348 360
349our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 362
352sub lock_wait($) { 363sub lock_wait($) {
353 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 365}
367 366
368sub lock_acquire($) { 367sub lock_acquire($) {
369 my ($key) = @_; 368 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 369}
383 370
384sub lock_active($) { 371sub lock_active($) {
385 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 373}
389 374
390sub freeze_mainloop { 375sub freeze_mainloop {
391 tick_inhibit_inc; 376 tick_inhibit_inc;
392 377
393 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
394} 379}
395 380
396=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
397 382
398Like 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
… …
1170 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1171 1156
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1164 aio_close $fh;
1177 1165
1178 if (@$objs) { 1166 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1175 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1177 }
1187 } else { 1178 } else {
1188 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1189 } 1180 }
1190 1181
1191 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1186 } else {
1193 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1194 } 1188 }
1195 } else { 1189 } else {
1196 aio_unlink $filename; 1190 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1198 } 1192 }
… …
1289 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1290 1284
1291 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1292} 1286}
1293 1287
1288use File::Glob ();
1289
1294cf::player->attach ( 1290cf::player->attach (
1295 on_command => sub { 1291 on_command => sub {
1296 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1297 1293
1298 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
… …
1329 } 1325 }
1330 1326
1331 cf::override; 1327 cf::override;
1332 }, 1328 },
1333); 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}
1334 1343
1335sub load_extensions { 1344sub load_extensions {
1336 cf::sync_job { 1345 cf::sync_job {
1337 my %todo; 1346 my %todo;
1338 1347
… …
1867 1876
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1870} 1879}
1871 1880
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1881sub decay_objects {
1882 my ($self) = @_; 1882 my ($self) = @_;
1883 1883
1884 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1885 1885
… …
1967sub find { 1967sub find {
1968 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1969 1969
1970 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1971 1971
1972 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974 1974
1975 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1980 or return; 1977 or return;
1981 1978
1982 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1983 1980
… …
2050 2047
2051 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2049 $self->decay_objects;
2053 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2054 $self->update_buttons; 2051 $self->update_buttons;
2055 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick; 2052 cf::cede_to_tick;
2058 $self->activate; 2053 $self->activate;
2059 } 2054 }
2060 2055
2061 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2403 2398
2404our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2405 id => "say", 2400 id => "say",
2406 title => "Map", 2401 title => "Map",
2407 reply => "say ", 2402 reply => "say ",
2408 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.",
2409}; 2404};
2410 2405
2411our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2412 id => "chat", 2407 id => "chat",
2413 title => "Chat", 2408 title => "Chat",
… …
2539 2534
2540 $map->load; 2535 $map->load;
2541 $map->load_neighbours; 2536 $map->load_neighbours;
2542 2537
2543 return unless $self->contr->active; 2538 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2539
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2542
2543 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive;
2549} 2545}
2550 2546
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2548
2553Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
… …
2788 id => "infobox", 2784 id => "infobox",
2789 title => "Body Parts", 2785 title => "Body Parts",
2790 reply => undef, 2786 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2787 tooltip => "Shows which body parts you posess and are available",
2792 }, 2788 },
2789 "c/statistics" => {
2790 id => "infobox",
2791 title => "Statistics",
2792 reply => undef,
2793 tooltip => "Shows your primary statistics",
2794 },
2793 "c/skills" => { 2795 "c/skills" => {
2794 id => "infobox", 2796 id => "infobox",
2795 title => "Skills", 2797 title => "Skills",
2796 reply => undef, 2798 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2799 tooltip => "Shows your experience per skill and item power",
2800 },
2801 "c/shopitems" => {
2802 id => "infobox",
2803 title => "Shop Items",
2804 reply => undef,
2805 tooltip => "Shows the items currently for sale in this shop",
2806 },
2807 "c/resistances" => {
2808 id => "infobox",
2809 title => "Resistances",
2810 reply => undef,
2811 tooltip => "Shows your resistances",
2812 },
2813 "c/pets" => {
2814 id => "infobox",
2815 title => "Pets",
2816 reply => undef,
2817 tooltip => "Shows information abotu your pets/a specific pet",
2818 },
2819 "c/perceiveself" => {
2820 id => "infobox",
2821 title => "Perceive Self",
2822 reply => undef,
2823 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2824 },
2799 "c/uptime" => { 2825 "c/uptime" => {
2800 id => "infobox", 2826 id => "infobox",
2801 title => "Uptime", 2827 title => "Uptime",
2802 reply => undef, 2828 reply => undef,
… …
2812 id => "party", 2838 id => "party",
2813 title => "Party", 2839 title => "Party",
2814 reply => "gsay ", 2840 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2841 tooltip => "Messages and chat related to your party",
2816 }, 2842 },
2843 "c/death" => {
2844 id => "death",
2845 title => "Death",
2846 reply => undef,
2847 tooltip => "Reason for and more info about your most recent death",
2848 },
2849 "c/say" => $SAY_CHANNEL,
2850 "c/chat" => $CHAT_CHANNEL,
2817); 2851);
2818 2852
2819sub cf::client::send_msg { 2853sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 2854 my ($self, $channel, $msg, $color, @extra) = @_;
2821 2855
… …
2826 2860
2827 # check predefined channels, for the benefit of C 2861 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 2862 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 2863 $channel = $CHANNEL{$channel};
2830 2864
2831 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 2866 $channel = $channel->{id};
2835 2867
2836 } elsif (ref $channel) { 2868 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 2869 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 2870 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 2871 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 2872 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 2873 }
2843 2874
2844 $channel = $channel->{id}; 2875 $channel = $channel->{id};
2845 } 2876 }
2846 2877
2847 return unless @extra || length $msg; 2878 return unless @extra || length $msg;
2848 2879
2849 if ($self->can_msg) {
2850 # default colour, mask it out 2880 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2881 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 2882 if $color & cf::NDI_DEF;
2853 2883
2854 my $pkt = "msg " 2884 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 2885 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 2887 );
2858 2888
2859 # try lzf for large packets 2889 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt 2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf}; 2891 if 1024 <= length $pkt and $self->{can_lzf};
2862 2892
2863 # split very large packets 2893 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) { 2894 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag"; 2896 $pkt = "frag";
2867 } 2897 }
2868 2898
2869 $self->send_packet ($pkt); 2899 $self->send_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 2900}
2896 2901
2897=item $client->ext_msg ($type, @msg) 2902=item $client->ext_msg ($type, @msg)
2898 2903
2899Sends an ext event to the client. 2904Sends an ext event to the client.
… …
3074The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3075 3080
3076 cf::object 3081 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3083 insert remove name archname title slaying race decrease split
3084 value
3079 3085
3080 cf::object::player 3086 cf::object::player
3081 player 3087 player
3082 3088
3083 cf::player 3089 cf::player
… …
3089=cut 3095=cut
3090 3096
3091for ( 3097for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3098 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3099 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3100 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3101 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3102 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3103 ["cf::map" => qw(trigger)],
3098) { 3104) {
3099 no strict 'refs'; 3105 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3106 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 my ($code, %vars) = @_; 3124 my ($code, %vars) = @_;
3119 3125
3120 my $qcode = $code; 3126 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3128 $qcode =~ s/\n/\\n/g;
3129
3130 %vars = (_dummy => 0) unless %vars;
3123 3131
3124 local $_; 3132 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars; 3133 local @safe::cf::_safe_eval_args = values %vars;
3126 3134
3127 my $eval = 3135 my $eval =
… …
3397 3405
3398 seek $fh, 0, 0; 3406 seek $fh, 0, 0;
3399 print $fh $$; 3407 print $fh $$;
3400} 3408}
3401 3409
3410sub main_loop {
3411 warn "EV::loop starting\n";
3412 if (1) {
3413 EV::loop;
3414 }
3415 warn "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP;
3417}
3418
3402sub main { 3419sub main {
3403 cf::init_globals; # initialise logging 3420 cf::init_globals; # initialise logging
3404 3421
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3409 3426
3410 cf::init_experience; 3427 cf::init_experience;
3411 cf::init_anim; 3428 cf::init_anim;
3412 cf::init_attackmess; 3429 cf::init_attackmess;
3413 cf::init_dynamic; 3430 cf::init_dynamic;
3414 cf::init_block;
3415 3431
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3433
3418 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
… …
3445 load_extensions; 3461 load_extensions;
3446 3462
3447 utime time, time, $RUNTIMEFILE; 3463 utime time, time, $RUNTIMEFILE;
3448 3464
3449 # no (long-running) fork's whatsoever before this point(!) 3465 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3468
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3469 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3470 };
3454 3471
3455 EV::loop; 3472 main_loop;
3456} 3473}
3457 3474
3458############################################################################# 3475#############################################################################
3459# initialisation and cleanup 3476# initialisation and cleanup
3460 3477
… …
3516 my $uuid = "$LOCALDIR/uuid"; 3533 my $uuid = "$LOCALDIR/uuid";
3517 3534
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3535 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3536 or return;
3520 3537
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3538 my $value = uuid_seq uuid_cur;
3539
3540 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n";
3542 return;
3543 }
3544
3545 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3546 $uuid_skip = 0;
3523 3547
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3548 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3549 and return;
3526 3550
… …
3548} 3572}
3549 3573
3550sub emergency_save() { 3574sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3575 my $freeze_guard = cf::freeze_mainloop;
3552 3576
3553 warn "enter emergency perl save\n"; 3577 warn "emergency_perl_save: enter\n";
3554 3578
3555 cf::sync_job { 3579 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584
3556 # use a peculiar iteration method to avoid tripping on perl 3585 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3586 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3587 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3588 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3589 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3590 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3591 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3593 $pl->save;
3565 } 3594 }
3566 warn "end emergency player save\n"; 3595 warn "emergency_perl_save: end player save\n";
3567 3596
3568 warn "begin emergency map save\n"; 3597 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3598 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3599 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3600 $map->valid or next;
3572 $map->save; 3601 $map->save;
3573 } 3602 }
3574 warn "end emergency map save\n"; 3603 warn "emergency_perl_save: end map save\n";
3575 3604
3576 warn "begin emergency database checkpoint\n"; 3605 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3606 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3607 warn "emergency_perl_save: end database checkpoint\n";
3579 3608
3580 warn "begin write uuid\n"; 3609 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3610 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3611 warn "emergency_perl_save: end write uuid\n";
3583 }; 3612 };
3584 3613
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3585 warn "leave emergency perl save\n"; 3619 warn "emergency_perl_save: leave\n";
3586} 3620}
3587 3621
3588sub post_cleanup { 3622sub post_cleanup {
3589 my ($make_core) = @_; 3623 my ($make_core) = @_;
3590 3624
… …
3627 warn "can only reload from main coroutine"; 3661 warn "can only reload from main coroutine";
3628 return; 3662 return;
3629 } 3663 }
3630 3664
3631 return if $RELOAD++; 3665 return if $RELOAD++;
3666
3667 my $t1 = EV::time;
3632 3668
3633 while ($RELOAD) { 3669 while ($RELOAD) {
3634 warn "reloading..."; 3670 warn "reloading...";
3635 3671
3636 warn "entering sync_job"; 3672 warn "entering sync_job";
… …
3697 clear_package "safe::$_" 3733 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 3735
3700 warn "unloading cf.pm \"a bit\""; 3736 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3737 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3739
3704 # don't, removes xs symbols, too, 3740 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3741 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3742 #clear_package __PACKAGE__;
3707 3743
… …
3715 cf::reload_config; 3751 cf::reload_config;
3716 3752
3717 warn "loading extensions"; 3753 warn "loading extensions";
3718 cf::load_extensions; 3754 cf::load_extensions;
3719 3755
3756 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3757 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3758 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3759 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3760 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3761 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3762 reattach $_ for values %PLAYER;
3763 }
3726 3764
3727 warn "running post_load"; 3765 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3766 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3767
3730 warn "leaving sync_job"; 3768 warn "leaving sync_job";
3731 3769
3732 1 3770 1
… …
3736 }; 3774 };
3737 3775
3738 warn "reloaded"; 3776 warn "reloaded";
3739 --$RELOAD; 3777 --$RELOAD;
3740 } 3778 }
3779
3780 $t1 = EV::time - $t1;
3781 warn "reload completed in ${t1}s\n";
3741}; 3782};
3742 3783
3743our $RELOAD_WATCHER; # used only during reload 3784our $RELOAD_WATCHER; # used only during reload
3744 3785
3745sub reload_perl() { 3786sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3787 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3788 # coro crashes during coro_state_free->destroy here.
3748 3789
3790 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions;
3792
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3794 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3795 undef $RELOAD_WATCHER;
3796 };
3752 }; 3797 };
3753} 3798}
3754 3799
3755register_command "reload" => sub { 3800register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3801 my ($who, $arg) = @_;
… …
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 3960 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 3961 }
3917} 3962}
3918 3963
3919# load additional modules 3964# load additional modules
3920use cf::pod; 3965require "cf/$_.pm" for @EXTRA_MODULES;
3921 3966
3922END { cf::emergency_save } 3967END { cf::emergency_save }
3923 3968
39241 39691
3925 3970

Diff Legend

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