ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.478 by root, Thu Sep 17 01:57:31 2009 UTC

21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
32use Opcode; 32use Opcode;
33use Safe; 33use Safe;
34use Safe::Hole; 34use Safe::Hole;
35use Storable (); 35use Storable ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
66$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 70
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 72
71{ 73# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86} 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 79
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 81
90our %COMMAND = (); 82our %COMMAND = ();
91our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
94our %EXTCMD = (); 86our %EXTCMD = ();
95our %EXTICMD = (); 87our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
98 90
99our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 92our @EVENT;
101 93
102our $CONFDIR = confdir; 94our $CONFDIR = confdir;
103our $DATADIR = datadir; 95our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
116our %RESOURCE; 108our %RESOURCE;
117 109
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 112our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
122 114
123our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 118our $DB_ENV;
127 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
128our %CFG; 122our %CFG;
129 123
130our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 125our $RUNTIME;
132our $NOW; 126our $NOW;
140 134
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 137our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
145 144
146binmode STDOUT; 145binmode STDOUT;
147binmode STDERR; 146binmode STDERR;
148 147
149# read virtual server time, if available 148# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
154} 153}
155 154
155eval "sub TICK() { $TICK } 1" or die;
156
156mkdir $_ 157mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 159
159our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
160 161
221 222
222=back 223=back
223 224
224=cut 225=cut
225 226
226BEGIN { 227$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 228 my $msg = join "", @_;
229 229
230 $msg .= "\n" 230 $msg .= "\n"
231 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
232 232
233 $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;
234 234
235 LOG llevError, $msg; 235 LOG llevError, $msg;
236 }; 236};
237}
238 237
239$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
241 242
242 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 245 return;#d#
245 }#d# 246 }#d#
246 247
247 # kill coroutine otherwise 248 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 249 Coro::terminate
250}; 250};
251
252$SIG{__DIE__} = sub { }; #d#?
253 251
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
318our $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
319 317
320sub encode_json($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 319sub decode_json($) { $json_coder->decode ($_[0]) }
322 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
323=item cf::lock_wait $string 335=item cf::lock_wait $string
324 336
325Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
326 338
327=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
328 340
329Wait 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
330a 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,
331for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
332returned. 344returned.
333 345
334Locks 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
335deadlocked coro. 347deadlocked coro.
341 353
342Return 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.
343 355
344=cut 356=cut
345 357
346our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 359
349sub lock_wait($) { 360sub lock_wait($) {
350 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 362}
363 363
364sub lock_acquire($) { 364sub lock_acquire($) {
365 my ($key) = @_; 365 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 366}
379 367
380sub lock_active($) { 368sub lock_active($) {
381 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 370}
385 371
386sub freeze_mainloop { 372sub freeze_mainloop {
387 tick_inhibit_inc; 373 tick_inhibit_inc;
388 374
389 Coro::guard \&tick_inhibit_dec; 375 &Guard::guard (\&tick_inhibit_dec);
390} 376}
391 377
392=item cf::periodic $interval, $cb 378=item cf::periodic $interval, $cb
393 379
394Like 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
1166 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1167 1153
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 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 }
1172 aio_close $fh; 1161 aio_close $fh;
1173 1162
1174 if (@$objs) { 1163 if (@$objs) {
1175 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) {
1176 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1179 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 }
1180 aio_close $fh; 1172 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1174 }
1183 } else { 1175 } else {
1184 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1185 } 1177 }
1186 1178
1187 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1183 } else {
1189 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1190 } 1185 }
1191 } else { 1186 } else {
1192 aio_unlink $filename; 1187 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1194 } 1189 }
1285 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1286 1281
1287 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1288} 1283}
1289 1284
1285use File::Glob ();
1286
1290cf::player->attach ( 1287cf::player->attach (
1291 on_command => sub { 1288 on_command => sub {
1292 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1293 1290
1294 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
1325 } 1322 }
1326 1323
1327 cf::override; 1324 cf::override;
1328 }, 1325 },
1329); 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}
1330 1340
1331sub load_extensions { 1341sub load_extensions {
1332 cf::sync_job { 1342 cf::sync_job {
1333 my %todo; 1343 my %todo;
1334 1344
1457 1467
1458sub exists($) { 1468sub exists($) {
1459 my ($login) = @_; 1469 my ($login) = @_;
1460 1470
1461 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1463} 1473}
1464 1474
1465sub find($) { 1475sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1477 my $login = $_[0];
1863 1873
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1866} 1876}
1867 1877
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1878sub decay_objects {
1878 my ($self) = @_; 1879 my ($self) = @_;
1879 1880
1880 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1881 1882
1963sub find { 1964sub find {
1964 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
1965 1966
1966 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
1967 1968
1968 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
1970 1971
1971 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
1976 or return; 1974 or return;
1977 1975
1978 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
1979 1977
2047 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2046 $self->decay_objects;
2049 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2050 $self->update_buttons; 2048 $self->update_buttons;
2051 cf::cede_to_tick; 2049 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2050 $self->activate;
2055 } 2051 }
2056 2052
2057 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
2224 2220
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2222
2227 return if $self->players; 2223 return if $self->players;
2228 2224
2229 warn "resetting map ", $self->path; 2225 warn "resetting map ", $self->path, "\n";
2230 2226
2231 $self->in_memory (cf::MAP_SWAPPED); 2227 $self->in_memory (cf::MAP_SWAPPED);
2232 2228
2233 # need to save uniques path 2229 # need to save uniques path
2234 unless ($self->{deny_save}) { 2230 unless ($self->{deny_save}) {
2399 2395
2400our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2401 id => "say", 2397 id => "say",
2402 title => "Map", 2398 title => "Map",
2403 reply => "say ", 2399 reply => "say ",
2404 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.",
2405}; 2401};
2406 2402
2407our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2408 id => "chat", 2404 id => "chat",
2409 title => "Chat", 2405 title => "Chat",
2535 2531
2536 $map->load; 2532 $map->load;
2537 $map->load_neighbours; 2533 $map->load_neighbours;
2538 2534
2539 return unless $self->contr->active; 2535 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2536
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $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;
2545} 2542}
2546 2543
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2545
2549Moves 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
2784 id => "infobox", 2781 id => "infobox",
2785 title => "Body Parts", 2782 title => "Body Parts",
2786 reply => undef, 2783 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2788 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2792 "c/skills" => {
2793 id => "infobox",
2794 title => "Skills",
2795 reply => undef,
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",
2821 },
2789 "c/uptime" => { 2822 "c/uptime" => {
2790 id => "infobox", 2823 id => "infobox",
2791 title => "Uptime", 2824 title => "Uptime",
2792 reply => undef, 2825 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2826 tooltip => "How long the server has been running since last restart",
2802 id => "party", 2835 id => "party",
2803 title => "Party", 2836 title => "Party",
2804 reply => "gsay ", 2837 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2806 }, 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,
2807); 2848);
2808 2849
2809sub cf::client::send_msg { 2850sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2811 2852
2816 2857
2817 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2820 2861
2821 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2825 2864
2826 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 2870 }
2833 2871
2834 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2835 } 2873 }
2836 2874
2837 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2838 2876
2839 if ($self->can_msg) {
2840 # default colour, mask it out 2877 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2843 2880
2844 my $pkt = "msg " 2881 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 2882 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 2884 );
2848 2885
2849 # try lzf for large packets 2886 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt 2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf}; 2888 if 1024 <= length $pkt and $self->{can_lzf};
2852 2889
2853 # split very large packets 2890 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) { 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag"; 2893 $pkt = "frag";
2857 } 2894 }
2858 2895
2859 $self->send_packet ($pkt); 2896 $self->send_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 2897}
2886 2898
2887=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2888 2900
2889Sends an ext event to the client. 2901Sends an ext event to the client.
3064The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3065 3077
3066 cf::object 3078 cf::object
3067 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
3068 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3069 3082
3070 cf::object::player 3083 cf::object::player
3071 player 3084 player
3072 3085
3073 cf::player 3086 cf::player
3079=cut 3092=cut
3080 3093
3081for ( 3094for (
3082 ["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
3083 insert remove inv nrof name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3088) { 3101) {
3089 no strict 'refs'; 3102 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3109 3122
3110 my $qcode = $code; 3123 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3113 3128
3114 local $_; 3129 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3116 3131
3117 my $eval = 3132 my $eval =
3347 reload_treasures; 3362 reload_treasures;
3348 3363
3349 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3350} 3365}
3351 3366
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3367sub reload_config {
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3369 or return;
3363 3370
3364 local $/; 3371 local $/;
3395 3402
3396 seek $fh, 0, 0; 3403 seek $fh, 0, 0;
3397 print $fh $$; 3404 print $fh $$;
3398} 3405}
3399 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
3400sub main { 3416sub main {
3401 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
3402 3430
3403 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3405 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#
3406 (async { 3434 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3410 }; 3438 };
3411 3439
3412 { 3440 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3441
3442 cf::sync_job {
3443 reload_resources;
3414 reload_config; 3444 reload_config;
3415 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
3416 load_extensions; 3458 load_extensions;
3417 3459
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3460 utime time, time, $RUNTIMEFILE;
3422 3461
3423 # no (long-running) fork's whatsoever before this point(!) 3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3424 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};
3425 3465
3426 EV::loop; 3466 (pop @POST_INIT)->(0) while @POST_INIT;
3467 };
3468
3469 main_loop;
3427} 3470}
3428 3471
3429############################################################################# 3472#############################################################################
3430# initialisation and cleanup 3473# initialisation and cleanup
3431 3474
3487 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3488 3531
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3533 or return;
3491 3534
3492 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;
3493 $uuid_skip = 0; 3543 $uuid_skip = 0;
3494 3544
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3546 and return;
3497 3547
3519} 3569}
3520 3570
3521sub emergency_save() { 3571sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3523 3573
3524 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3525 3575
3526 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
3527 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3588 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3590 $pl->save;
3536 } 3591 }
3537 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3538 3593
3539 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3597 $map->valid or next;
3543 $map->save; 3598 $map->save;
3544 } 3599 }
3545 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3546 3601
3547 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3550 3605
3551 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3607 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3554 }; 3609 };
3555 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
3556 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3557} 3617}
3558 3618
3559sub post_cleanup { 3619sub post_cleanup {
3560 my ($make_core) = @_; 3620 my ($make_core) = @_;
3561 3621
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3648 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3649 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3651 }
3592 warn "cleared package #$pkg\n";#d# 3652 warn "cleared package $pkg\n";#d#
3593} 3653}
3594
3595our $RELOAD; # how many times to reload
3596 3654
3597sub do_reload_perl() { 3655sub do_reload_perl() {
3598 # can/must only be called in main 3656 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3600 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3601 return; 3659 return;
3602 } 3660 }
3603 3661
3604 return if $RELOAD++; 3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3605 3665
3606 while ($RELOAD) { 3666 while ($RELOAD) {
3607 warn "reloading..."; 3667 warn "reloading...";
3608 3668
3609 warn "entering sync_job"; 3669 warn "entering sync_job";
3670 clear_package "safe::$_" 3730 clear_package "safe::$_"
3671 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);
3672 3732
3673 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3736
3677 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3738 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3680 3740
3688 cf::reload_config; 3748 cf::reload_config;
3689 3749
3690 warn "loading extensions"; 3750 warn "loading extensions";
3691 cf::load_extensions; 3751 cf::load_extensions;
3692 3752
3753 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3698 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;
3699 3764
3700 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3701 3766
3702 1 3767 1
3703 } or do { 3768 } or do {
3706 }; 3771 };
3707 3772
3708 warn "reloaded"; 3773 warn "reloaded";
3709 --$RELOAD; 3774 --$RELOAD;
3710 } 3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3711}; 3779};
3712 3780
3713our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3714 3782
3715sub reload_perl() { 3783sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3718 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3791 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3722 }; 3794 };
3723} 3795}
3724 3796
3725register_command "reload" => sub { 3797register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 3958 }
3887} 3959}
3888 3960
3889# load additional modules 3961# load additional modules
3890use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3891 3963
3892END { cf::emergency_save } 3964END { cf::emergency_save }
3893 3965
38941 39661
3895 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines