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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.477 by root, Wed Sep 2 22:52:36 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;
… …
127 134
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
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
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 :)
132 144
133binmode STDOUT; 145binmode STDOUT;
134binmode STDERR; 146binmode STDERR;
135 147
136# read virtual server time, if available 148# read virtual server time, if available
… …
138 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
141} 153}
142 154
155eval "sub TICK() { $TICK } 1" or die;
156
143mkdir $_ 157mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 159
146our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
147 161
… …
208 222
209=back 223=back
210 224
211=cut 225=cut
212 226
213BEGIN { 227$Coro::State::WARNHOOK = sub {
214 *CORE::GLOBAL::warn = sub {
215 my $msg = join "", @_; 228 my $msg = join "", @_;
216 229
217 $msg .= "\n" 230 $msg .= "\n"
218 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
219 232
220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
221 234
222 LOG llevError, $msg; 235 LOG llevError, $msg;
223 }; 236};
224}
225 237
226$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
228 242
229 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 245 return;#d#
232 }#d# 246 }#d#
233 247
234 # kill coroutine otherwise 248 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 249 Coro::terminate
237}; 250};
238
239$SIG{__DIE__} = sub { }; #d#?
240 251
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306 317
307sub encode_json($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 319sub decode_json($) { $json_coder->decode ($_[0]) }
309 320
321=item cf::post_init { BLOCK }
322
323Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again.
325
326The cdoeblock will have a single boolean argument to indicate whether this
327is a reload or not.
328
329=cut
330
331sub post_init(&) {
332 push @POST_INIT, shift;
333}
334
310=item cf::lock_wait $string 335=item cf::lock_wait $string
311 336
312Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
313 338
314=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
315 340
316Wait until the given lock is available and then acquires it and returns 341Wait until the given lock is available and then acquires it and returns
317a Coro::guard object. If the guard object gets destroyed (goes out of scope, 342a L<Guard> object. If the guard object gets destroyed (goes out of scope,
318for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
319returned. 344returned.
320 345
321Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro. 347deadlocked coro.
… …
328 353
329Return true if the lock is currently active, i.e. somebody has locked it. 354Return true if the lock is currently active, i.e. somebody has locked it.
330 355
331=cut 356=cut
332 357
333our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 359
336sub lock_wait($) { 360sub lock_wait($) {
337 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 362}
351 363
352sub lock_acquire($) { 364sub lock_acquire($) {
353 my ($key) = @_; 365 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 366}
367 367
368sub lock_active($) { 368sub lock_active($) {
369 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 370}
373 371
374sub freeze_mainloop { 372sub freeze_mainloop {
375 tick_inhibit_inc; 373 tick_inhibit_inc;
376 374
377 Coro::guard \&tick_inhibit_dec; 375 &Guard::guard (\&tick_inhibit_dec);
378} 376}
379 377
380=item cf::periodic $interval, $cb 378=item cf::periodic $interval, $cb
381 379
382Like EV::periodic, but randomly selects a starting point so that the actions 380Like EV::periodic, but randomly selects a starting point so that the actions
… …
1154 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1155 1153
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 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;
1159 aio_fsync $fh;
1160 }
1160 aio_close $fh; 1161 aio_close $fh;
1161 1162
1162 if (@$objs) { 1163 if (@$objs) {
1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1164 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1167 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 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;
1170 aio_fsync $fh;
1171 }
1168 aio_close $fh; 1172 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1174 }
1171 } else { 1175 } else {
1172 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1173 } 1177 }
1174 1178
1175 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1183 } else {
1177 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1178 } 1185 }
1179 } else { 1186 } else {
1180 aio_unlink $filename; 1187 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1182 } 1189 }
… …
1273 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1274 1281
1275 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1276} 1283}
1277 1284
1285use File::Glob ();
1286
1278cf::player->attach ( 1287cf::player->attach (
1279 on_command => sub { 1288 on_command => sub {
1280 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1281 1290
1282 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
… …
1313 } 1322 }
1314 1323
1315 cf::override; 1324 cf::override;
1316 }, 1325 },
1317); 1326);
1327
1328# "readahead" all extensions
1329sub cache_extensions {
1330 my $grp = IO::AIO::aio_group;
1331
1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1333 for (grep /\.ext$/, @{$_[0]}) {
1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1335 }
1336 };
1337
1338 $grp
1339}
1318 1340
1319sub load_extensions { 1341sub load_extensions {
1320 cf::sync_job { 1342 cf::sync_job {
1321 my %todo; 1343 my %todo;
1322 1344
… …
1445 1467
1446sub exists($) { 1468sub exists($) {
1447 my ($login) = @_; 1469 my ($login) = @_;
1448 1470
1449 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1451} 1473}
1452 1474
1453sub find($) { 1475sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1477 my $login = $_[0];
… …
1851 1873
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1854} 1876}
1855 1877
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 1878sub decay_objects {
1866 my ($self) = @_; 1879 my ($self) = @_;
1867 1880
1868 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1869 1882
… …
1951sub find { 1964sub find {
1952 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
1953 1966
1954 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
1955 1968
1956 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
1958 1971
1959 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
1964 or return; 1974 or return;
1965 1975
1966 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
1967 1977
… …
2034 2044
2035 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2046 $self->decay_objects;
2037 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2038 $self->update_buttons; 2048 $self->update_buttons;
2039 cf::cede_to_tick;
2040 $self->set_darkness_map;
2041 cf::cede_to_tick; 2049 cf::cede_to_tick;
2042 $self->activate; 2050 $self->activate;
2043 } 2051 }
2044 2052
2045 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
… …
2387 2395
2388our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2389 id => "say", 2397 id => "say",
2390 title => "Map", 2398 title => "Map",
2391 reply => "say ", 2399 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2401};
2394 2402
2395our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2396 id => "chat", 2404 id => "chat",
2397 title => "Chat", 2405 title => "Chat",
… …
2523 2531
2524 $map->load; 2532 $map->load;
2525 $map->load_neighbours; 2533 $map->load_neighbours;
2526 2534
2527 return unless $self->contr->active; 2535 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2536
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2533} 2542}
2534 2543
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2536 2545
2537Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
… …
2772 id => "infobox", 2781 id => "infobox",
2773 title => "Body Parts", 2782 title => "Body Parts",
2774 reply => undef, 2783 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2776 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2777 "c/skills" => { 2792 "c/skills" => {
2778 id => "infobox", 2793 id => "infobox",
2779 title => "Skills", 2794 title => "Skills",
2780 reply => undef, 2795 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2782 }, 2821 },
2783 "c/uptime" => { 2822 "c/uptime" => {
2784 id => "infobox", 2823 id => "infobox",
2785 title => "Uptime", 2824 title => "Uptime",
2786 reply => undef, 2825 reply => undef,
… …
2796 id => "party", 2835 id => "party",
2797 title => "Party", 2836 title => "Party",
2798 reply => "gsay ", 2837 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2800 }, 2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2801); 2848);
2802 2849
2803sub cf::client::send_msg { 2850sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2852
… …
2810 2857
2811 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2814 2861
2815 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2819 2864
2820 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 2870 }
2827 2871
2828 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2829 } 2873 }
2830 2874
2831 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2832 2876
2833 if ($self->can_msg) {
2834 # default colour, mask it out 2877 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2837 2880
2838 my $pkt = "msg " 2881 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 2882 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 2884 );
2842 2885
2843 # try lzf for large packets 2886 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt 2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf}; 2888 if 1024 <= length $pkt and $self->{can_lzf};
2846 2889
2847 # split very large packets 2890 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) { 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag"; 2893 $pkt = "frag";
2851 } 2894 }
2852 2895
2853 $self->send_packet ($pkt); 2896 $self->send_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 2897}
2880 2898
2881=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2882 2900
2883Sends an ext event to the client. 2901Sends an ext event to the client.
… …
3058The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3059 3077
3060 cf::object 3078 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3063 3082
3064 cf::object::player 3083 cf::object::player
3065 player 3084 player
3066 3085
3067 cf::player 3086 cf::player
… …
3073=cut 3092=cut
3074 3093
3075for ( 3094for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3082) { 3101) {
3083 no strict 'refs'; 3102 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3102 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3103 3122
3104 my $qcode = $code; 3123 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3107 3128
3108 local $_; 3129 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3110 3131
3111 my $eval = 3132 my $eval =
… …
3341 reload_treasures; 3362 reload_treasures;
3342 3363
3343 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3344} 3365}
3345 3366
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352}
3353
3354sub reload_config { 3367sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3369 or return;
3357 3370
3358 local $/; 3371 local $/;
… …
3389 3402
3390 seek $fh, 0, 0; 3403 seek $fh, 0, 0;
3391 print $fh $$; 3404 print $fh $$;
3392} 3405}
3393 3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3394sub main { 3416sub main {
3395 atomic; 3417 cf::init_globals; # initialise logging
3418
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3430
3397 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3434 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3404 }; 3438 };
3405 3439
3406 { 3440 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3441
3442 cf::sync_job {
3443 reload_resources;
3408 reload_config; 3444 reload_config;
3409 db_init; 3445 db_init;
3446
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid;
3450 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills;
3453
3454 cf::init_beforeplay;
3455
3456 atomic;
3457
3410 load_extensions; 3458 load_extensions;
3411 3459
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3460 utime time, time, $RUNTIMEFILE;
3416 3461
3417 # no (long-running) fork's whatsoever before this point(!) 3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3465
3420 EV::loop; 3466 (pop @POST_INIT)->(0) while @POST_INIT;
3467 };
3468
3469 main_loop;
3421} 3470}
3422 3471
3423############################################################################# 3472#############################################################################
3424# initialisation and cleanup 3473# initialisation and cleanup
3425 3474
… …
3481 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3482 3531
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3533 or return;
3485 3534
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3535 my $value = uuid_seq uuid_cur;
3536
3537 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n";
3539 return;
3540 }
3541
3542 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3543 $uuid_skip = 0;
3488 3544
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3546 and return;
3491 3547
… …
3513} 3569}
3514 3570
3515sub emergency_save() { 3571sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3517 3573
3518 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3519 3575
3520 cf::sync_job { 3576 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581
3521 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3588 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3590 $pl->save;
3530 } 3591 }
3531 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3532 3593
3533 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3597 $map->valid or next;
3537 $map->save; 3598 $map->save;
3538 } 3599 }
3539 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3540 3601
3541 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3544 3605
3545 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3607 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3548 }; 3609 };
3549 3610
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3550 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3551} 3617}
3552 3618
3553sub post_cleanup { 3619sub post_cleanup {
3554 my ($make_core) = @_; 3620 my ($make_core) = @_;
3555 3621
… …
3592 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3593 return; 3659 return;
3594 } 3660 }
3595 3661
3596 return if $RELOAD++; 3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3597 3665
3598 while ($RELOAD) { 3666 while ($RELOAD) {
3599 warn "reloading..."; 3667 warn "reloading...";
3600 3668
3601 warn "entering sync_job"; 3669 warn "entering sync_job";
… …
3662 clear_package "safe::$_" 3730 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 3732
3665 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 3736
3669 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3670 # and global variables created in xs 3738 # and global variables created in xs
3671 #clear_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3672 3740
… …
3680 cf::reload_config; 3748 cf::reload_config;
3681 3749
3682 warn "loading extensions"; 3750 warn "loading extensions";
3683 cf::load_extensions; 3751 cf::load_extensions;
3684 3752
3753 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3688 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3691 3764
3692 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3693 3766
3694 1 3767 1
3695 } or do { 3768 } or do {
… …
3698 }; 3771 };
3699 3772
3700 warn "reloaded"; 3773 warn "reloaded";
3701 --$RELOAD; 3774 --$RELOAD;
3702 } 3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3703}; 3779};
3704 3780
3705our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3706 3782
3707sub reload_perl() { 3783sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3710 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3791 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3714 }; 3794 };
3715} 3795}
3716 3796
3717register_command "reload" => sub { 3797register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
… …
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3878 } 3958 }
3879} 3959}
3880 3960
3881# load additional modules 3961# load additional modules
3882use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3883 3963
3884END { cf::emergency_save } 3964END { cf::emergency_save }
3885 3965
38861 39661
3887 3967

Diff Legend

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