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

Diff Legend

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