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.445 by root, Wed Sep 10 18:18:10 2008 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 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 ();
… …
63 65
64# configure various modules to our taste 66# configure various modules to our taste
65# 67#
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
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
68Compress::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
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 76
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 78
74our %COMMAND = (); 79our %COMMAND = ();
75our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
… …
78our %EXTCMD = (); 83our %EXTCMD = ();
79our %EXTICMD = (); 84our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
82 87
83our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 89our @EVENT;
85 90
86our $CONFDIR = confdir; 91our $CONFDIR = confdir;
87our $DATADIR = datadir; 92our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
… …
107our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 115our $DB_ENV;
111 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
112our %CFG; 119our %CFG;
113 120
114our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 122our $RUNTIME;
116our $NOW; 123our $NOW;
… …
124 131
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 134our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
129 140
130binmode STDOUT; 141binmode STDOUT;
131binmode STDERR; 142binmode STDERR;
132 143
133# read virtual server time, if available 144# read virtual server time, if available
134unless ($RUNTIME || !-e $RUNTIMEFILE) { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
135 open my $fh, "<", $RUNTIMEFILE 146 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
138} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
139 152
140mkdir $_ 153mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 155
143our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
… …
302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
303 316
304sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
306 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
307=item cf::lock_wait $string 334=item cf::lock_wait $string
308 335
309Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
310 337
311=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
312 339
313Wait until the given lock is available and then acquires it and returns 340Wait until the given lock is available and then acquires it and returns
314a Coro::guard object. If the guard object gets destroyed (goes out of scope, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
315for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
316returned. 343returned.
317 344
318Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro. 346deadlocked coro.
… …
325 352
326Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
327 354
328=cut 355=cut
329 356
330our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 358
333sub lock_wait($) { 359sub lock_wait($) {
334 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 361}
347 362
348sub lock_acquire($) { 363sub lock_acquire($) {
349 my ($key) = @_; 364 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 365}
363 366
364sub lock_active($) { 367sub lock_active($) {
365 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 369}
369 370
370sub freeze_mainloop { 371sub freeze_mainloop {
371 tick_inhibit_inc; 372 tick_inhibit_inc;
372 373
373 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
374} 375}
375 376
376=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
377 378
378Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
… …
730 731
731############################################################################# 732#############################################################################
732 733
733=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
734 735
735Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
736attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
737to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
738 739
739In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
740C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
790=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
791 792
792Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
793given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
794 795
795Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
796that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
797 798
798These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
799 800
800=over 4 801=over 4
… …
1167 } else { 1168 } else {
1168 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1169 } 1170 }
1170 1171
1171 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1176 } else {
1173 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1174 } 1178 }
1175 } else { 1179 } else {
1176 aio_unlink $filename; 1180 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1178 } 1182 }
… …
1269 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1270 1274
1271 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1272} 1276}
1273 1277
1278use File::Glob ();
1279
1274cf::player->attach ( 1280cf::player->attach (
1275 on_command => sub { 1281 on_command => sub {
1276 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1277 1283
1278 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
… …
1309 } 1315 }
1310 1316
1311 cf::override; 1317 cf::override;
1312 }, 1318 },
1313); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1314 1333
1315sub load_extensions { 1334sub load_extensions {
1316 cf::sync_job { 1335 cf::sync_job {
1317 my %todo; 1336 my %todo;
1318 1337
… …
1388 1407
1389=back 1408=back
1390 1409
1391=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1392 1411
1393Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1394 1413
1395=cut 1414=cut
1396 1415
1397package cf::player; 1416package cf::player;
1398 1417
… …
1441 1460
1442sub exists($) { 1461sub exists($) {
1443 my ($login) = @_; 1462 my ($login) = @_;
1444 1463
1445 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1447} 1466}
1448 1467
1449sub find($) { 1468sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1470 my $login = $_[0];
… …
1622 } 1641 }
1623 1642
1624 \@paths 1643 \@paths
1625} 1644}
1626 1645
1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1647
1629Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1630 1649
1631=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1632 1651
1633Sends an ext reply to the player. 1652Sends an ext reply to the player.
1634 1653
… …
1847 1866
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1850} 1869}
1851 1870
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 1871sub decay_objects {
1862 my ($self) = @_; 1872 my ($self) = @_;
1863 1873
1864 return if $self->{deny_reset}; 1874 return if $self->{deny_reset};
1865 1875
… …
1947sub find { 1957sub find {
1948 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1949 1959
1950 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1951 1961
1952 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1954 1964
1955 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1960 or return; 1967 or return;
1961 1968
1962 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1963 1970
… …
2030 2037
2031 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2039 $self->decay_objects;
2033 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2034 $self->update_buttons; 2041 $self->update_buttons;
2035 cf::cede_to_tick;
2036 $self->set_darkness_map;
2037 cf::cede_to_tick; 2042 cf::cede_to_tick;
2038 $self->activate; 2043 $self->activate;
2039 } 2044 }
2040 2045
2041 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
… …
2383 2388
2384our $SAY_CHANNEL = { 2389our $SAY_CHANNEL = {
2385 id => "say", 2390 id => "say",
2386 title => "Map", 2391 title => "Map",
2387 reply => "say ", 2392 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2394};
2390 2395
2391our $CHAT_CHANNEL = { 2396our $CHAT_CHANNEL = {
2392 id => "chat", 2397 id => "chat",
2393 title => "Chat", 2398 title => "Chat",
… …
2448 2453
2449=item $player_object->enter_link 2454=item $player_object->enter_link
2450 2455
2451Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2452 2457
2453The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2454I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2455 2462
2456Will never block. 2463Will never block.
2457 2464
2458=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2459 2466
… …
2517 2524
2518 $map->load; 2525 $map->load;
2519 $map->load_neighbours; 2526 $map->load_neighbours;
2520 2527
2521 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2522 $self->activate_recursive; 2530 $self->activate_recursive;
2523 2531
2524 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2525 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2526} 2534}
… …
2689 $self->contr->savebed ($map, $x, $y) 2697 $self->contr->savebed ($map, $x, $y)
2690 if $exit->flag (cf::FLAG_DAMNED); 2698 if $exit->flag (cf::FLAG_DAMNED);
2691 2699
2692 1 2700 1
2693 }) { 2701 }) {
2694 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2695 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2696 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2697 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2698 2706
2699 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2765 id => "infobox", 2773 id => "infobox",
2766 title => "Body Parts", 2774 title => "Body Parts",
2767 reply => undef, 2775 reply => undef,
2768 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2769 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2770 "c/uptime" => { 2802 "c/uptime" => {
2771 id => "infobox", 2803 id => "infobox",
2772 title => "Uptime", 2804 title => "Uptime",
2773 reply => undef, 2805 reply => undef,
2774 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
… …
2783 id => "party", 2815 id => "party",
2784 title => "Party", 2816 title => "Party",
2785 reply => "gsay ", 2817 reply => "gsay ",
2786 tooltip => "Messages and chat related to your party", 2818 tooltip => "Messages and chat related to your party",
2787 }, 2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2788); 2828);
2789 2829
2790sub cf::client::send_msg { 2830sub cf::client::send_msg {
2791 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2792 2832
2793 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2794 2835
2795 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2796 2837
2797 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2798 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2799 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2800 2841
2801 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2802 if $self->can_msg;
2803
2804 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2805 2844
2806 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2807 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2808 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2809 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2810 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2811 if $self->can_msg;
2812 } 2850 }
2813 2851
2814 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2815 } 2853 }
2816 2854
2817 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2818 2856
2819 if ($self->can_msg) {
2820 # default colour, mask it out 2857 # default colour, mask it out
2821 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2822 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2823 2860
2824 my $pkt = "msg " 2861 my $pkt = "msg "
2825 . $self->{json_coder}->encode ( 2862 . $self->{json_coder}->encode (
2826 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2827 ); 2864 );
2828 2865
2829 # try lzf for large packets 2866 # try lzf for large packets
2830 $pkt = "lzf " . Compress::LZF::compress $pkt 2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2831 if 1024 <= length $pkt and $self->{can_lzf}; 2868 if 1024 <= length $pkt and $self->{can_lzf};
2832 2869
2833 # split very large packets 2870 # split very large packets
2834 if (8192 < length $pkt and $self->{can_lzf}) { 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2835 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2836 $pkt = "frag"; 2873 $pkt = "frag";
2837 } 2874 }
2838 2875
2839 $self->send_packet ($pkt); 2876 $self->send_packet ($pkt);
2840 } else {
2841 if ($color >= 0) {
2842 # replace some tags by gcfclient-compatible ones
2843 for ($msg) {
2844 1 while
2845 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2846 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2847 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2848 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2849 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2850 }
2851
2852 $color &= cf::NDI_COLOR_MASK;
2853
2854 utf8::encode $msg;
2855
2856 if (0 && $msg =~ /\[/) {
2857 # COMMAND/INFO
2858 $self->send_packet ("drawextinfo $color 10 8 $msg")
2859 } else {
2860 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2861 $self->send_packet ("drawinfo $color $msg")
2862 }
2863 }
2864 }
2865} 2877}
2866 2878
2867=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2868 2880
2869Sends an ext event to the client. 2881Sends an ext event to the client.
… …
3044The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3045 3057
3046 cf::object 3058 cf::object
3047 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3048 insert remove name archname title slaying race decrease split 3060 insert remove name archname title slaying race decrease split
3061 value
3049 3062
3050 cf::object::player 3063 cf::object::player
3051 player 3064 player
3052 3065
3053 cf::player 3066 cf::player
… …
3059=cut 3072=cut
3060 3073
3061for ( 3074for (
3062 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3063 insert remove inv nrof name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3064 decrease split destroy change_exp)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3065 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3066 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3067 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3068) { 3081) {
3069 no strict 'refs'; 3082 no strict 'refs';
3070 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3071 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3088 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3089 3102
3090 my $qcode = $code; 3103 my $qcode = $code;
3091 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3092 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3093 3108
3094 local $_; 3109 local $_;
3095 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3096 3111
3097 my $eval = 3112 my $eval =
… …
3327 reload_treasures; 3342 reload_treasures;
3328 3343
3329 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3330} 3345}
3331 3346
3332sub init {
3333 my $guard = freeze_mainloop;
3334
3335 evthread_start IO::AIO::poll_fileno;
3336
3337 reload_resources;
3338}
3339
3340sub reload_config { 3347sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3349 or return;
3343 3350
3344 local $/; 3351 local $/;
… …
3376 seek $fh, 0, 0; 3383 seek $fh, 0, 0;
3377 print $fh $$; 3384 print $fh $$;
3378} 3385}
3379 3386
3380sub main { 3387sub main {
3381 atomic; 3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3382 3401
3383 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3405 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3390 }; 3409 };
3391 3410
3392 { 3411 evthread_start IO::AIO::poll_fileno;
3393 my $guard = freeze_mainloop; 3412
3413 cf::sync_job {
3414 reload_resources;
3394 reload_config; 3415 reload_config;
3395 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3396 load_extensions; 3429 load_extensions;
3397 3430
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 }
3400
3401 utime time, time, $RUNTIMEFILE; 3431 utime time, time, $RUNTIMEFILE;
3402 3432
3403 # no (long-running) fork's whatsoever before this point(!) 3433 # no (long-running) fork's whatsoever before this point(!)
3404 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3437 };
3405 3438
3406 EV::loop; 3439 EV::loop;
3407} 3440}
3408 3441
3409############################################################################# 3442#############################################################################
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3468 3501
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3503 or return;
3471 3504
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3513 $uuid_skip = 0;
3474 3514
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3516 and return;
3477 3517
… …
3499} 3539}
3500 3540
3501sub emergency_save() { 3541sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3503 3543
3504 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3505 3545
3506 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3507 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3558 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3560 $pl->save;
3516 } 3561 }
3517 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3518 3563
3519 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3567 $map->valid or next;
3523 $map->save; 3568 $map->save;
3524 } 3569 }
3525 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3526 3571
3527 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3530 3575
3531 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3577 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3534 }; 3579 };
3535 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3536 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3537} 3587}
3538 3588
3539sub post_cleanup { 3589sub post_cleanup {
3540 my ($make_core) = @_; 3590 my ($make_core) = @_;
3541 3591
… …
3567 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3568 for my $name (keys %$leaf_symtab) { 3618 for my $name (keys %$leaf_symtab) {
3569 _gv_clear *{"$pkg$name"}; 3619 _gv_clear *{"$pkg$name"};
3570# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3571 } 3621 }
3572 warn "cleared package #$pkg\n";#d# 3622 warn "cleared package $pkg\n";#d#
3573} 3623}
3574
3575our $RELOAD; # how many times to reload
3576 3624
3577sub do_reload_perl() { 3625sub do_reload_perl() {
3578 # can/must only be called in main 3626 # can/must only be called in main
3579 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3580 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3581 return; 3629 return;
3582 } 3630 }
3583 3631
3584 return if $RELOAD++; 3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3585 3635
3586 while ($RELOAD) { 3636 while ($RELOAD) {
3587 warn "reloading..."; 3637 warn "reloading...";
3588 3638
3589 warn "entering sync_job"; 3639 warn "entering sync_job";
… …
3650 clear_package "safe::$_" 3700 clear_package "safe::$_"
3651 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3652 3702
3653 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3654 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3655 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3656 3706
3657 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3658 # and global variables created in xs 3708 # and global variables created in xs
3659 #clear_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3660 3710
… …
3668 cf::reload_config; 3718 cf::reload_config;
3669 3719
3670 warn "loading extensions"; 3720 warn "loading extensions";
3671 cf::load_extensions; 3721 cf::load_extensions;
3672 3722
3723 if ($REATTACH_ON_RELOAD) {
3673 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3674 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3675 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3676 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3677 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3678 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3679 3734
3680 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3681 3736
3682 1 3737 1
3683 } or do { 3738 } or do {
… …
3686 }; 3741 };
3687 3742
3688 warn "reloaded"; 3743 warn "reloaded";
3689 --$RELOAD; 3744 --$RELOAD;
3690 } 3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3691}; 3749};
3692 3750
3693our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3694 3752
3695sub reload_perl() { 3753sub reload_perl() {
3696 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3697 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3698 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3699 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3700 do_reload_perl; 3761 do_reload_perl;
3701 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3702 }; 3764 };
3703} 3765}
3704 3766
3705register_command "reload" => sub { 3767register_command "reload" => sub {
3706 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
… …
3832 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3833 3895
3834 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3835 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3836 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3837 async { 3900 async {
3838 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3839 3902
3840 my @bt = fork_call { 3903 my @bt = fork_call {
3841 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
… …
3852 } 3915 }
3853 3916
3854 @funcs 3917 @funcs
3855 }; 3918 };
3856 3919
3857 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3858 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3859 --$_log_backtrace; 3923 --$_log_backtrace;
3860 }; 3924 };
3861 } else { 3925 } else {
3862 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3863 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3864 } 3928 }
3865} 3929}
3866 3930
3867# load additional modules 3931# load additional modules
3868use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3869 3933
3870END { cf::emergency_save } 3934END { cf::emergency_save }
3871 3935
38721 39361
3873 3937

Diff Legend

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