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.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;
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} 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 79
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 81
90our %COMMAND = (); 82our %COMMAND = ();
91our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
94our %EXTCMD = (); 86our %EXTCMD = ();
95our %EXTICMD = (); 87our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
98 90
99our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 92our @EVENT;
101 93
102our $CONFDIR = confdir; 94our $CONFDIR = confdir;
103our $DATADIR = datadir; 95our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
116our %RESOURCE; 108our %RESOURCE;
117 109
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 112our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
122 114
123our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 118our $DB_ENV;
127 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
128our %CFG; 122our %CFG;
129 123
130our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 125our $RUNTIME;
132our $NOW; 126our $NOW;
140 134
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 137our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
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 :)
145 144
146binmode STDOUT; 145binmode STDOUT;
147binmode STDERR; 146binmode STDERR;
148 147
149# read virtual server time, if available 148# read virtual server time, if available
150unless ($RUNTIME || !-e $RUNTIMEFILE) { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
151 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
154} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
155 156
156mkdir $_ 157mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 159
159our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 320
320sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
322 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
323=item cf::lock_wait $string 338=item cf::lock_wait $string
324 339
325Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
326 341
327=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
328 343
329Wait 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
330a 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,
331for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
332returned. 347returned.
333 348
334Locks 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
335deadlocked coro. 350deadlocked coro.
341 356
342Return 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.
343 358
344=cut 359=cut
345 360
346our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 362
349sub lock_wait($) { 363sub lock_wait($) {
350 my ($key) = @_; 364 $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} 365}
363 366
364sub lock_acquire($) { 367sub lock_acquire($) {
365 my ($key) = @_; 368 $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} 369}
379 370
380sub lock_active($) { 371sub lock_active($) {
381 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 373}
385 374
386sub freeze_mainloop { 375sub freeze_mainloop {
387 tick_inhibit_inc; 376 tick_inhibit_inc;
388 377
389 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
390} 379}
391 380
392=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
393 382
394Like 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
1166 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1167 1156
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 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 }
1172 aio_close $fh; 1164 aio_close $fh;
1173 1165
1174 if (@$objs) { 1166 if (@$objs) {
1175 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) {
1176 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1179 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 }
1180 aio_close $fh; 1175 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1177 }
1183 } else { 1178 } else {
1184 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1185 } 1180 }
1186 1181
1187 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1186 } else {
1189 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1190 } 1188 }
1191 } else { 1189 } else {
1192 aio_unlink $filename; 1190 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1194 } 1192 }
1285 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1286 1284
1287 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1288} 1286}
1289 1287
1288use File::Glob ();
1289
1290cf::player->attach ( 1290cf::player->attach (
1291 on_command => sub { 1291 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1293 1293
1294 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1325 } 1325 }
1326 1326
1327 cf::override; 1327 cf::override;
1328 }, 1328 },
1329); 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}
1330 1343
1331sub load_extensions { 1344sub load_extensions {
1332 cf::sync_job { 1345 cf::sync_job {
1333 my %todo; 1346 my %todo;
1334 1347
1457 1470
1458sub exists($) { 1471sub exists($) {
1459 my ($login) = @_; 1472 my ($login) = @_;
1460 1473
1461 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1463} 1476}
1464 1477
1465sub find($) { 1478sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1480 my $login = $_[0];
1863 1876
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1866} 1879}
1867 1880
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 { 1881sub decay_objects {
1878 my ($self) = @_; 1882 my ($self) = @_;
1879 1883
1880 return if $self->{deny_reset}; 1884 return if $self->{deny_reset};
1881 1885
1963sub find { 1967sub find {
1964 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1965 1969
1966 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1967 1971
1968 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1974
1971 $cf::MAP{$path} || do { 1975 $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 1976 my $map = new_from_path cf::map $path
1976 or return; 1977 or return;
1977 1978
1978 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1979 1980
2046 2047
2047 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2049 $self->decay_objects;
2049 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2050 $self->update_buttons; 2051 $self->update_buttons;
2051 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick; 2052 cf::cede_to_tick;
2054 $self->activate; 2053 $self->activate;
2055 } 2054 }
2056 2055
2057 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2399 2398
2400our $SAY_CHANNEL = { 2399our $SAY_CHANNEL = {
2401 id => "say", 2400 id => "say",
2402 title => "Map", 2401 title => "Map",
2403 reply => "say ", 2402 reply => "say ",
2404 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.",
2405}; 2404};
2406 2405
2407our $CHAT_CHANNEL = { 2406our $CHAT_CHANNEL = {
2408 id => "chat", 2407 id => "chat",
2409 title => "Chat", 2408 title => "Chat",
2784 id => "infobox", 2783 id => "infobox",
2785 title => "Body Parts", 2784 title => "Body Parts",
2786 reply => undef, 2785 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2788 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
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",
2823 },
2789 "c/uptime" => { 2824 "c/uptime" => {
2790 id => "infobox", 2825 id => "infobox",
2791 title => "Uptime", 2826 title => "Uptime",
2792 reply => undef, 2827 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
2802 id => "party", 2837 id => "party",
2803 title => "Party", 2838 title => "Party",
2804 reply => "gsay ", 2839 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2840 tooltip => "Messages and chat related to your party",
2806 }, 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,
2807); 2850);
2808 2851
2809sub cf::client::send_msg { 2852sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2854
2816 2859
2817 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2820 2863
2821 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2825 2866
2826 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2872 }
2833 2873
2834 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2835 } 2875 }
2836 2876
2837 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2838 2878
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2879 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2843 2882
2844 my $pkt = "msg " 2883 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2884 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2886 );
2848 2887
2849 # try lzf for large packets 2888 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt 2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf}; 2890 if 1024 <= length $pkt and $self->{can_lzf};
2852 2891
2853 # split very large packets 2892 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) { 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag"; 2895 $pkt = "frag";
2857 } 2896 }
2858 2897
2859 $self->send_packet ($pkt); 2898 $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} 2899}
2886 2900
2887=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2888 2902
2889Sends an ext event to the client. 2903Sends an ext event to the client.
3064The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3065 3079
3066 cf::object 3080 cf::object
3067 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
3068 insert remove name archname title slaying race decrease split 3082 insert remove name archname title slaying race decrease split
3083 value
3069 3084
3070 cf::object::player 3085 cf::object::player
3071 player 3086 player
3072 3087
3073 cf::player 3088 cf::player
3079=cut 3094=cut
3080 3095
3081for ( 3096for (
3082 ["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
3083 insert remove inv nrof name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3088) { 3103) {
3089 no strict 'refs'; 3104 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3109 3124
3110 my $qcode = $code; 3125 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3113 3130
3114 local $_; 3131 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3116 3133
3117 my $eval = 3134 my $eval =
3347 reload_treasures; 3364 reload_treasures;
3348 3365
3349 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3350} 3367}
3351 3368
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3369sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3371 or return;
3363 3372
3364 local $/; 3373 local $/;
3395 3404
3396 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3397 print $fh $$; 3406 print $fh $$;
3398} 3407}
3399 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
3400sub main { 3418sub main {
3401 atomic; 3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3432
3403 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3436 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3410 }; 3440 };
3411 3441
3412 { 3442 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3443
3444 cf::sync_job {
3445 reload_resources;
3414 reload_config; 3446 reload_config;
3415 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3416 load_extensions; 3460 load_extensions;
3417 3461
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3462 utime time, time, $RUNTIMEFILE;
3422 3463
3423 # no (long-running) fork's whatsoever before this point(!) 3464 # no (long-running) fork's whatsoever before this point(!)
3424 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};
3425 3466
3426 EV::loop; 3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
3427} 3471}
3428 3472
3429############################################################################# 3473#############################################################################
3430# initialisation and cleanup 3474# initialisation and cleanup
3431 3475
3487 my $uuid = "$LOCALDIR/uuid"; 3531 my $uuid = "$LOCALDIR/uuid";
3488 3532
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3534 or return;
3491 3535
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3544 $uuid_skip = 0;
3494 3545
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3547 and return;
3497 3548
3519} 3570}
3520 3571
3521sub emergency_save() { 3572sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3523 3574
3524 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3525 3576
3526 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3527 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3589 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3591 $pl->save;
3536 } 3592 }
3537 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3538 3594
3539 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3598 $map->valid or next;
3543 $map->save; 3599 $map->save;
3544 } 3600 }
3545 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3546 3602
3547 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3550 3606
3551 warn "begin write uuid\n"; 3607 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3608 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3609 warn "emergency_perl_save: end write uuid\n";
3554 }; 3610 };
3555 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3556 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3557} 3618}
3558 3619
3559sub post_cleanup { 3620sub post_cleanup {
3560 my ($make_core) = @_; 3621 my ($make_core) = @_;
3561 3622
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3649 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3650 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3652 }
3592 warn "cleared package #$pkg\n";#d# 3653 warn "cleared package $pkg\n";#d#
3593} 3654}
3594
3595our $RELOAD; # how many times to reload
3596 3655
3597sub do_reload_perl() { 3656sub do_reload_perl() {
3598 # can/must only be called in main 3657 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3601 return; 3660 return;
3602 } 3661 }
3603 3662
3604 return if $RELOAD++; 3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3605 3666
3606 while ($RELOAD) { 3667 while ($RELOAD) {
3607 warn "reloading..."; 3668 warn "reloading...";
3608 3669
3609 warn "entering sync_job"; 3670 warn "entering sync_job";
3670 clear_package "safe::$_" 3731 clear_package "safe::$_"
3671 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);
3672 3733
3673 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3737
3677 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3739 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3680 3741
3688 cf::reload_config; 3749 cf::reload_config;
3689 3750
3690 warn "loading extensions"; 3751 warn "loading extensions";
3691 cf::load_extensions; 3752 cf::load_extensions;
3692 3753
3754 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3765
3700 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3701 3767
3702 1 3768 1
3703 } or do { 3769 } or do {
3706 }; 3772 };
3707 3773
3708 warn "reloaded"; 3774 warn "reloaded";
3709 --$RELOAD; 3775 --$RELOAD;
3710 } 3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3711}; 3780};
3712 3781
3713our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3714 3783
3715sub reload_perl() { 3784sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3718 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3792 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3794 };
3722 }; 3795 };
3723} 3796}
3724 3797
3725register_command "reload" => sub { 3798register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 3959 }
3887} 3960}
3888 3961
3889# load additional modules 3962# load additional modules
3890use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3891 3964
3892END { cf::emergency_save } 3965END { cf::emergency_save }
3893 3966
38941 39671
3895 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines