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.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.140 by root, Fri Jan 5 20:04:02 2007 UTC

… …
8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %MAP; # all maps 52our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 53our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 54our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 55our %EXT_CORO;
57 56
58binmode STDOUT; 57binmode STDOUT;
59binmode STDERR; 58binmode STDERR;
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 70mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 71mkdir $RANDOM_MAPS;
73 72
74# a special map that is always available 73# a special map that is always available
75our $LINK_MAP; 74our $LINK_MAP;
76 75our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 76
79############################################################################# 77#############################################################################
80 78
81=head2 GLOBAL VARIABLES 79=head2 GLOBAL VARIABLES
82 80
… …
181sub to_json($) { 179sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 181 JSON::Syck::Dump $_[0]
184} 182}
185 183
184=item cf::lock_wait $string
185
186Wait until the given lock is available. See cf::lock_acquire.
187
188=item my $lock = cf::lock_acquire $string
189
190Wait until the given lock is available and then acquires it and returns
191a Coro::guard object. If the guard object gets destroyed (goes out of scope,
192for example when the coroutine gets canceled), the lock is automatically
193returned.
194
195Lock names should begin with a unique identifier (for example, cf::map::find
196uses map_find and cf::map::load uses map_load).
197
198=cut
199
200our %LOCK;
201
202sub lock_wait($) {
203 my ($key) = @_;
204
205 # wait for lock, if any
206 while ($LOCK{$key}) {
207 push @{ $LOCK{$key} }, $Coro::current;
208 Coro::schedule;
209 }
210}
211
212sub lock_acquire($) {
213 my ($key) = @_;
214
215 # wait, to be sure we are not locked
216 lock_wait $key;
217
218 $LOCK{$key} = [];
219
220 Coro::guard {
221 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} };
223 }
224}
225
226sub freeze_mainloop {
227 return unless $TICK_WATCHER->is_active;
228
229 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop;
231 $guard
232}
233
234=item cf::async { BLOCK }
235
236Currently the same as Coro::async_pool, meaning you cannot use
237C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
238thing you are allowed to do is call C<prio> on it.
239
240=cut
241
242BEGIN { *async = \&Coro::async_pool }
243
186=item cf::sync_job { BLOCK } 244=item cf::sync_job { BLOCK }
187 245
188The design of crossfire+ requires that the main coro ($Coro::main) is 246The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 247always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 248reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
203 # this is the main coro, too bad, we have to block 261 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 262 # till the operation succeeds, freezing the server :/
205 263
206 # TODO: use suspend/resume instead 264 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 265 # (but this is cancel-safe)
208 local $FREEZE = 1; 266 my $freeze_guard = freeze_mainloop;
209 267
210 my $busy = 1; 268 my $busy = 1;
211 my @res; 269 my @res;
212 270
213 (Coro::async { 271 (async {
214 @res = eval { $job->() }; 272 @res = eval { $job->() };
215 warn $@ if $@; 273 warn $@ if $@;
216 undef $busy; 274 undef $busy;
217 })->prio (Coro::PRIO_MAX); 275 })->prio (Coro::PRIO_MAX);
218 276
219 while ($busy) { 277 while ($busy) {
220 Coro::cede_notself; 278 unless (Coro::cede) {
221 Event::one_event unless Coro::nready; 279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
222 } 282 }
223 283
224 wantarray ? @res : $res[0] 284 wantarray ? @res : $res[0]
225 } else { 285 } else {
226 # we are in another coroutine, how wonderful, everything just works 286 # we are in another coroutine, how wonderful, everything just works
227 287
228 $job->() 288 $job->()
229 } 289 }
230} 290}
231 291
232=item $coro = cf::coro { BLOCK } 292=item $coro = cf::async_ext { BLOCK }
233 293
234Creates and returns a new coro. This coro is automcatially being canceled 294Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 295extension calling this is being unloaded.
236 296
237=cut 297=cut
238 298
239sub coro(&) { 299sub async_ext(&) {
240 my $cb = shift; 300 my $cb = shift;
241 301
242 my $coro; $coro = async { 302 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 303
249 $coro->on_destroy (sub { 304 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 305 delete $EXT_CORO{$coro+0};
251 }); 306 });
252 $EXT_CORO{$coro+0} = $coro; 307 $EXT_CORO{$coro+0} = $coro;
… …
817 (aio_load "$filename.pst", $av) >= 0 872 (aio_load "$filename.pst", $av) >= 0
818 or return; 873 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
820 } 875 }
821 876
877 warn sprintf "loading %s (%d)\n",
878 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 879 return ($data, $av);
823} 880}
824 881
825############################################################################# 882#############################################################################
826# command handling &c 883# command handling &c
… …
1060package cf::map; 1117package cf::map;
1061 1118
1062use Fcntl; 1119use Fcntl;
1063use Coro::AIO; 1120use Coro::AIO;
1064 1121
1065our $MAX_RESET = 7200; 1122our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1123our $DEFAULT_RESET = 3000;
1067 1124
1068sub generate_random_map { 1125sub generate_random_map {
1069 my ($path, $rmp) = @_; 1126 my ($path, $rmp) = @_;
1070 1127
1071 # mit "rum" bekleckern, nicht 1128 # mit "rum" bekleckern, nicht
… …
1087# and all this just because we cannot iterate over 1144# and all this just because we cannot iterate over
1088# all maps in C++... 1145# all maps in C++...
1089sub change_all_map_light { 1146sub change_all_map_light {
1090 my ($change) = @_; 1147 my ($change) = @_;
1091 1148
1092 $_->change_map_light ($change) for values %cf::MAP; 1149 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP;
1093} 1151}
1094 1152
1095sub try_load_header($) { 1153sub try_load_header($) {
1096 my ($path) = @_; 1154 my ($path) = @_;
1097 1155
… …
1100 or return; 1158 or return;
1101 1159
1102 my $map = cf::map::new 1160 my $map = cf::map::new
1103 or return; 1161 or return;
1104 1162
1163 # for better error messages only, will be overwritten
1164 $map->path ($path);
1165
1105 $map->load_header ($path) 1166 $map->load_header ($path)
1106 or return; 1167 or return;
1107 1168
1108 $map->{load_path} = $path; 1169 $map->{load_path} = $path;
1109 1170
1110 $map 1171 $map
1111} 1172}
1112 1173
1174sub find;
1113sub find_map { 1175sub find {
1114 my ($path, $origin) = @_; 1176 my ($path, $origin) = @_;
1115 1177
1116 #warn "find_map<$path,$origin>\n";#d# 1178 #warn "find<$path,$origin>\n";#d#
1117 1179
1118 $path = new cf::path $path, $origin && $origin->path; 1180 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1181 my $key = $path->as_string;
1120 1182
1183 cf::lock_wait "map_find:$key";
1184
1121 $cf::MAP{$key} || do { 1185 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key";
1187
1122 # do it the slow way 1188 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1189 my $map = try_load_header $path->save_path;
1124 1190
1191 Coro::cede;
1192
1125 if ($map) { 1193 if ($map) {
1194 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d#
1126 # safety 1196 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1197 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1198 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1199 } else {
1130 if (my $rmp = $path->random_map_params) { 1200 if (my $rmp = $path->random_map_params) {
… …
1135 1205
1136 $map or return; 1206 $map or return;
1137 1207
1138 $map->{load_original} = 1; 1208 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1209 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1211 $map->instantiate;
1141 1212
1142 # per-player maps become, after loading, normal maps 1213 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1144 } 1215 }
1145 1216
1146 $map->path ($key); 1217 $map->path ($key);
1147 $map->{path} = $path; 1218 $map->{path} = $path;
1148 $map->last_access ($cf::RUNTIME); 1219 $map->{last_save} = $cf::RUNTIME;
1220
1221 Coro::cede;
1149 1222
1150 if ($map->should_reset) { 1223 if ($map->should_reset) {
1151 $map->reset; 1224 $map->reset;
1225 undef $guard;
1152 $map = find_map $path; 1226 $map = find $path
1227 or return;
1153 } 1228 }
1154 1229
1155 $cf::MAP{$key} = $map 1230 $cf::MAP{$key} = $map
1156 } 1231 }
1157} 1232}
1158 1233
1159sub load { 1234sub load {
1160 my ($self) = @_; 1235 my ($self) = @_;
1161 1236
1237 my $path = $self->{path};
1238 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1239
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1240 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1241
1164 $self->in_memory (cf::MAP_LOADING); 1242 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1243
1168 $self->alloc; 1244 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1245 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1246 or return;
1171 1247
… …
1177 if (aio_open $uniq, O_RDONLY, 0) { 1253 if (aio_open $uniq, O_RDONLY, 0) {
1178 $self->clear_unique_items; 1254 $self->clear_unique_items;
1179 $self->load_objects ($uniq, 0); 1255 $self->load_objects ($uniq, 0);
1180 } 1256 }
1181 } 1257 }
1258
1259 Coro::cede;
1182 1260
1183 # now do the right thing for maps 1261 # now do the right thing for maps
1184 $self->link_multipart_objects; 1262 $self->link_multipart_objects;
1185 1263
1186 if ($self->{path}->is_style_map) { 1264 if ($self->{path}->is_style_map) {
… …
1194 $self->difficulty ($self->estimate_difficulty) 1272 $self->difficulty ($self->estimate_difficulty)
1195 unless $self->difficulty; 1273 unless $self->difficulty;
1196 $self->activate; 1274 $self->activate;
1197 } 1275 }
1198 1276
1277 Coro::cede;
1278
1199 $self->in_memory (cf::MAP_IN_MEMORY); 1279 $self->in_memory (cf::MAP_IN_MEMORY);
1200} 1280}
1201 1281
1202sub load_map_sync { 1282sub find_sync {
1203 my ($path, $origin) = @_; 1283 my ($path, $origin) = @_;
1204 1284
1205 #warn "load_map_sync<$path, $origin>\n";#d# 1285 cf::sync_job { cf::map::find $path, $origin }
1286}
1206 1287
1207 cf::sync_job { 1288sub do_load_sync {
1208 my $map = cf::map::find_map $path, $origin 1289 my ($map) = @_;
1209 or return; 1290
1210 $map->load; 1291 cf::sync_job { $map->load };
1211 $map
1212 }
1213} 1292}
1214 1293
1215sub save { 1294sub save {
1216 my ($self) = @_; 1295 my ($self) = @_;
1217 1296
1297 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298
1299 $self->{last_save} = $cf::RUNTIME;
1300
1301 return unless $self->dirty;
1302
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1303 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1304 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220 1305
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224
1225 $self->{load_path} = $save; 1306 $self->{load_path} = $save;
1226 1307
1227 return if $self->{deny_save}; 1308 return if $self->{deny_save};
1309
1310 local $self->{last_access} = $self->last_access;#d#
1228 1311
1229 if ($uniq) { 1312 if ($uniq) {
1230 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1231 $self->save_objects ($uniq, cf::IO_UNIQUES); 1314 $self->save_objects ($uniq, cf::IO_UNIQUES);
1232 } else { 1315 } else {
… …
1235} 1318}
1236 1319
1237sub swap_out { 1320sub swap_out {
1238 my ($self) = @_; 1321 my ($self) = @_;
1239 1322
1323 # save first because save cedes
1324 $self->save;
1325
1326 my $lock = cf::lock_acquire "map_data:" . $self->path;
1327
1240 return if $self->players; 1328 return if $self->players;
1241 return if $self->in_memory != cf::MAP_IN_MEMORY; 1329 return if $self->in_memory != cf::MAP_IN_MEMORY;
1242 return if $self->{deny_save}; 1330 return if $self->{deny_save};
1243 1331
1244 $self->save;
1245 $self->clear; 1332 $self->clear;
1246 $self->in_memory (cf::MAP_SWAPPED); 1333 $self->in_memory (cf::MAP_SWAPPED);
1247} 1334}
1248 1335
1249sub reset_at { 1336sub reset_at {
… …
1287} 1374}
1288 1375
1289sub reset { 1376sub reset {
1290 my ($self) = @_; 1377 my ($self) = @_;
1291 1378
1379 my $lock = cf::lock_acquire "map_data:" . $self->path;
1380
1292 return if $self->players; 1381 return if $self->players;
1293 return if $self->{path}{user_rel};#d# 1382 return if $self->{path}{user_rel};#d#
1294 1383
1295 warn "resetting map ", $self->path;#d# 1384 warn "resetting map ", $self->path;#d#
1296 1385
… …
1315 1404
1316sub customise_for { 1405sub customise_for {
1317 my ($map, $ob) = @_; 1406 my ($map, $ob) = @_;
1318 1407
1319 if ($map->per_player) { 1408 if ($map->per_player) {
1320 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1321 } 1410 }
1322 1411
1323 $map 1412 $map
1324} 1413}
1325 1414
1326sub emergency_save { 1415sub emergency_save {
1327 local $cf::FREEZE = 1; 1416 my $freeze_guard = cf::freeze_mainloop;
1328 1417
1329 warn "enter emergency map save\n"; 1418 warn "enter emergency map save\n";
1330 1419
1331 cf::sync_job { 1420 cf::sync_job {
1332 warn "begin emergency map save\n"; 1421 warn "begin emergency map save\n";
… …
1404=cut 1493=cut
1405 1494
1406sub cf::object::player::enter_link { 1495sub cf::object::player::enter_link {
1407 my ($self) = @_; 1496 my ($self) = @_;
1408 1497
1498 $self->deactivate_recursive;
1499
1409 return if $self->map == $LINK_MAP; 1500 return if $self->map == $LINK_MAP;
1410 1501
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1502 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1503 if $self->map;
1413 1504
1414 $self->enter_map ($LINK_MAP, 20, 20); 1505 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1506}
1417 1507
1418sub cf::object::player::leave_link { 1508sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1509 my ($self, $map, $x, $y) = @_;
1420 1510
1421 my $link_pos = delete $self->{_link_pos}; 1511 my $link_pos = delete $self->{_link_pos};
1422 1512
1423 unless ($map) { 1513 unless ($map) {
1424 # restore original map position 1514 # restore original map position
1425 ($map, $x, $y) = @{ $link_pos || [] }; 1515 ($map, $x, $y) = @{ $link_pos || [] };
1426 $map = cf::map::find_map $map; 1516 $map = cf::map::find $map;
1427 1517
1428 unless ($map) { 1518 unless ($map) {
1429 ($map, $x, $y) = @$EMERGENCY_POSITION; 1519 ($map, $x, $y) = @$EMERGENCY_POSITION;
1430 $map = cf::map::find_map $map 1520 $map = cf::map::find $map
1431 or die "FATAL: cannot load emergency map\n"; 1521 or die "FATAL: cannot load emergency map\n";
1432 } 1522 }
1433 } 1523 }
1434 1524
1435 ($x, $y) = (-1, -1) 1525 ($x, $y) = (-1, -1)
… …
1443 1533
1444 $self->activate_recursive; 1534 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1535 $self->enter_map ($map, $x, $y);
1446} 1536}
1447 1537
1538cf::player->attach (
1539 on_logout => sub {
1540 my ($pl) = @_;
1541
1542 # abort map switching before logout
1543 if ($pl->ob->{_link_pos}) {
1544 cf::sync_job {
1545 $pl->ob->leave_link
1546 };
1547 }
1548 },
1549 on_login => sub {
1550 my ($pl) = @_;
1551
1552 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link;
1557 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef,
1561 "There was an internal problem at your last logout, "
1562 . "the server will try to bring you to your intended destination in a second.",
1563 cf::NDI_RED);
1564 Coro::Timer::sleep 1;
1565 $pl->ob->leave_link;
1566 })->prio (2);
1567 }
1568 },
1569);
1570
1448=item $player_object->goto_map ($map, $x, $y) 1571=item $player_object->goto ($path, $x, $y)
1449 1572
1450=cut 1573=cut
1451 1574
1452sub cf::object::player::goto_map { 1575sub cf::object::player::goto {
1453 my ($self, $path, $x, $y) = @_; 1576 my ($self, $path, $x, $y) = @_;
1454 1577
1455 $self->enter_link; 1578 $self->enter_link;
1456 1579
1457 (Coro::async { 1580 (async {
1458 $path = new cf::path $path; 1581 $path = new cf::path $path;
1459 1582
1460 my $map = cf::map::find_map $path->as_string; 1583 my $map = cf::map::find $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1584 $map = $map->customise_for ($self) if $map;
1462 1585
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1586# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1587# if $map;
1465 1588
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1590
1468 $self->leave_link ($map, $x, $y); 1591 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1592 })->prio (1);
… …
1524 1647
1525 return unless $self->type == cf::PLAYER; 1648 return unless $self->type == cf::PLAYER;
1526 1649
1527 $self->enter_link; 1650 $self->enter_link;
1528 1651
1529 (Coro::async { 1652 (async {
1653 $self->deactivate_recursive; # just to be sure
1530 unless (eval { 1654 unless (eval {
1531
1532 prepare_random_map $exit 1655 prepare_random_map $exit
1533 if $exit->slaying eq "/!"; 1656 if $exit->slaying eq "/!";
1534 1657
1535 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1658 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1536 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1659 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1537 1660
1538 1; 1661 1;
1539 }) { 1662 }) {
1540 $self->message ("Something went wrong deep within the crossfire server. " 1663 $self->message ("Something went wrong deep within the crossfire server. "
1541 . "I'll try to bring you back to the map you were before. " 1664 . "I'll try to bring you back to the map you were before. "
… …
1598 on_reply => sub { 1721 on_reply => sub {
1599 my ($ns, $msg) = @_; 1722 my ($ns, $msg) = @_;
1600 1723
1601 # this weird shuffling is so that direct followup queries 1724 # this weird shuffling is so that direct followup queries
1602 # get handled first 1725 # get handled first
1603 my $queue = delete $ns->{query_queue}; 1726 my $queue = delete $ns->{query_queue}
1727 or return; # be conservative, not sure how that can happen, but we saw a crash here
1604 1728
1605 (shift @$queue)->[1]->($msg); 1729 (shift @$queue)->[1]->($msg);
1606 1730
1607 push @{ $ns->{query_queue} }, @$queue; 1731 push @{ $ns->{query_queue} }, @$queue;
1608 1732
… …
1614 } 1738 }
1615 } 1739 }
1616 }, 1740 },
1617); 1741);
1618 1742
1619=item $client->coro (\&cb) 1743=item $client->async (\&cb)
1620 1744
1621Create a new coroutine, running the specified callback. The coroutine will 1745Create a new coroutine, running the specified callback. The coroutine will
1622be automatically cancelled when the client gets destroyed (e.g. on logout, 1746be automatically cancelled when the client gets destroyed (e.g. on logout,
1623or loss of connection). 1747or loss of connection).
1624 1748
1625=cut 1749=cut
1626 1750
1627sub cf::client::coro { 1751sub cf::client::async {
1628 my ($self, $cb) = @_; 1752 my ($self, $cb) = @_;
1629 1753
1630 my $coro; $coro = async { 1754 my $coro = &Coro::async ($cb);
1631 eval {
1632 $cb->();
1633 };
1634 warn $@ if $@;
1635 };
1636 1755
1637 $coro->on_destroy (sub { 1756 $coro->on_destroy (sub {
1638 delete $self->{_coro}{$coro+0}; 1757 delete $self->{_coro}{$coro+0};
1639 }); 1758 });
1640 1759
… …
1812 1931
1813{ 1932{
1814 my $path = cf::localdir . "/database.pst"; 1933 my $path = cf::localdir . "/database.pst";
1815 1934
1816 sub db_load() { 1935 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 1936 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 1937 }
1820 1938
1821 my $pid; 1939 my $pid;
1822 1940
1823 sub db_save() { 1941 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 1942 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 1943 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 1944 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 1945 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 1946 rename "$path~", $path;
… …
1877 open my $fh, "<:utf8", cf::confdir . "/config" 1994 open my $fh, "<:utf8", cf::confdir . "/config"
1878 or return; 1995 or return;
1879 1996
1880 local $/; 1997 local $/;
1881 *CFG = YAML::Syck::Load <$fh>; 1998 *CFG = YAML::Syck::Load <$fh>;
1999
2000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2001
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004
2005 if (exists $CFG{mlockall}) {
2006 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall
2008 and die "WARNING: m(un)lockall failed: $!\n";
2009 };
2010 warn $@ if $@;
2011 }
1882} 2012}
1883 2013
1884sub main { 2014sub main {
1885 # we must not ever block the main coroutine 2015 # we must not ever block the main coroutine
1886 local $Coro::idle = sub { 2016 local $Coro::idle = sub {
1887 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1888 (Coro::unblock_sub {
1889 Event::one_event; 2018 async { Event::one_event };
1890 })->();
1891 }; 2019 };
1892 2020
1893 cfg_load; 2021 cfg_load;
1894 db_load; 2022 db_load;
1895 load_extensions; 2023 load_extensions;
… …
1906 return; 2034 return;
1907 } 2035 }
1908 2036
1909 warn "reloading..."; 2037 warn "reloading...";
1910 2038
1911 local $FREEZE = 1; 2039 my $guard = freeze_mainloop;
1912 cf::emergency_save; 2040 cf::emergency_save;
1913 2041
1914 eval { 2042 eval {
1915 # if anything goes wrong in here, we should simply crash as we already saved 2043 # if anything goes wrong in here, we should simply crash as we already saved
1916 2044
… …
2052 reentrant => 0, 2180 reentrant => 0,
2053 prio => 0, 2181 prio => 0,
2054 at => $NEXT_TICK || $TICK, 2182 at => $NEXT_TICK || $TICK,
2055 data => WF_AUTOCANCEL, 2183 data => WF_AUTOCANCEL,
2056 cb => sub { 2184 cb => sub {
2057 unless ($FREEZE) {
2058 cf::server_tick; # one server iteration 2185 cf::server_tick; # one server iteration
2059 $RUNTIME += $TICK; 2186 $RUNTIME += $TICK;
2060 }
2061
2062 $NEXT_TICK += $TICK; 2187 $NEXT_TICK += $TICK;
2063 2188
2064 # if we are delayed by four ticks or more, skip them all 2189 # if we are delayed by four ticks or more, skip them all
2065 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2066 2191
… …
2089 or warn "ERROR: unable to write runtime file: $!"; 2214 or warn "ERROR: unable to write runtime file: $!";
2090 })->(); 2215 })->();
2091 }, 2216 },
2092); 2217);
2093 2218
2219END { cf::emergency_save }
2220
20941 22211
2095 2222

Diff Legend

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