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.458 by root, Sat Dec 13 20:34:37 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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;
… …
41use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent; 42use Coro::AnyEvent;
43use Coro::Timer; 43use Coro::Timer;
44use Coro::Signal; 44use Coro::Signal;
45use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
46use Coro::AnyEvent; 47use Coro::AnyEvent;
47use Coro::AIO; 48use Coro::AIO;
48use Coro::BDB 1.6; 49use Coro::BDB 1.6;
49use Coro::Storable; 50use Coro::Storable;
50use Coro::Util (); 51use Coro::Util ();
… …
70$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
71 72
72# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
74Compress::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" };
75 79
76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
77 81
78our %COMMAND = (); 82our %COMMAND = ();
79our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
104our %RESOURCE; 108our %RESOURCE;
105 109
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 112our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
110 114
111our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 118our $DB_ENV;
115 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
116our %CFG; 122our %CFG;
117 123
118our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 125our $RUNTIME;
120our $NOW; 126our $NOW;
… …
131our $JITTER; # average jitter 137our $JITTER; # average jitter
132our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
133 139
134our @POST_INIT; 140our @POST_INIT;
135 141
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
137 144
138binmode STDOUT; 145binmode STDOUT;
139binmode STDERR; 146binmode STDERR;
140 147
141# read virtual server time, if available 148# read virtual server time, if available
142unless ($RUNTIME || !-e $RUNTIMEFILE) { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
143 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
146} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
147 156
148mkdir $_ 157mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 159
151our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
… …
347 356
348Return 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.
349 358
350=cut 359=cut
351 360
352our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 362
355sub lock_wait($) { 363sub lock_wait($) {
356 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 365}
370 366
371sub lock_acquire($) { 367sub lock_acquire($) {
372 my ($key) = @_; 368 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 369}
386 370
387sub lock_active($) { 371sub lock_active($) {
388 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 373}
392 374
393sub freeze_mainloop { 375sub freeze_mainloop {
394 tick_inhibit_inc; 376 tick_inhibit_inc;
395 377
… …
1173 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1174 1156
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 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 }
1179 aio_close $fh; 1164 aio_close $fh;
1180 1165
1181 if (@$objs) { 1166 if (@$objs) {
1182 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) {
1183 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1186 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 }
1187 aio_close $fh; 1175 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1177 }
1190 } else { 1178 } else {
1191 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
… …
1194 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1195 1183
1196 $filename =~ s%/[^/]+$%%; 1184 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1185 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1186 } else {
1199 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1200 } 1188 }
1201 } else { 1189 } else {
1202 aio_unlink $filename; 1190 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1204 } 1192 }
… …
1342 1330
1343# "readahead" all extensions 1331# "readahead" all extensions
1344sub cache_extensions { 1332sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1333 my $grp = IO::AIO::aio_group;
1346 1334
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1336 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1338 }
1351 }; 1339 };
1352 1340
… …
1888 1876
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1891} 1879}
1892 1880
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900}
1901
1902sub decay_objects { 1881sub decay_objects {
1903 my ($self) = @_; 1882 my ($self) = @_;
1904 1883
1905 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1906 1885
… …
1988sub find { 1967sub find {
1989 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1990 1969
1991 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1992 1971
1993 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1995 1974
1996 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
2001 or return; 1977 or return;
2002 1978
2003 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2004 1980
… …
2071 2047
2072 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2049 $self->decay_objects;
2074 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2075 $self->update_buttons; 2051 $self->update_buttons;
2076 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick; 2052 cf::cede_to_tick;
2079 $self->activate; 2053 $self->activate;
2080 } 2054 }
2081 2055
2082 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
… …
2424 2398
2425our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2426 id => "say", 2400 id => "say",
2427 title => "Map", 2401 title => "Map",
2428 reply => "say ", 2402 reply => "say ",
2429 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.",
2430}; 2404};
2431 2405
2432our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2433 id => "chat", 2407 id => "chat",
2434 title => "Chat", 2408 title => "Chat",
… …
2809 id => "infobox", 2783 id => "infobox",
2810 title => "Body Parts", 2784 title => "Body Parts",
2811 reply => undef, 2785 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2813 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2814 "c/skills" => { 2794 "c/skills" => {
2815 id => "infobox", 2795 id => "infobox",
2816 title => "Skills", 2796 title => "Skills",
2817 reply => undef, 2797 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2819 }, 2823 },
2820 "c/uptime" => { 2824 "c/uptime" => {
2821 id => "infobox", 2825 id => "infobox",
2822 title => "Uptime", 2826 title => "Uptime",
2823 reply => undef, 2827 reply => undef,
… …
2833 id => "party", 2837 id => "party",
2834 title => "Party", 2838 title => "Party",
2835 reply => "gsay ", 2839 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2837 }, 2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2838); 2850);
2839 2851
2840sub cf::client::send_msg { 2852sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2854
… …
2847 2859
2848 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2851 2863
2852 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2856 2866
2857 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2872 }
2864 2873
2865 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2866 } 2875 }
2867 2876
2868 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2869 2878
2870 if ($self->can_msg) {
2871 # default colour, mask it out 2879 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2874 2882
2875 my $pkt = "msg " 2883 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 2884 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 2886 );
2879 2887
2880 # try lzf for large packets 2888 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt 2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf}; 2890 if 1024 <= length $pkt and $self->{can_lzf};
2883 2891
2884 # split very large packets 2892 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) { 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag"; 2895 $pkt = "frag";
2888 } 2896 }
2889 2897
2890 $self->send_packet ($pkt); 2898 $self->send_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 2899}
2917 2900
2918=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2919 2902
2920Sends an ext event to the client. 2903Sends an ext event to the client.
… …
3095The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3096 3079
3097 cf::object 3080 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3100 3084
3101 cf::object::player 3085 cf::object::player
3102 player 3086 player
3103 3087
3104 cf::player 3088 cf::player
… …
3110=cut 3094=cut
3111 3095
3112for ( 3096for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3114 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3119) { 3103) {
3120 no strict 'refs'; 3104 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3140 3124
3141 my $qcode = $code; 3125 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3144 3130
3145 local $_; 3131 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3147 3133
3148 my $eval = 3134 my $eval =
… …
3418 3404
3419 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3420 print $fh $$; 3406 print $fh $$;
3421} 3407}
3422 3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3423sub main { 3418sub main {
3424 cf::init_globals; # initialise logging 3419 cf::init_globals; # initialise logging
3425 3420
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3430 3425
3431 cf::init_experience; 3426 cf::init_experience;
3432 cf::init_anim; 3427 cf::init_anim;
3433 cf::init_attackmess; 3428 cf::init_attackmess;
3434 cf::init_dynamic; 3429 cf::init_dynamic;
3435 cf::init_block;
3436 3430
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3432
3439 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
… …
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472 3466
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3467 (pop @POST_INIT)->(0) while @POST_INIT;
3474 }; 3468 };
3475 3469
3476 EV::loop; 3470 main_loop;
3477} 3471}
3478 3472
3479############################################################################# 3473#############################################################################
3480# initialisation and cleanup 3474# initialisation and cleanup
3481 3475
… …
3737 clear_package "safe::$_" 3731 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3733
3740 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3737
3744 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3739 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3747 3741
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 3959 }
3966} 3960}
3967 3961
3968# load additional modules 3962# load additional modules
3969use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3970 3964
3971END { cf::emergency_save } 3965END { cf::emergency_save }
3972 3966
39731 39671
3974 3968

Diff Legend

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